feat: add support for npm packages using {"type": "module"}

examples/basic/package.json

@@ -7,12 +7,13 @@
     "start": "shuvi start"
   },
   "dependencies": {
+    "@shuvi/package-esmodule": "workspace:*",
     "shuvi": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^18.6.1",
     "@types/react": "18.0.9",
     "@types/react-dom": "18.0.6",
-    "typescript": "^4.7.4"
+    "typescript": "^5.5.2"
   }
 }

examples/basic/src/routes/page.tsx

@@ -1,6 +1,14 @@
+import { useEffect } from 'react';
+import esModule from '@shuvi/package-esmodule';
+import { consoleLog } from '@shuvi/package-esmodule/utils';
 import styles from './style.css';
 
 const Home = () => {
+  useEffect(() => {
+    esModule(`from '@shuvi/package-esmodule'`);
+    consoleLog(`Hello from '@shuvi/package-esmodule/utils'`);
+  }, []);
+
   return (
     <div className={styles.hello}>
       <p>Hello World</p>

examples/basic/tsconfig.json

@@ -15,7 +15,7 @@
     "esModuleInterop": true,
     "noImplicitThis": true,
     "module": "esnext",
-    "moduleResolution": "node16",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
@@ -27,7 +27,8 @@
       "@shuvi/runtime/*": [
         ".shuvi/app/runtime/*"
       ]
-    }
+    },
+    "incremental": true
   },
   "include": [
     ".shuvi/app/shuvi-app.d.ts",

examples/package-esmodule/.gitignore

@@ -0,0 +1,2 @@
+/esm
+/lib

examples/package-esmodule/README.md

@@ -0,0 +1,10 @@
+This is a simple package that exports an ES module.
+
+https://nodejs.org/docs/latest-v13.x/api/esm.html#esm_package_json_type_field
+
+```json
+// package.json
+{
+  "type": "module"
+}
+```

examples/package-esmodule/package.json

@@ -0,0 +1,34 @@
+{
+  "private": true,
+  "name": "@shuvi/package-esmodule",
+  "version": "1.0.0",
+  "type": "module",
+  "main": "lib/index.js",
+  "module": "esm/index.js",
+  "types": "esm/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./esm/index.js",
+      "require": "./lib/index.js",
+      "types": "./esm/index.d.ts"
+    },
+    "./utils": {
+      "import": "./esm/utils.js",
+      "require": "./lib/utils.js",
+      "types": "./esm/utils.d.ts"
+    }
+  },
+  "files": [
+    "lib",
+    "esm"
+  ],
+  "scripts": {
+    "dev": "run-p watch:*",
+    "watch:esm": "tsc -p tsconfig.build.esm.json -w",
+    "watch:cjs": "tsc -p tsconfig.build.cjs.json -w",
+    "prebuild": "rimraf lib esm",
+    "build": "run-p build:*",
+    "build:esm": "tsc -p tsconfig.build.esm.json",
+    "build:cjs": "tsc -p tsconfig.build.cjs.json"
+  }
+}

examples/package-esmodule/src/index.ts

@@ -0,0 +1,5 @@
+import { consoleLog } from './utils.js';
+
+export default (data?: string) => {
+  consoleLog(`Hello from package-esmodule ${data}`);
+};

examples/package-esmodule/src/utils.ts

@@ -0,0 +1,3 @@
+export function consoleLog(data: string) {
+  console.log(data);
+}

examples/package-esmodule/tsconfig.build.cjs.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.build.cjs.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "lib": ["esnext", "DOM"],
+    "outDir": "lib"
+  },
+  "include": [
+    "src"
+  ]
+}

examples/package-esmodule/tsconfig.build.esm.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.build.esm.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "lib": ["esnext", "DOM"],
+    "outDir": "esm"
+  },
+  "include": [
+    "src"
+  ]
+}

examples/package-esmodule/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "lib": ["esnext", "DOM"],
+  },
+  "include": ["src"]
+}

package.json

@@ -79,7 +79,7 @@
     "typedoc-plugin-markdown": "^3.12.1",
     "typedoc-plugin-missing-exports": "^0.23.0",
     "turbo": "1.3.4",
-    "typescript": "4.8.4"
+    "typescript": "5.5.2"
   },
   "pnpm": {
     "peerDependencyRules": {

packages/compiler/tsconfig.build.json

@@ -1,8 +1,7 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.build.cjs.json",
   "compilerOptions": {
     "outDir": "lib",
-    "module": "commonjs"
   },
   "include": ["src"]
 }

packages/error-overlay/package.json

@@ -10,12 +10,12 @@
   "scripts": {
     "dev": "run-p watch:*",
     "watch:iframe": "cross-env NODE_ENV=development rollup -c rollup.config.iframe.js -w",
-    "watch:cjs": "tsc -p tsconfig.build.json -m commonjs --outDir lib -w",
+    "watch:cjs": "tsc -p tsconfig.build.cjs.json -w",
     "watch:umd": "cross-env NODE_ENV=development rollup -c rollup.config.js -w",
     "prebuild": "rimraf lib",
     "build": "pnpm run iframe-prod && run-p build:*",
     "iframe-prod": "cross-env NODE_ENV=production rollup -c rollup.config.iframe.js",
-    "build:cjs": "tsc -p tsconfig.build.json -m commonjs --outDir lib",
+    "build:cjs": "tsc -p tsconfig.build.cjs.json",
     "build:umd": "cross-env NODE_ENV=production rollup -c rollup.config.js"
   },
   "engines": {

packages/error-overlay/rollup.config.iframe.js

@@ -23,7 +23,7 @@ export default {
     }),
     resolve({ extensions }),
     ts({
-      tsconfig: path.join('./tsconfig.build.json'),
+      tsconfig: path.join('./tsconfig.build.rollup.json'),
       declaration: false
     }),
     commonjs({ extensions })

packages/error-overlay/rollup.config.js

@@ -31,7 +31,7 @@ export default {
     }),
     resolve({ extensions }),
     ts({
-      tsconfig: path.join('./tsconfig.build.json'),
+      tsconfig: path.join('./tsconfig.build.rollup.json'),
       declaration: false
     }),
     commonjs({ extensions })

packages/error-overlay/tsconfig.build.cjs.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.build.cjs.json",
+  "compilerOptions": {
+    "lib": ["esnext", "dom"],
+    "esModuleInterop": true,
+    "jsx": "react-jsx",
+    "outDir": "lib",
+  },
+  "include": ["src"]
+}

packages/error-overlay/tsconfig.build.json → packages/error-overlay/tsconfig.build.rollup.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "lib": ["esnext", "dom"],
     "module": "node16",

packages/eslint-plugin-shuvi/tsconfig.json

@@ -1,8 +1,7 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.build.cjs.json",
   "compilerOptions": {
     "outDir": "lib",
-    "module": "commonjs",
     "esModuleInterop": true
   },
   "include": ["src"]

packages/hook/package.json

@@ -14,12 +14,12 @@
   },
   "scripts": {
     "dev": "run-p watch:*",
-    "watch:esm": "tsc -p tsconfig.build.json -m esnext --outDir esm -w",
-    "watch:cjs": "tsc -p tsconfig.build.json -m commonjs --outDir lib -w",
+    "watch:esm": "tsc -p tsconfig.build.esm.json -w",
+    "watch:cjs": "tsc -p tsconfig.build.cjs.json -w",
     "prebuild": "rimraf lib esm",
     "build": "run-p build:*",
-    "build:esm": "tsc -p tsconfig.build.json -m esnext --outDir esm",
-    "build:cjs": "tsc -p tsconfig.build.json -m commonjs --outDir lib"
+    "build:esm": "tsc -p tsconfig.build.esm.json",
+    "build:cjs": "tsc -p tsconfig.build.cjs.json"
   },
   "author": "Zheng Yu Tay"
 }

packages/hook/src/hookGroup.ts

@@ -136,7 +136,7 @@ export const createHookManager = <HM extends HookMap, C = void>(
         if (!_hookHandlers[hookName]) {
           _hookHandlers[hookName] = [];
         }
-        _hookHandlers[hookName].push(handlers[hookName]);
+        _hookHandlers[hookName]!.push(handlers[hookName]);
       }
     });
   };

packages/hook/tsconfig.build.cjs.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.build.cjs.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "lib": ["esnext", "DOM"],
+    "outDir": "lib"
+  },
+  "include": [
+    "src"
+  ]
+}

packages/hook/tsconfig.build.esm.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.build.esm.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "lib": ["esnext", "DOM"],
+    "outDir": "esm"
+  },
+  "include": [
+    "src"
+  ]
+}

packages/platform-shared/tsconfig.build.browser.json

@@ -1,9 +1,8 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.build.esm.json",
   "compilerOptions": {
     "lib": ["esnext", "DOM"],
     "esModuleInterop": false,
-    "module": "esnext",
     "rootDir": "./src",
     "outDir": "esm"
   },

packages/platform-shared/tsconfig.build.node.json

@@ -1,9 +1,8 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.build.cjs.json",
   "compilerOptions": {
     "lib": ["esnext", "DOM"],
     "esModuleInterop": true,
-    "module": "commonjs",
     "rootDir": "./src",
     "outDir": "lib"
   },

packages/platform-web/tsconfig.build.browser.json

@@ -1,10 +1,9 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.build.esm.json",
   "compilerOptions": {
     "lib": ["esnext", "DOM"],
     "esModuleInterop": false,
     "jsx": "preserve",
-    "module": "esnext",
     "rootDir": "./src",
     "outDir": "esm"
   },

packages/platform-web/tsconfig.build.node.json

@@ -1,10 +1,9 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.build.cjs.json",
   "compilerOptions": {
     "lib": ["esnext", "DOM"],
     "esModuleInterop": true,
     "outDir": "lib",
-    "module": "commonjs",
     "rootDir": "./src"
   },
   "include": ["src/node"]

packages/reporters/package.json

@@ -8,9 +8,9 @@
     "lib"
   ],
   "scripts": {
-    "dev": "tsc -p tsconfig.build.json -m commonjs -w",
+    "dev": "tsc -p tsconfig.build.json -w",
     "prebuild": "rimraf lib",
-    "build": "tsc -p tsconfig.build.json -m commonjs"
+    "build": "tsc -p tsconfig.build.json"
   },
   "dependencies": {
     "@shuvi/shared": "1.0.55",

packages/reporters/tsconfig.build.json

@@ -1,10 +1,9 @@
 {
-  "extends": "../../tsconfig.build.json",
+  "extends": "../../tsconfig.build.cjs.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "lib",
     "lib": ["esnext", "DOM"],
-    "module": "commonjs",
     "esModuleInterop": true
   },
   "include": ["src"]

packages/router-react/package.json

@@ -17,12 +17,12 @@
   ],
   "scripts": {
     "dev": "run-p watch:*",
-    "watch:esm": "tsc -p tsconfig.build.json -m esnext --outDir esm -w",
-    "watch:cjs": "tsc -p tsconfig.build.json -m commonjs --outDir lib -w",
+    "watch:esm": "tsc -p tsconfig.build.esm.json -w",
+    "watch:cjs": "tsc -p tsconfig.build.cjs.json -w",
     "prebuild": "rimraf lib esm",
     "build": "run-p build:*",
-    "build:esm": "tsc -p tsconfig.build.json -m esnext --outDir esm",
-    "build:cjs": "tsc -p tsconfig.build.json -m commonjs --outDir lib"
+    "build:esm": "tsc -p tsconfig.build.esm.json",
+    "build:cjs": "tsc -p tsconfig.build.cjs.json"
   },
   "engines": {
     "node": ">= 16.0.0"

packages/router-react/tsconfig.build.cjs.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.build.cjs.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "lib": ["esnext", "DOM"],
+    "outDir": "lib"
+  },
+  "include": [
+    "src"
+  ]
+}

packages/router-react/tsconfig.build.esm.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.build.esm.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "lib": ["esnext", "DOM"],
+    "outDir": "esm"
+  },
+  "include": [
+    "src"
+  ]
+}