@modern-js/runtime 1.1.2 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,82 @@
 # @modern-js/runtime
 
+## 1.2.2
+
+### Patch Changes
+
+- d099e5c5: fix error when modify modern.config.js
+- 24f616ca: feat: support custom meta info
+- Updated dependencies [816fd721]
+- Updated dependencies [d9cc5ea9]
+- Updated dependencies [bfbea9a7]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [ec4dbffb]
+- Updated dependencies [d099e5c5]
+- Updated dependencies [bada2879]
+- Updated dependencies [24f616ca]
+- Updated dependencies [bd819a8d]
+- Updated dependencies [272cab15]
+  - @modern-js/plugin-ssr@1.2.1
+  - @modern-js/core@1.4.0
+  - @modern-js/plugin-router@1.2.2
+  - @modern-js/runtime-core@1.2.2
+  - @modern-js/utils@1.3.0
+
+## 1.2.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+- Updated dependencies [c3de9882]
+- Updated dependencies [33ff48af]
+- Updated dependencies [c74597bd]
+  - @modern-js/core@1.3.2
+  - @modern-js/plugin-router@1.2.1
+  - @modern-js/plugin-state@1.2.1
+  - @modern-js/runtime-core@1.2.1
+  - @modern-js/bff-runtime@1.2.1
+  - @modern-js/create-request@1.2.1
+  - @modern-js/utils@1.2.2
+
+## 1.2.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- 146dcd85: modify server framework plugin hook types and hook context
+- 146dcd85: modify server framework plugin hook types
+- 146dcd85: fix test case in babel compiler
+- Updated dependencies [2da09c69]
+- Updated dependencies [5597289b]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [146dcd85]
+- Updated dependencies [a2cb9abc]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+- Updated dependencies [146dcd85]
+- Updated dependencies [146dcd85]
+  - @modern-js/utils@1.2.0
+  - @modern-js/plugin-ssr@1.2.0
+  - @modern-js/create-request@1.2.0
+  - @modern-js/core@1.3.0
+  - @modern-js/bff-runtime@1.2.0
+  - @modern-js/runtime-core@1.2.0
+  - @modern-js/plugin-router@1.2.0
+  - @modern-js/plugin-state@1.2.0
+
+## 1.1.3
+
+### Patch Changes
+
+- b8deff8b: feat: add isBrowser in runtime context
+- Updated dependencies [e63591cc]
+  - @modern-js/plugin-router@1.1.3
+  - @modern-js/runtime-core@1.1.4
+
 ## 1.1.2
 
 ### Patch Changes

package/dist/js/modern/cli/index.js

@@ -1,14 +1,8 @@
 import path from 'path';
-import { PLUGIN_SCHEMAS, createRuntimeExportsUtils } from '@modern-js/utils';
+import { PLUGIN_SCHEMAS, createRuntimeExportsUtils, cleanRequireCache } from '@modern-js/utils';
 import { createPlugin, usePlugins, useAppContext } from '@modern-js/core';
 
-const useInternalDirectory = () => {
-  try {
-    return useAppContext().internalDirectory;
-  } catch (_unused) {
-    return path.join(process.cwd(), 'node_modules/.modern-js');
-  }
-}; // eslint-disable-next-line react-hooks/rules-of-hooks
+const useInternalDirectory = () => useAppContext().internalDirectory; // eslint-disable-next-line react-hooks/rules-of-hooks
 
 
 usePlugins([require.resolve('@modern-js/plugin-state/cli'), require.resolve('@modern-js/plugin-router/cli'), require.resolve('@modern-js/plugin-ssr/cli')]);
@@ -37,6 +31,10 @@ export default createPlugin(() => {
     addRuntimeExports() {
       const runtimePackage = path.resolve(__dirname, '../../../../');
       runtimeExportsUtils.addExport(`export * from '${runtimePackage}'`);
+    },
+
+    async beforeRestart() {
+      cleanRequireCache([require.resolve('@modern-js/plugin-state/cli'), require.resolve('@modern-js/plugin-router/cli'), require.resolve('@modern-js/plugin-ssr/cli')]);
     }
 
   };

package/dist/js/modern/exports/server.js

@@ -1 +1,2 @@
-export * from '@modern-js/bff-runtime';
+export * from '@modern-js/bff-runtime';
+export const hook = attacher => attacher;

package/dist/js/node/cli/index.js

@@ -13,13 +13,7 @@ var _core = require("@modern-js/core");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const useInternalDirectory = () => {
-  try {
-    return (0, _core.useAppContext)().internalDirectory;
-  } catch (_unused) {
-    return _path.default.join(process.cwd(), 'node_modules/.modern-js');
-  }
-}; // eslint-disable-next-line react-hooks/rules-of-hooks
+const useInternalDirectory = () => (0, _core.useAppContext)().internalDirectory; // eslint-disable-next-line react-hooks/rules-of-hooks
 
 
 (0, _core.usePlugins)([require.resolve('@modern-js/plugin-state/cli'), require.resolve('@modern-js/plugin-router/cli'), require.resolve('@modern-js/plugin-ssr/cli')]);
@@ -50,6 +44,10 @@ var _default = (0, _core.createPlugin)(() => {
       const runtimePackage = _path.default.resolve(__dirname, '../../../../');
 
       runtimeExportsUtils.addExport(`export * from '${runtimePackage}'`);
+    },
+
+    async beforeRestart() {
+      (0, _utils.cleanRequireCache)([require.resolve('@modern-js/plugin-state/cli'), require.resolve('@modern-js/plugin-router/cli'), require.resolve('@modern-js/plugin-ssr/cli')]);
     }
 
   };

package/dist/js/node/exports/server.js

@@ -3,11 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  hook: true
+};
+exports.hook = void 0;
 
 var _bffRuntime = require("@modern-js/bff-runtime");
 
 Object.keys(_bffRuntime).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _bffRuntime[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -15,4 +20,8 @@ Object.keys(_bffRuntime).forEach(function (key) {
       return _bffRuntime[key];
     }
   });
-});
+});
+
+const hook = attacher => attacher;
+
+exports.hook = hook;

package/dist/js/treeshaking/cli/index.js

@@ -1,13 +1,15 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 import path from 'path';
-import { PLUGIN_SCHEMAS, createRuntimeExportsUtils } from '@modern-js/utils';
+import { PLUGIN_SCHEMAS, createRuntimeExportsUtils, cleanRequireCache } from '@modern-js/utils';
 import { createPlugin, usePlugins, useAppContext } from '@modern-js/core';
 
 var useInternalDirectory = function useInternalDirectory() {
-  try {
-    return useAppContext().internalDirectory;
-  } catch (_unused) {
-    return path.join(process.cwd(), 'node_modules/.modern-js');
-  }
+  return useAppContext().internalDirectory;
 }; // eslint-disable-next-line react-hooks/rules-of-hooks
 
 
@@ -35,6 +37,22 @@ export default createPlugin(function () {
     addRuntimeExports: function addRuntimeExports() {
       var runtimePackage = path.resolve(__dirname, '../../../../');
       runtimeExportsUtils.addExport("export * from '".concat(runtimePackage, "'"));
+    },
+    beforeRestart: function beforeRestart() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                cleanRequireCache([require.resolve('@modern-js/plugin-state/cli'), require.resolve('@modern-js/plugin-router/cli'), require.resolve('@modern-js/plugin-ssr/cli')]);
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
     }
   };
 }, {

package/dist/js/treeshaking/exports/server.js

@@ -1 +1,4 @@
-export * from '@modern-js/bff-runtime';
+export * from '@modern-js/bff-runtime';
+export var hook = function hook(attacher) {
+  return attacher;
+};

package/dist/types/exports/server.d.ts

@@ -1 +1,2 @@
-export * from '@modern-js/bff-runtime';
+export * from '@modern-js/bff-runtime';
+export declare const hook: (attacher: any) => any;

package/jest.config.js

@@ -0,0 +1,8 @@
+const sharedConfig = require('@scripts/jest-config');
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+module.exports = {
+  // eslint-disable-next-line node/no-unsupported-features/es-syntax
+  ...sharedConfig,
+  rootDir: __dirname,
+};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.2",
+  "version": "1.2.2",
   "jsnext:source": "./src/index.ts",
   "types": "./type.d.ts",
   "main": "./dist/js/node/index.js",
@@ -19,42 +19,56 @@
   "jsnext:modern": "./dist/js/modern/index.js",
   "exports": {
     ".": {
-      "node": "./dist/js/node/index.js",
+      "node": {
+        "jsnext:source": "./src/index.ts",
+        "default": "./dist/js/node/index.js"
+      },
       "default": "./dist/js/treeshaking/index.js"
     },
     "./loadable": {
+      "jsnext:source": "./src/exports/loadable.ts",
       "node": "./dist/js/node/exports/loadable.js",
       "default": "./dist/js/treeshaking/exports/loadable.js"
     },
     "./head": {
+      "jsnext:source": "./src/exports/head.ts",
       "node": "./dist/js/node/exports/head.js",
       "default": "./dist/js/treeshaking/exports/head.js"
     },
     "./styled": {
+      "jsnext:source": "./src/exports/styled.ts",
       "node": "./dist/js/node/exports/styled.js",
       "default": "./dist/js/treeshaking/exports/styled.js"
     },
     "./server": {
+      "jsnext:source": "./src/exports/server.ts",
       "node": "./dist/js/node/exports/server.js",
       "default": "./dist/js/treeshaking/exports/server.js"
     },
     "./router": {
+      "jsnext:source": "./src/exports/router.ts",
       "node": "./dist/js/node/exports/router.js",
       "default": "./dist/js/treeshaking/exports/router.js"
     },
     "./ssr": {
+      "jsnext:source": "./src/exports/ssr.ts",
       "node": "./dist/js/node/exports/ssr.js",
       "default": "./dist/js/treeshaking/exports/ssr.js"
     },
     "./model": {
+      "jsnext:source": "./src/exports/model.ts",
       "node": "./dist/js/node/exports/model.js",
       "default": "./dist/js/treeshaking/exports/model.js"
     },
     "./request": {
+      "jsnext:source": "./src/exports/request.ts",
       "node": "./dist/js/node/exports/request.js",
       "default": "./dist/js/treeshaking/exports/request.js"
     },
-    "./cli": "./dist/js/node/cli/index.js"
+    "./cli": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
+    }
   },
   "typesVersions": {
     "*": {
@@ -89,43 +103,45 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
+    "@modern-js/plugin-router": "^1.2.2",
+    "@modern-js/plugin-ssr": "^1.2.1",
+    "@modern-js/plugin-state": "^1.2.1",
+    "@modern-js/runtime-core": "^1.2.2",
+    "@modern-js/utils": "^1.3.0",
+    "@modern-js/bff-runtime": "^1.2.1",
+    "@modern-js/create-request": "^1.2.1",
     "@loadable/component": "^5.15.0",
-    "@modern-js/bff-runtime": "^1.1.1",
-    "@modern-js/create-request": "^1.1.2",
-    "@modern-js/plugin-router": "^1.1.2",
-    "@modern-js/plugin-ssr": "^1.1.3",
-    "@modern-js/plugin-state": "^1.1.4",
-    "@modern-js/runtime-core": "^1.1.3",
-    "@modern-js/utils": "^1.1.6",
-    "@types/loadable__component": "^5.13.4",
-    "@types/react-helmet": "^6.1.2",
-    "@types/styled-components": "^5.1.13",
     "react-helmet": "^6.1.0",
     "styled-components": "^5.3.1"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.1.2",
-    "@modern-js/module-tools": "^1.1.4",
-    "@modern-js/plugin-testing": "^1.2.2",
+    "@modern-js/core": "^1.4.0",
+    "@scripts/build": "0.0.0",
+    "@types/loadable__component": "^5.13.4",
+    "@types/react-helmet": "^6.1.2",
+    "@types/styled-components": "^5.1.13",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
-    "typescript": "^4"
+    "typescript": "^4",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.1.2"
+    "@modern-js/core": "^1.4.0"
   },
   "sideEffects": false,
   "modernConfig": {},
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./type.d.ts"
   },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
-    "test": "modern test --passWithNoTests"
+    "test": "jest --passWithNoTests"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/tests/index.test.ts

@@ -0,0 +1,14 @@
+import { createApp, createPlugin, useRuntimeContext } from '../src';
+import plugin from '../src/cli';
+
+describe('plugin-runtime', () => {
+  it('default', () => {
+    expect(plugin).toBeDefined();
+    expect(createApp).toBeDefined();
+    expect(createPlugin).toBeDefined();
+    expect(useRuntimeContext).toBeDefined();
+
+    const hooks = plugin.initializer();
+    expect(hooks.beforeRestart).toBeDefined();
+  });
+});

package/tests/server.test.ts

@@ -0,0 +1,10 @@
+import { hook } from '../src/exports/server';
+
+describe('runtime export', () => {
+  it('should return self after hook', () => {
+    const fn = () => {
+      // empty
+    };
+    expect(hook(fn)).toBe(fn);
+  });
+});

package/tests/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "declaration": false,
+    "jsx": "preserve",
+    "baseUrl": "./",
+    "noEmit": true,
+    "isolatedModules": true,
+    "sourceMap": true,
+    "types": ["node", "jest"]
+  },
+  "paths": {}
+}

package/tsconfig.json

@@ -5,9 +5,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "paths": {}
   },
   "include": ["src"]
 }

package/src/.eslintrc.json

@@ -1,3 +0,0 @@
-{
-  "extends": ["@modern-js-app"]
-}

package/src/cli/index.ts

@@ -1,60 +0,0 @@
-import path from 'path';
-import { PLUGIN_SCHEMAS, createRuntimeExportsUtils } from '@modern-js/utils';
-import { createPlugin, usePlugins, useAppContext } from '@modern-js/core';
-
-const useInternalDirectory = () => {
-  try {
-    return useAppContext().internalDirectory;
-  } catch {
-    return path.join(process.cwd(), 'node_modules/.modern-js');
-  }
-};
-
-// eslint-disable-next-line react-hooks/rules-of-hooks
-usePlugins([
-  require.resolve('@modern-js/plugin-state/cli'),
-  require.resolve('@modern-js/plugin-router/cli'),
-  require.resolve('@modern-js/plugin-ssr/cli'),
-]);
-
-export default createPlugin(
-  () => {
-    let runtimeExportsUtils: ReturnType<typeof createRuntimeExportsUtils> =
-      {} as any;
-
-    return {
-      config() {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        const dir = useInternalDirectory();
-
-        runtimeExportsUtils = createRuntimeExportsUtils(dir, 'index');
-
-        return {
-          runtime: {},
-          runtimeByEntries: {},
-          source: {
-            alias: {
-              '@modern-js/runtime$': runtimeExportsUtils.getPath(),
-            },
-          },
-        };
-      },
-      validateSchema() {
-        return PLUGIN_SCHEMAS['@modern-js/runtime'];
-      },
-      addRuntimeExports() {
-        const runtimePackage = path.resolve(__dirname, '../../../../');
-
-        runtimeExportsUtils.addExport(`export * from '${runtimePackage}'`);
-      },
-    };
-  },
-  {
-    name: '@modern-js/runtime',
-    post: [
-      '@modern-js/plugin-router',
-      '@modern-js/plugin-ssr',
-      '@modern-js/plugin-state',
-    ],
-  },
-) as any;

package/src/cli/types.d.ts

@@ -1 +0,0 @@
-declare module '@loadable/webpack-plugin';

package/src/exports/head.ts

@@ -1,5 +0,0 @@
-import head from 'react-helmet';
-
-export default head;
-
-export * from 'react-helmet';

package/src/exports/loadable.ts

@@ -1,5 +0,0 @@
-import loadable from '@loadable/component';
-
-export default loadable;
-
-export * from '@loadable/component';

package/src/exports/model.ts

@@ -1 +0,0 @@
-export * from '@modern-js/plugin-state';

package/src/exports/request.ts

@@ -1 +0,0 @@
-export { configure } from '@modern-js/create-request';

package/src/exports/router.ts

@@ -1 +0,0 @@
-export * from '@modern-js/plugin-router';

package/src/exports/server.ts

@@ -1 +0,0 @@
-export * from '@modern-js/bff-runtime';

package/src/exports/ssr.ts

@@ -1 +0,0 @@
-export * from '@modern-js/plugin-ssr';

package/src/exports/styled.ts

@@ -1,5 +0,0 @@
-import styled from '@modern-js/runtime-core/styled';
-
-export default styled;
-
-export * from '@modern-js/runtime-core/styled';

package/src/index.ts

@@ -1,12 +0,0 @@
-export type { RuntimeContext, TRuntimeContext } from '@modern-js/runtime-core';
-export {
-  createApp,
-  createPlugin,
-  useLoader,
-  bootstrap,
-  RuntimeReactContext,
-  registerPrefetch,
-  defineConfig,
-  registerInit,
-  useRuntimeContext,
-} from '@modern-js/runtime-core';