chore(clerk-js): Merge ui.retheme into ui directory (#2334)

* chore(clerk-js): Merge `ui.retheme` into `ui` directory * chore(clerk-js): Add empty changeset * fix(clerk-js): Fix lint issues
clerk · Dec 13, 2023 · fca2b7e · fca2b7e
1 parent 118a58b
commit fca2b7e
Show file tree

Hide file tree

Showing 750 changed files with 1,736 additions and 48,879 deletions.
diff --git a/.changeset/smooth-pets-rhyme.md b/.changeset/smooth-pets-rhyme.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -47,8 +47,3 @@ actions:
 
 integration:
   - integration/**
-
-# TODO @retheme: Remove
-retheme:
-  - packages/clerk-js/src/ui.retheme/**
-  - packages/**/*.retheme.*
diff --git a/.github/workflows/ui-retheme-build.yml b/.github/workflows/ui-retheme-build.yml
diff --git a/.github/workflows/ui-retheme-changes-reminder.yml b/.github/workflows/ui-retheme-changes-reminder.yml
diff --git a/packages/clerk-js/jest.config.js b/packages/clerk-js/jest.config.js
@@ -1,7 +1,5 @@
 const { name } = require('./package.json');
 
-const uiRetheme = process.env.CLERK_RETHEME === '1' || process.env.CLERK_RETHEME === 'true';
-
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 const config = {
   displayName: name.replace('@clerk', ''),
@@ -16,7 +14,7 @@ const config = {
     '/ui/.*/__tests__/.*.test.[jt]sx?$',
     '/(core|utils)/.*.test.[jt]sx?$',
   ],
-  testPathIgnorePatterns: ['/node_modules/', uiRetheme ? '<rootDir>/src/ui/' : '<rootDir>/src/ui.retheme/'],
+  testPathIgnorePatterns: ['/node_modules/'],
   collectCoverage: false,
   coverageProvider: 'v8',
   coverageDirectory: 'coverage',

diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json
@@ -33,7 +33,7 @@
     "build": "npm run build:bundle && npm run build:declarations",
     "build:analyze": "webpack-bundle-analyzer stats.json dist/",
     "build:bundle": "npm run clean && webpack --config webpack.config.js --env production",
-    "build:declarations": "if [ \"$CLERK_RETHEME\" = \"true\" ] || [ \"$CLERK_RETHEME\" = \"1\" ]; then tsc -p tsconfig.declarations.retheme.json; else tsc -p tsconfig.declarations.json; fi",
+    "build:declarations": "tsc -p tsconfig.declarations.json",
     "build:stats": "webpack --config webpack.config.js --env production --json=stats.json --env variant=\"clerk.browser\"",
     "bundlewatch": "npx bundlewatch --config bundlewatch.config.json",
     "clean": "rimraf ./dist",