Skip to content

Commit fca2b7e

Browse files
anagstefanagstef
authored
chore(clerk-js): Merge ui.retheme into ui directory (clerk#2334)
* chore(clerk-js): Merge `ui.retheme` into `ui` directory * chore(clerk-js): Add empty changeset * fix(clerk-js): Fix lint issues
1 parent 118a58b commit fca2b7e

750 files changed

Lines changed: 1736 additions & 48879 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/smooth-pets-rhyme.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

‎.github/labeler.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,3 @@ actions:
4747

4848
integration:
4949
- integration/**
50-
51-
# TODO @retheme: Remove
52-
retheme:
53-
- packages/clerk-js/src/ui.retheme/**
54-
- packages/**/*.retheme.*

‎.github/workflows/ui-retheme-build.yml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎.github/workflows/ui-retheme-changes-reminder.yml‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎packages/clerk-js/jest.config.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
const { name } = require('./package.json');
22

3-
const uiRetheme = process.env.CLERK_RETHEME === '1' || process.env.CLERK_RETHEME === 'true';
4-
53
/** @type {import('ts-jest').JestConfigWithTsJest} */
64
const config = {
75
displayName: name.replace('@clerk', ''),
@@ -16,7 +14,7 @@ const config = {
1614
'/ui/.*/__tests__/.*.test.[jt]sx?$',
1715
'/(core|utils)/.*.test.[jt]sx?$',
1816
],
19-
testPathIgnorePatterns: ['/node_modules/', uiRetheme ? '<rootDir>/src/ui/' : '<rootDir>/src/ui.retheme/'],
17+
testPathIgnorePatterns: ['/node_modules/'],
2018
collectCoverage: false,
2119
coverageProvider: 'v8',
2220
coverageDirectory: 'coverage',

‎packages/clerk-js/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"build": "npm run build:bundle && npm run build:declarations",
3434
"build:analyze": "webpack-bundle-analyzer stats.json dist/",
3535
"build:bundle": "npm run clean && webpack --config webpack.config.js --env production",
36-
"build:declarations": "if [ \"$CLERK_RETHEME\" = \"true\" ] || [ \"$CLERK_RETHEME\" = \"1\" ]; then tsc -p tsconfig.declarations.retheme.json; else tsc -p tsconfig.declarations.json; fi",
36+
"build:declarations": "tsc -p tsconfig.declarations.json",
3737
"build:stats": "webpack --config webpack.config.js --env production --json=stats.json --env variant=\"clerk.browser\"",
3838
"bundlewatch": "npx bundlewatch --config bundlewatch.config.json",
3939
"clean": "rimraf ./dist",

0 commit comments

Comments
 (0)