@modern-js/runtime 1.21.2 → 2.0.0-beta.0

package/package.json

@@ -11,9 +11,12 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.2",
+  "version": "2.0.0-beta.0",
+  "engines": {
+    "node": ">=14.17.6"
+  },
   "jsnext:source": "./src/index.ts",
-  "types": "./type.d.ts",
+  "types": "./dist/types/index",
   "main": "./dist/js/node/index.js",
   "module": "./dist/js/treeshaking/index.js",
   "jsnext:modern": "./dist/js/modern/index.js",
@@ -25,10 +28,6 @@
       },
       "default": "./dist/js/treeshaking/index.js"
     },
-    "./types": {
-      "jsnext:source": "./lib/types.d.ts",
-      "default": "./lib/types.d.ts"
-    },
     "./loadable": {
       "jsnext:source": "./src/exports/loadable.ts",
       "node": "./dist/js/node/exports/loadable.js",
@@ -49,11 +48,6 @@
       "node": "./dist/js/node/exports/server.js",
       "default": "./dist/js/treeshaking/exports/server.js"
     },
-    "./router": {
-      "jsnext:source": "./src/router/index.ts",
-      "node": "./dist/js/node/router/index",
-      "default": "./dist/js/treeshaking/router/index.js"
-    },
     "./ssr": {
       "jsnext:source": "./src/ssr/index.ts",
       "node": "./dist/js/node/ssr/index",
@@ -67,15 +61,25 @@
     "./cli": {
       "jsnext:source": "./src/cli/index.ts",
       "default": "./dist/js/node/cli/index.js"
+    },
+    "./router": {
+      "jsnext:source": "./src/router/index.ts",
+      "node": "./dist/js/node/router/index.js",
+      "default": "./dist/js/treeshaking/router/index.js"
+    },
+    "./router-server": {
+      "jsnext:source": "./src/router/server/index.ts",
+      "node": "./dist/js/node/router/server/index.js",
+      "default": "./dist/js/treeshaking/router/server/index.js"
     }
   },
   "typesVersions": {
     "*": {
       ".": [
-        "./type.d.ts"
+        "./dist/types/index.d.ts"
       ],
       "types": [
-        "./lib/types.d.ts"
+        "./types/index.d.ts"
       ],
       "loadable": [
         "./dist/types/exports/loadable.d.ts"
@@ -92,70 +96,73 @@
       "ssr": [
         "./dist/types/ssr/index.d.ts"
       ],
+      "model": [
+        "./types/model.d.ts"
+      ],
       "router": [
         "./dist/types/router/index.d.ts"
       ],
-      "model": [
-        "./types/model.d.ts"
+      "router-server": [
+        "./dist/types/router/server/index.d.ts"
       ]
     }
   },
   "dependencies": {
-    "react-helmet": "^6.1.0",
-    "react-side-effect": "^2.1.1",
-    "react-is": "^17",
-    "serialize-javascript": "^6.0.0",
-    "history": "^4.7.9",
-    "react-router-dom": "^5.1.2",
-    "hoist-non-react-statics": "^3.3.2",
-    "invariant": "^2.2.4",
-    "redux-logger": "^3.0.6",
-    "styled-components": "^5.3.1",
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
     "@loadable/babel-plugin": "^5.13.2",
-    "@loadable/server": "^5.15.1",
+    "@loadable/webpack-plugin": "5.15.2",
     "@loadable/component": "^5.15.0",
-    "@modern-js/plugin": "1.21.2",
-    "@modern-js/webpack": "1.21.2",
-    "@modern-js/utils": "1.21.2",
+    "@loadable/server": "^5.15.1",
     "@modern-js-reduck/plugin-auto-actions": "^1.0.2",
     "@modern-js-reduck/plugin-devtools": "^1.0.3",
     "@modern-js-reduck/plugin-effects": "^1.0.2",
     "@modern-js-reduck/plugin-immutable": "^1.0.1",
     "@modern-js-reduck/react": "^1.0.1",
     "@modern-js-reduck/store": "^1.0.3",
-    "@types/history": "^4.7.9",
-    "@types/react-router-dom": "^5.1.8",
+    "@modern-js/plugin": "2.0.0-beta.0",
+    "@modern-js/types": "2.0.0-beta.0",
+    "@modern-js/utils": "2.0.0-beta.0",
+    "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/redux-logger": "^3.0.9",
-    "@types/loadable__component": "^5.13.4",
-    "@types/styled-components": "^5.1.14"
+    "@types/styled-components": "^5.1.14",
+    "hoist-non-react-statics": "^3.3.2",
+    "invariant": "^2.2.4",
+    "react-helmet": "^6.1.0",
+    "@remix-run/node": "^1.7.0",
+    "@remix-run/router": "^1.0.1",
+    "react-is": "^18",
+    "react-router-dom": "^6.4.0",
+    "react-side-effect": "^2.1.1",
+    "redux-logger": "^3.0.6",
+    "serialize-javascript": "^6.0.0",
+    "styled-components": "^5.3.1"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
-    "react": "^17",
-    "react-dom": "^17",
-    "ts-jest": "^27.0.4",
-    "typescript": "^4",
-    "jest": "^27",
-    "@modern-js/core": "1.21.2",
-    "@modern-js/types": "1.21.2",
-    "@modern-js/utils": "1.21.2",
+    "@modern-js/core": "2.0.0-beta.0",
+    "@modern-js/server-core": "2.0.0-beta.0",
+    "@modern-js/utils": "2.0.0-beta.0",
+    "@scripts/build": "2.0.0-beta.0",
+    "@scripts/jest-config": "2.0.0-beta.0",
+    "@testing-library/react": "^13.4.0",
+    "@testing-library/react-hooks": "^8.0.1",
+    "@remix-run/web-fetch": "^4.1.3",
+    "@types/invariant": "^2.2.30",
     "@types/jest": "^27",
+    "@types/loadable__webpack-plugin": "^5.7.3",
     "@types/node": "^14",
     "@types/react-side-effect": "^1.1.1",
-    "@types/loadable__webpack-plugin": "^5.7.3",
     "@types/serialize-javascript": "^5.0.1",
-    "@scripts/build": "1.21.2",
-    "@scripts/jest-config": "1.21.2",
-    "@testing-library/react": "^12.0.0",
-    "@testing-library/react-hooks": "^7.0.1",
-    "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/invariant": "^2.2.30"
+    "jest": "^27",
+    "react": "^18",
+    "react-dom": "^18",
+    "ts-jest": "^27.0.4",
+    "typescript": "^4"
   },
   "sideEffects": false,
   "modernConfig": {},
@@ -163,33 +170,10 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "dev": "modern build --watch",
     "new": "modern new",
-    "build": "wireit",
-    "test": "wireit"
+    "build": "modern build",
+    "test": "jest --passWithNoTests"
   }
 }

package/types/index.d.ts

@@ -0,0 +1,13 @@
+import { StateConfig } from '../dist/types';
+
+declare module '@modern-js/core/config' {
+  interface RuntimeConfig {
+    state?: StateConfig | boolean;
+  }
+}
+
+declare module 'http' {
+  interface ServerResponse {
+    locals: Record<string, any>;
+  }
+}

package/types/router.d.ts

@@ -0,0 +1,14 @@
+import { RouterConfig } from '../dist/types';
+import '../dist/types/router';
+
+declare module '@modern-js/core/config' {
+  interface RuntimeConfig {
+    router?: RouterConfig | boolean;
+  }
+}
+
+declare module '@modern-js/runtime' {
+  interface AppConfig {
+    router?: RouterConfig | boolean;
+  }
+}

package/dist/js/modern/ssr/serverRender/measure.js

@@ -1,11 +0,0 @@
-const getLatency = hrtime => {
-  const [s, ns] = process.hrtime(hrtime);
-  return s * 1e3 + ns / 1e6;
-};
-
-export const time = () => {
-  const hrtime = process.hrtime();
-  return () => {
-    return getLatency(hrtime);
-  };
-};

package/dist/js/node/ssr/serverRender/measure.js

@@ -1,20 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.time = void 0;
-
-const getLatency = hrtime => {
-  const [s, ns] = process.hrtime(hrtime);
-  return s * 1e3 + ns / 1e6;
-};
-
-const time = () => {
-  const hrtime = process.hrtime();
-  return () => {
-    return getLatency(hrtime);
-  };
-};
-
-exports.time = time;

package/dist/types/ssr/serverRender/measure.d.ts

@@ -1 +0,0 @@
-export declare const time: () => () => number;

package/lib/types.d.ts

@@ -1,10 +0,0 @@
-/// <reference path="../dist/types/index.d.ts" />
-
-import { RouterConfig, StateConfig } from "../dist/types";
-
-declare module '@modern-js/core' {
-    interface RuntimeConfig {
-      router?: RouterConfig | boolean;
-      state?: StateConfig | boolean;
-    }
-  }

package/type.d.ts

@@ -1,5 +0,0 @@
-declare module '@modern-js/runtime' {
-  export * from './dist/types';
-}
-
-export * from './dist/types';