@modern-js/runtime 3.0.0-alpha.0 → 3.0.0-alpha.2

package/package.json

@@ -15,11 +15,10 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.0-alpha.0",
+  "version": "3.0.0-alpha.2",
   "engines": {
     "node": ">=20"
   },
-  "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.mjs",
@@ -27,124 +26,103 @@
     ".": {
       "types": "./dist/types/index.d.ts",
       "react-server": "./dist/esm/react-server.mjs",
-      "jsnext:source": "./src/index.ts",
       "default": "./dist/esm/index.mjs"
     },
     "./internal": {
       "types": "./dist/types/internal.d.ts",
-      "jsnext:source": "./src/internal.ts",
       "default": "./dist/esm/internal.mjs"
     },
     "./package.json": "./package.json",
     "./context": {
       "types": "./dist/types/core/context/index.d.ts",
-      "jsnext:source": "./src/core/context/index.ts",
       "default": "./dist/esm/core/context/index.mjs"
     },
     "./plugin": {
       "types": "./dist/types/core/plugin/index.d.ts",
-      "jsnext:source": "./src/core/plugin/index.ts",
       "default": "./dist/esm/core/plugin/index.mjs"
     },
     "./react": {
       "types": "./dist/types/core/react/index.d.ts",
-      "jsnext:source": "./src/core/react/index.ts",
       "default": "./dist/esm/core/react/index.mjs"
     },
     "./browser": {
       "types": "./dist/types/core/browser/index.d.ts",
-      "jsnext:source": "./src/core/browser/index.ts",
       "default": "./dist/esm/core/browser/index.mjs"
     },
     "./loadable": {
       "types": "./dist/types/exports/loadable.d.ts",
-      "jsnext:source": "./src/exports/loadable.ts",
       "default": "./dist/esm/exports/loadable.mjs"
     },
     "./head": {
       "types": "./dist/types/exports/head.d.ts",
-      "jsnext:source": "./src/exports/head.ts",
       "default": "./dist/esm/exports/head.mjs"
     },
-    "./server": {
-      "types": "./dist/types/exports/server.d.ts",
-      "jsnext:source": "./src/exports/server.ts",
-      "node": "./dist/cjs/exports/server.js",
-      "default": "./dist/esm/exports/server.mjs"
-    },
     "./ssr": {
       "types": "./dist/types/core/server/index.d.ts",
-      "jsnext:source": "./src/core/server/index.ts",
       "default": "./dist/esm/core/server/index.mjs"
     },
     "./ssr/server": {
       "types": "./dist/types/core/server/server.d.ts",
-      "jsnext:source": "./src/core/server/server.ts",
       "default": "./dist/esm/core/server/server.mjs"
     },
     "./document": {
       "types": "./dist/types/document/index.d.ts",
-      "jsnext:source": "./src/document/index.ts",
-      "require": "./dist/cjs/document/index.js",
-      "import": "./dist/esm/document/index.mjs",
       "default": "./dist/esm/document/index.mjs"
     },
     "./cli": {
       "types": "./dist/types/cli/index.d.ts",
-      "jsnext:source": "./src/cli/index.ts",
+      "node": {
+        "import": "./dist/esm-node/cli/index.mjs",
+        "require": "./dist/cjs/cli/index.js"
+      },
       "default": "./dist/cjs/cli/index.js"
     },
     "./router": {
       "types": "./dist/types/router/index.d.ts",
-      "jsnext:source": "./src/router/index.ts",
       "react-server": {
         "types": "./dist/types/router/runtime/rsc.d.ts",
-        "jsnext:source": "./src/router/runtime/rsc.ts",
         "default": "./dist/esm/router/runtime/rsc.mjs"
       },
       "default": "./dist/esm/router/index.mjs"
     },
     "./router/server": {
       "types": "./dist/types/router/runtime/server.d.ts",
-      "jsnext:source": "./src/router/runtime/server.ts",
       "default": "./dist/esm/router/runtime/server.mjs"
     },
     "./router/internal": {
       "types": "./dist/types/router/internal.d.ts",
-      "jsnext:source": "./src/router/internal.ts",
       "default": "./dist/esm/router/internal.mjs"
     },
     "./routerHelper": {
       "types": "./dist/types/router/runtime/routerHelper.d.ts",
-      "jsnext:source": "./src/router/runtime/routerHelper.ts",
       "default": "./dist/esm/router/runtime/routerHelper.mjs"
     },
     "./loadable-bundler-plugin": {
       "types": "./dist/types/cli/ssr/loadable-bundler-plugin.d.ts",
-      "jsnext:source": "./src/cli/ssr/loadable-bundler-plugin.ts",
-      "node": "./dist/cjs/cli/ssr/loadable-bundler-plugin.js",
-      "default": "./dist/cjs/cli/ssr/loadable-bundler-plugin.mjs"
+      "node": {
+        "import": "./dist/esm-node/cli/ssr/loadable-bundler-plugin.mjs",
+        "require": "./dist/cjs/cli/ssr/loadable-bundler-plugin.js"
+      },
+      "default": "./dist/cjs/cli/ssr/loadable-bundler-plugin.js"
     },
     "./rsc/server": {
       "types": "./dist/types/rsc/server.d.ts",
-      "jsnext:source": "./src/rsc/server.ts",
       "default": "./dist/esm/rsc/server.mjs"
     },
     "./rsc/client": {
       "types": "./dist/types/rsc/client.d.ts",
-      "jsnext:source": "./src/rsc/client.ts",
       "default": "./dist/esm/rsc/client.mjs"
     },
     "./cache": {
       "types": "./dist/types/cache/index.d.ts",
-      "jsnext:source": "./src/cache/index.ts",
-      "require": "./dist/cjs/cache/index.js",
       "default": "./dist/esm/cache/index.mjs"
     },
     "./config-routes": {
       "types": "./dist/types/exports/config-routes.d.ts",
-      "jsnext:source": "./src/exports/config-routes.ts",
-      "require": "./dist/cjs/exports/config-routes.js",
+      "node": {
+        "import": "./dist/esm-node/exports/config-routes.mjs",
+        "require": "./dist/cjs/exports/config-routes.js"
+      },
       "default": "./dist/cjs/exports/config-routes.js"
     }
   },
@@ -189,9 +167,6 @@
       "router": [
         "./dist/types/router/index.d.ts"
       ],
-      "router/rsc": [
-        "./dist/types/router/runtime/rsc.d.ts"
-      ],
       "router/server": [
         "./dist/types/router/runtime/server.d.ts"
       ],
@@ -221,49 +196,46 @@
   "dependencies": {
     "@loadable/component": "5.16.7",
     "@loadable/server": "5.16.7",
-    "@swc/plugin-loadable-components": "^9.0.0",
     "@swc/helpers": "^0.5.17",
+    "@swc/plugin-loadable-components": "^11.4.0",
     "@types/loadable__component": "^5.13.10",
     "@types/react-helmet": "^6.1.11",
     "cookie": "0.7.2",
+    "entities": "^7.0.1",
     "es-module-lexer": "^1.7.0",
     "esbuild": "0.25.5",
     "invariant": "^2.2.4",
     "isbot": "3.8.0",
     "react-helmet": "^6.1.0",
     "react-is": "^18.3.1",
-    "entities": "^7.0.0",
-    "@modern-js/plugin-data-loader": "3.0.0-alpha.0",
-    "@modern-js/plugin": "3.0.0-alpha.0",
-    "@modern-js/render": "3.0.0-alpha.0",
-    "@modern-js/runtime-utils": "3.0.0-alpha.0",
-    "@modern-js/types": "3.0.0-alpha.0",
-    "@modern-js/utils": "3.0.0-alpha.0"
+    "@modern-js/plugin": "3.0.0-alpha.2",
+    "@modern-js/plugin-data-loader": "3.0.0-alpha.2",
+    "@modern-js/render": "3.0.0-alpha.2",
+    "@modern-js/runtime-utils": "3.0.0-alpha.2",
+    "@modern-js/types": "3.0.0-alpha.2",
+    "@modern-js/utils": "3.0.0-alpha.2"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
     "react-dom": ">=17.0.2"
   },
   "devDependencies": {
-    "@rslib/core": "0.18.5",
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.6.15",
-    "@testing-library/react": "^16.3.1",
+    "@rsbuild/core": "2.0.0-beta.0",
+    "@rslib/core": "0.19.3",
     "@testing-library/dom": "^10.4.1",
+    "@testing-library/react": "^16.3.2",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.37",
-    "@types/jest": "^29.5.14",
     "@types/loadable__server": "5.12.11",
     "@types/node": "^20",
-    "jest": "^29.7.0",
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
-    "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "typescript": "^5",
+    "@modern-js/app-tools": "3.0.0-alpha.2",
     "@modern-js/rslib": "2.68.10",
-    "@modern-js/app-tools": "3.0.0-alpha.0",
-    "@scripts/jest-config": "2.66.0"
+    "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -274,6 +246,6 @@
     "dev": "rslib build --watch",
     "build": "rslib build && pnpm run gen-static",
     "gen-static": "ts-node ./scripts/gen-static.ts",
-    "test": "jest"
+    "test": "rstest"
   }
 }

package/rstest.config.ts

@@ -0,0 +1,83 @@
+import type { ProjectConfig } from '@rstest/core';
+import { withTestPreset } from '@scripts/rstest-config';
+
+const commonConfig: ProjectConfig = {
+  setupFiles: ['@scripts/rstest-config/setup.ts'],
+  globals: true,
+  tools: {
+    rspack: {
+      optimization: {
+        // Disable tree shaking to avoid issues with rstest mocking '@modern-js/utils'.
+        providedExports: false,
+      },
+    },
+    swc: {
+      jsc: {
+        transform: {
+          react: {
+            runtime: 'automatic',
+          },
+        },
+      },
+    },
+  },
+};
+
+export default {
+  projects: [
+    withTestPreset({
+      name: 'plugin-runtime-node',
+      testEnvironment: 'node',
+      exclude: ['tests/router/prefetch.test.tsx'],
+      extends: commonConfig,
+      plugins: [
+        {
+          name: 'plugin-runtime-node',
+          setup: api => {
+            api.transform(
+              { test: /document[\\/]+cli[\\/]+index\.ts$/ },
+              ({ code }: { code: string }) => {
+                return code.replace(
+                  "require.resolve('../')",
+                  `require.resolve('../index.ts', {
+        paths: [__dirname],
+      });`,
+                );
+              },
+            );
+          },
+        },
+      ],
+    }),
+    withTestPreset({
+      name: 'plugin-runtime-client',
+      testEnvironment: 'happy-dom',
+      include: ['tests/router/prefetch.test.tsx'],
+      extends: commonConfig,
+      plugins: [
+        {
+          name: 'plugin-runtime-node',
+          setup: api => {
+            api.transform(
+              { test: /PrefetchLink\.tsx$/ },
+              ({
+                code,
+                resourcePath,
+              }: { code: string; resourcePath: string }) => {
+                return code.replace(
+                  '__webpack_chunk_load__',
+                  '__webpack_chunk_load_test__',
+                );
+              },
+            );
+          },
+        },
+      ],
+      source: {
+        define: {
+          WEBPACK_CHUNK_LOAD: '__webpack_chunk_load_test__',
+        },
+      },
+    }),
+  ],
+};