feat(esm): Revert #355, #359 and #360

packages/storybook/src/plugins/mock-router.ts

@@ -8,7 +8,6 @@ export function mockRouter(): PluginOption {
       if (id.includes('src')) {
         code = code.replace(
           "'@cedarjs/router'",
-          // TODO(storybook): Use the mock router from @cedarjs/testing instead
           "'storybook-framework-cedarjs/dist/mocks/MockRouter'",
         )
       }

packages/testing/build.mts

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 
-import { build, buildEsm, defaultBuildOptions } from '@cedarjs/framework-tools'
+import { buildCjs, buildEsm } from '@cedarjs/framework-tools'
 import {
   generateTypesCjs,
   generateTypesEsm,
@@ -10,21 +10,7 @@ import {
 await buildEsm()
 await generateTypesEsm()
 
-await build({
-  buildOptions: {
-    ...defaultBuildOptions,
-    tsconfig: 'tsconfig.cjs.json',
-    outdir: 'dist/cjs',
-    logOverride: {
-      // This feels a bit dangerous, I wish I could do this with a comment
-      // inside the file where I need this for greater control, but I haven't
-      // found a way to do that yet.
-      // This is to silence the CJS warning for `import.meta.glob` and
-      // `import.meta.dirname`
-      'empty-import-meta': 'silent',
-    },
-  },
-})
+await buildCjs()
 await generateTypesCjs()
 await insertCommonJsPackageJson({
   buildFileUrl: import.meta.url,
@@ -85,21 +71,3 @@ fs.writeFileSync(
   configJestWebJestSetupPath,
   webJestSetupFile.replaceAll('await import', 'require'),
 )
-
-// ./src/web/globRoutesImporter.ts contains `import.meta.glob`. This is not
-// supported in CJS. And for CJS we don't really use this, but it does get
-// imported and executed, so we need to mock it. esbuild will just make
-// `import.meta` be an empty object, but that's not quite enough for what we
-// need here, so I extend it a bit more.
-const globRoutesImporterBuildPath = './dist/cjs/web/globRoutesImporter.js'
-const globRoutesImporterFile = fs.readFileSync(
-  globRoutesImporterBuildPath,
-  'utf-8',
-)
-fs.writeFileSync(
-  globRoutesImporterBuildPath,
-  globRoutesImporterFile.replaceAll(
-    'const import_meta = {};',
-    'const import_meta = { glob: () => ({ "routes.tsx": () => null }) };',
-  ),
-)

packages/testing/package.json

@@ -63,10 +63,6 @@
         "default": "./dist/cjs/api/index.js"
       }
     },
-    "./api/vitest": {
-      "types": "./dist/api/vitest/index.d.ts",
-      "default": "./dist/api/vitest/index.js"
-    },
     "./cache": {
       "import": {
         "types": "./dist/cache/index.d.ts",
@@ -86,20 +82,6 @@
         "types": "./dist/cjs/web/index.d.ts",
         "default": "./dist/cjs/web/index.js"
       }
-    },
-    "./web/MockRouter.js": {
-      "import": {
-        "types": "./dist/web/MockRouter.d.ts",
-        "default": "./dist/web/MockRouter.js"
-      },
-      "require": {
-        "types": "./dist/cjs/web/MockRouter.d.ts",
-        "default": "./dist/cjs/web/MockRouter.js"
-      }
-    },
-    "./web/vitest": {
-      "types": "./dist/web/vitest/index.d.ts",
-      "default": "./dist/web/vitest/index.js"
     }
   },
   "files": [
@@ -113,7 +95,7 @@
     "build": "tsx ./build.mts && yarn build:types",
     "build:pack": "yarn pack -o cedarjs-testing.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
-    "build:types-cjs": "tsc --build --verbose ./tsconfig.cjs.json",
+    "build:types-cjs": "tsc --build --verbose tsconfig.cjs.json",
     "build:watch": "nodemon --watch src --ext 'js,jsx,ts,tsx' --ignore dist --exec 'yarn build'",
     "check:attw": "yarn rw-fwtools-attw",
     "check:package": "concurrently npm:check:attw yarn:publint",
@@ -143,7 +125,6 @@
     "jest-watch-typeahead": "2.2.2",
     "msw": "1.3.5",
     "ts-toolbelt": "9.6.0",
-    "unplugin-auto-import": "19.3.0",
     "whatwg-fetch": "3.6.20"
   },
   "devDependencies": {