use cjs wrapper for esm default interop

redwoodjs · Mar 6, 2024 · 1512890 · 1512890
1 parent e240f9e
commit 1512890
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/packages/vite/.babelrc.js b/packages/vite/.babelrc.js
diff --git a/packages/vite/build.mts b/packages/vite/build.mts
@@ -0,0 +1,3 @@
+import { build } from '@redwoodjs/framework-tools'
+
+await build()
diff --git a/packages/vite/cjsWrapper.js b/packages/vite/cjsWrapper.js
@@ -0,0 +1 @@
+module.exports = require('./dist/index.js').default
diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -12,7 +12,7 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+      "default": "./cjsWrapper.js"
     },
     "./entries": {
       "types": "./dist/entries.d.ts",
@@ -57,11 +57,11 @@
   },
   "files": [
     "dist",
-    "inject"
+    "inject",
+    "cjsWrapper.js"
   ],
   "scripts": {
-    "build": "yarn build:js && yarn build:types",
-    "build:js": "babel src -d dist --extensions \".js,.jsx,.ts,.tsx\"",
+    "build": "tsx build.mts && yarn build:types",
     "build:pack": "yarn pack -o redwoodjs-vite.tgz",
     "build:types": "tsc --build --verbose",
     "test": "vitest run src",
@@ -99,6 +99,7 @@
     "@types/yargs-parser": "21.0.3",
     "glob": "10.3.10",
     "rollup": "3.29.4",
+    "tsx": "4.6.2",
     "typescript": "5.3.3",
     "vitest": "1.2.2"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -8767,6 +8767,7 @@ __metadata:
     react: "npm:0.0.0-experimental-e5205658f-20230913"
     react-server-dom-webpack: "npm:0.0.0-experimental-e5205658f-20230913"
     rollup: "npm:3.29.4"
+    tsx: "npm:4.6.2"
     typescript: "npm:5.3.3"
     vite: "npm:4.5.2"
     vitest: "npm:1.2.2"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { build } from '@redwoodjs/framework-tools'

		await build()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('./dist/index.js').default
Check failure on line 1 in packages/vite/cjsWrapper.js View workflow job for this annotation GitHub Actions / 🏗 Build, lint, test / ubuntu-latest / node 20 latest `'module' is not defined` Check failure on line 1 in packages/vite/cjsWrapper.js View workflow job for this annotation GitHub Actions / 🏗 Build, lint, test / ubuntu-latest / node 20 latest `'require' is not defined`