@modern-js/plugin-docsite 1.1.0 → 1.1.3

package/CHANGELOG.md

@@ -1,87 +1,45 @@
 # @modern-js/plugin-docsite
 
-## 1.1.0
-
-### Minor Changes
-
-- 96119db2: Relese v1.1.0
-
-  1. 全面支持 Windows 平台
-
-  ISSUE：
-
-  - [182](https://github.com/modern-js-dev/modern.js/issues/182)
-  - [236](https://github.com/modern-js-dev/modern.js/issues/236)
-
-  PR
-
-  - [219](https://github.com/modern-js-dev/modern.js/pull/219)
-  - [247](https://github.com/modern-js-dev/modern.js/pull/247)
-  - [249](https://github.com/modern-js-dev/modern.js/pull/249)
-  - [253](https://github.com/modern-js-dev/modern.js/pull/253)
-  - [268](https://github.com/modern-js-dev/modern.js/pull/268)
-  - [270](https://github.com/modern-js-dev/modern.js/pull/270)
-  - [273](https://github.com/modern-js-dev/modern.js/pull/273)
-  - [276](https://github.com/modern-js-dev/modern.js/pull/276)
-
-  2. 修复 Unbundled 模式启用问题
-
-  ISSUE
-
-  - [186](https://github.com/modern-js-dev/modern.js/issues/186)
-  - [224](https://github.com/modern-js-dev/modern.js/issues/224)
-  - [225](https://github.com/modern-js-dev/modern.js/issues/225)
-  - [238](https://github.com/modern-js-dev/modern.js/issues/238)
-
-  PR
-
-  - [226](https://github.com/modern-js-dev/modern.js/pull/226)
-  - [264](https://github.com/modern-js-dev/modern.js/pull/264)
-  - [codesmith-12](https://github.com/modern-js-dev/codesmith/pull/12)
-
-  3. 修复模块工程方案 .npmignore 文件初始化未生成
+## 1.1.3
 
-  ISSUE
-
-  - [198](https://github.com/modern-js-dev/modern.js/issues/198)
-
-  PR
-
-  - [209](https://github.com/modern-js-dev/modern.js/pull/209)
-
-  4. 修复 Storybook 使用时浏览器打开页面报错
-
-  ISSUE
-
-  - [228](https://github.com/modern-js-dev/modern.js/issues/228)
-
-  PR
-
-  - [254](https://github.com/modern-js-dev/modern.js/pull/254)
-
-  5. 修复 BFF 一体化开发不支持 unbundle 模式
+### Patch Changes
 
-  ISSUE
+- ca7dcb32: add CORE_INIT_OPTION_FILE env
+- Updated dependencies [90eeb72c]
+- Updated dependencies [e04914ce]
+- Updated dependencies [5a4c557e]
+- Updated dependencies [e04914ce]
+- Updated dependencies [ca7dcb32]
+- Updated dependencies [ecb344dc]
+  - @modern-js/core@1.2.0
+  - @modern-js/utils@1.1.5
 
-  - [235](https://github.com/modern-js-dev/modern.js/issues/235)
-  - [257](https://github.com/modern-js-dev/modern.js/issues/257)
+## 1.1.2
 
-  PR
+### Patch Changes
 
-  - [269](https://github.com/modern-js-dev/modern.js/pull/269)
-  - [271](https://github.com/modern-js-dev/modern.js/pull/271)
+- fix missing dependencies bug
 
-  6. 修复 Node17 dev 命令报错问题
+## 1.1.1
 
-  ISSUE
+### Patch Changes
 
-  - [180](https://github.com/modern-js-dev/modern.js/issues/180)
+- 0fa83663: support more .env files
+- Updated dependencies [6f7fe574]
+- Updated dependencies [e4755134]
+- Updated dependencies [0fa83663]
+- Updated dependencies [19b4f79e]
+- Updated dependencies [f594fbc8]
+- Updated dependencies [d1fde77a]
+  - @modern-js/core@1.1.2
+  - @modern-js/webpack@1.1.2
+  - @modern-js/utils@1.1.2
 
-  PR
+## 1.1.0
 
-  - [214](https://github.com/modern-js-dev/modern.js/pull/214)
+### Minor Changes
 
-### Patch Changes
+- 96119db2: Relese v1.1.0### Patch Changes
 
 - 6b802b2a: use path method from @modern-js/utils
 - Updated dependencies [96119db2]

package/dist/js/modern/build-task.js

@@ -14,9 +14,17 @@ const taskMain = async ({
 };
 
 (async () => {
+  let options;
+
+  if (process.env.CORE_INIT_OPTION_FILE) {
+    ({
+      options
+    } = require(process.env.CORE_INIT_OPTION_FILE));
+  }
+
   const {
     appContext
-  } = await core.cli.init();
+  } = await core.cli.init([], options);
   await core.manager.run(async () => {
     try {
       await taskMain({

package/dist/js/modern/features/utils/generate-files.js

@@ -4,9 +4,9 @@ import _union from "lodash/union";
 import _camelCase from "lodash/camelCase";
 import _startCase from "lodash/startCase";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/dist/js/modern/features/utils/webpack.js

@@ -24,24 +24,42 @@ export function generatorWebpackConfig(appDirectory, tmpDir, isDev) {
       templateContent: fs.readFileSync(path.resolve(UTILS_STATIC, 'index.html.ejs'), 'utf8')
     })]
   };
-  config.resolve.modules = [...(config.resolve.modules || []), path.join(__dirname, '../../../../../', 'node_modules')];
+  const docsiteNodeModules = [// for yarn
+  path.dirname(require.resolve('@modern-js/plugin-docsite/package.json')), // for pnpm
+  path.resolve(path.dirname(require.resolve('@modern-js/plugin-docsite/package.json')), '../..')]; // maybe check if outside appDir or monorepoDir
+
+  config.resolve.modules = [...(config.resolve.modules || []), ...docsiteNodeModules];
   config.resolve.alias['@assets'] = path.resolve(appDirectory, 'assets');
   config.resolve.alias['@styles'] = path.resolve(appDirectory, 'styles'); // fix this since react-live relies on core-js@2
 
-  config.resolve.alias[`${path.dirname(require.resolve('core-js'))}/fn`] = 'core-js/es';
-  const pkgJSON = JSON.parse(fs.readFileSync(path.join(appDirectory, 'package.json'), 'utf-8'));
-
-  if (pkgJSON.dependencies.react || pkgJSON.devDependencies.react) {
-    config.resolve.alias.react = path.resolve('node_modules/react');
-  } else {
-    config.resolve.alias.react = path.resolve(__dirname, '../../../../../', 'node_modules', 'react');
-  }
-
-  if (pkgJSON.dependencies['react-dom'] || pkgJSON.devDependencies['react-dom']) {
-    config.resolve.alias['react-dom'] = path.resolve('node_modules/react-dom');
-  } else {
-    config.resolve.alias['react-dom'] = path.resolve(__dirname, '../../../../../', 'node_modules', 'react-dom');
-  }
+  config.resolve.alias[`${path.dirname(require.resolve('core-js'))}/fn`] = 'core-js/es'; // const pkgJSON = JSON.parse(
+  //   fs.readFileSync(path.join(appDirectory, 'package.json'), 'utf-8'),
+  // );
+  // if (pkgJSON.dependencies.react || pkgJSON.devDependencies.react) {
+  //   (config.resolve!.alias as Alias).react = path.resolve('node_modules/react');
+  // } else {
+  //   (config.resolve!.alias as Alias).react = path.resolve(
+  //     __dirname,
+  //     '../../../../../',
+  //     'node_modules',
+  //     'react',
+  //   );
+  // }
+  // if (
+  //   pkgJSON.dependencies['react-dom'] ||
+  //   pkgJSON.devDependencies['react-dom']
+  // ) {
+  //   (config.resolve!.alias as Alias)['react-dom'] = path.resolve(
+  //     'node_modules/react-dom',
+  //   );
+  // } else {
+  //   (config.resolve!.alias as Alias)['react-dom'] = path.resolve(
+  //     __dirname,
+  //     '../../../../../',
+  //     'node_modules',
+  //     'react-dom',
+  //   );
+  // }
 
   config.resolve.fallback = {
     path: require.resolve('path-browserify')

package/dist/js/node/build-task.js

@@ -18,9 +18,17 @@ const taskMain = async ({
 };
 
 (async () => {
+  let options;
+
+  if (process.env.CORE_INIT_OPTION_FILE) {
+    ({
+      options
+    } = require(process.env.CORE_INIT_OPTION_FILE));
+  }
+
   const {
     appContext
-  } = await core.cli.init();
+  } = await core.cli.init([], options);
   await core.manager.run(async () => {
     try {
       await taskMain({

package/dist/js/node/features/utils/generate-files.js

@@ -39,9 +39,9 @@ var _constant = require("../constant");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 

package/dist/js/node/features/utils/webpack.js

@@ -40,24 +40,42 @@ function generatorWebpackConfig(appDirectory, tmpDir, isDev) {
       templateContent: _utils.fs.readFileSync(_path.default.resolve(_constant.UTILS_STATIC, 'index.html.ejs'), 'utf8')
     })]
   };
-  config.resolve.modules = [...(config.resolve.modules || []), _path.default.join(__dirname, '../../../../../', 'node_modules')];
+  const docsiteNodeModules = [// for yarn
+  _path.default.dirname(require.resolve('@modern-js/plugin-docsite/package.json')), // for pnpm
+  _path.default.resolve(_path.default.dirname(require.resolve('@modern-js/plugin-docsite/package.json')), '../..')]; // maybe check if outside appDir or monorepoDir
+
+  config.resolve.modules = [...(config.resolve.modules || []), ...docsiteNodeModules];
   config.resolve.alias['@assets'] = _path.default.resolve(appDirectory, 'assets');
   config.resolve.alias['@styles'] = _path.default.resolve(appDirectory, 'styles'); // fix this since react-live relies on core-js@2
 
-  config.resolve.alias[`${_path.default.dirname(require.resolve('core-js'))}/fn`] = 'core-js/es';
-  const pkgJSON = JSON.parse(_utils.fs.readFileSync(_path.default.join(appDirectory, 'package.json'), 'utf-8'));
-
-  if (pkgJSON.dependencies.react || pkgJSON.devDependencies.react) {
-    config.resolve.alias.react = _path.default.resolve('node_modules/react');
-  } else {
-    config.resolve.alias.react = _path.default.resolve(__dirname, '../../../../../', 'node_modules', 'react');
-  }
-
-  if (pkgJSON.dependencies['react-dom'] || pkgJSON.devDependencies['react-dom']) {
-    config.resolve.alias['react-dom'] = _path.default.resolve('node_modules/react-dom');
-  } else {
-    config.resolve.alias['react-dom'] = _path.default.resolve(__dirname, '../../../../../', 'node_modules', 'react-dom');
-  }
+  config.resolve.alias[`${_path.default.dirname(require.resolve('core-js'))}/fn`] = 'core-js/es'; // const pkgJSON = JSON.parse(
+  //   fs.readFileSync(path.join(appDirectory, 'package.json'), 'utf-8'),
+  // );
+  // if (pkgJSON.dependencies.react || pkgJSON.devDependencies.react) {
+  //   (config.resolve!.alias as Alias).react = path.resolve('node_modules/react');
+  // } else {
+  //   (config.resolve!.alias as Alias).react = path.resolve(
+  //     __dirname,
+  //     '../../../../../',
+  //     'node_modules',
+  //     'react',
+  //   );
+  // }
+  // if (
+  //   pkgJSON.dependencies['react-dom'] ||
+  //   pkgJSON.devDependencies['react-dom']
+  // ) {
+  //   (config.resolve!.alias as Alias)['react-dom'] = path.resolve(
+  //     'node_modules/react-dom',
+  //   );
+  // } else {
+  //   (config.resolve!.alias as Alias)['react-dom'] = path.resolve(
+  //     __dirname,
+  //     '../../../../../',
+  //     'node_modules',
+  //     'react-dom',
+  //   );
+  // }
 
   config.resolve.fallback = {
     path: require.resolve('path-browserify')

package/dist/types/index.d.ts

@@ -1,5 +1,8 @@
 declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@modern-js/core").Progresses2Threads<{
   config: import("@modern-js/core").ParallelWorkflow<void, unknown>;
+  resolvedConfig: import("@modern-js/core").AsyncWaterfall<{
+    resolved: import("@modern-js/core").NormalizedConfig;
+  }>;
   validateSchema: import("@modern-js/core").ParallelWorkflow<void, unknown>;
   prepare: import("@modern-js/core").AsyncWorkflow<void, void>;
   commands: import("@modern-js/core").AsyncWorkflow<{

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.0",
+  "version": "1.1.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -25,15 +25,16 @@
       },
       "default": "./dist/js/treeshaking/index.js"
     },
-    "./cli": "./dist/js/node/index.js"
+    "./cli": "./dist/js/node/index.js",
+    "./package.json": "./package.json"
   },
   "dependencies": {
     "@babel/parser": "^7.15.2",
     "@babel/runtime": "^7",
     "@mdx-js/mdx": "^1.6.22",
     "@mdx-js/react": "^1.6.22",
-    "@modern-js/utils": "^1.1.0",
-    "@modern-js/webpack": "^1.1.0",
+    "@modern-js/utils": "^1.1.5",
+    "@modern-js/webpack": "^1.1.2",
     "antd": "^4.16.13",
     "chokidar": "^3.5.2",
     "core-js": "^3.17.2",
@@ -57,7 +58,7 @@
     "webpack-dev-server": "^4.1.1"
   },
   "devDependencies": {
-    "@modern-js/module-tools-hooks": "^1.1.0",
+    "@modern-js/module-tools-hooks": "^1.1.1",
     "@types/core-js": "^2.5.5",
     "@types/github-slugger": "^1.3.0",
     "@types/glob": "^7.1.4",
@@ -68,12 +69,12 @@
     "@types/react-dom": "^17",
     "@types/webpack-dev-server": "^4.1.0",
     "typescript": "^4",
-    "@modern-js/core": "^1.1.0",
-    "@modern-js/plugin-testing": "^1.0.2",
-    "@modern-js/module-tools": "^1.0.2"
+    "@modern-js/core": "^1.2.0",
+    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/module-tools": "^1.1.2"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.1.0"
+    "@modern-js/core": "^1.2.0"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -95,5 +96,6 @@
     "new": "modern new",
     "build": "modern build",
     "test": "modern test --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/src/build-task.ts

@@ -1,4 +1,4 @@
-import type { IAppContext } from '@modern-js/core';
+import type { IAppContext, CoreOptions } from '@modern-js/core';
 import { Import } from '@modern-js/utils';
 
 const core: typeof import('@modern-js/core') = Import.lazy(
@@ -20,7 +20,11 @@ const taskMain = async ({ appContext }: IBuildTaskOption) => {
 };
 
 (async () => {
-  const { appContext } = await core.cli.init();
+  let options: CoreOptions | undefined;
+  if (process.env.CORE_INIT_OPTION_FILE) {
+    ({ options } = require(process.env.CORE_INIT_OPTION_FILE));
+  }
+  const { appContext } = await core.cli.init([], options);
   await core.manager.run(async () => {
     try {
       await taskMain({ appContext });

package/src/features/utils/webpack.ts

@@ -35,10 +35,20 @@ export function generatorWebpackConfig(
       }),
     ],
   };
+  const docsiteNodeModules = [
+    // for yarn
+    path.dirname(require.resolve('@modern-js/plugin-docsite/package.json')),
+    // for pnpm
+    path.resolve(
+      path.dirname(require.resolve('@modern-js/plugin-docsite/package.json')),
+      '../..',
+    ),
+  ];
 
+  // maybe check if outside appDir or monorepoDir
   config.resolve!.modules = [
     ...(config.resolve!.modules || []),
-    path.join(__dirname, '../../../../../', 'node_modules'),
+    ...docsiteNodeModules,
   ];
   (config.resolve!.alias as Alias)['@assets'] = path.resolve(
     appDirectory,
@@ -53,35 +63,35 @@ export function generatorWebpackConfig(
     `${path.dirname(require.resolve('core-js'))}/fn`
   ] = 'core-js/es';
 
-  const pkgJSON = JSON.parse(
-    fs.readFileSync(path.join(appDirectory, 'package.json'), 'utf-8'),
-  );
+  // const pkgJSON = JSON.parse(
+  //   fs.readFileSync(path.join(appDirectory, 'package.json'), 'utf-8'),
+  // );
 
-  if (pkgJSON.dependencies.react || pkgJSON.devDependencies.react) {
-    (config.resolve!.alias as Alias).react = path.resolve('node_modules/react');
-  } else {
-    (config.resolve!.alias as Alias).react = path.resolve(
-      __dirname,
-      '../../../../../',
-      'node_modules',
-      'react',
-    );
-  }
-  if (
-    pkgJSON.dependencies['react-dom'] ||
-    pkgJSON.devDependencies['react-dom']
-  ) {
-    (config.resolve!.alias as Alias)['react-dom'] = path.resolve(
-      'node_modules/react-dom',
-    );
-  } else {
-    (config.resolve!.alias as Alias)['react-dom'] = path.resolve(
-      __dirname,
-      '../../../../../',
-      'node_modules',
-      'react-dom',
-    );
-  }
+  // if (pkgJSON.dependencies.react || pkgJSON.devDependencies.react) {
+  //   (config.resolve!.alias as Alias).react = path.resolve('node_modules/react');
+  // } else {
+  //   (config.resolve!.alias as Alias).react = path.resolve(
+  //     __dirname,
+  //     '../../../../../',
+  //     'node_modules',
+  //     'react',
+  //   );
+  // }
+  // if (
+  //   pkgJSON.dependencies['react-dom'] ||
+  //   pkgJSON.devDependencies['react-dom']
+  // ) {
+  //   (config.resolve!.alias as Alias)['react-dom'] = path.resolve(
+  //     'node_modules/react-dom',
+  //   );
+  // } else {
+  //   (config.resolve!.alias as Alias)['react-dom'] = path.resolve(
+  //     __dirname,
+  //     '../../../../../',
+  //     'node_modules',
+  //     'react-dom',
+  //   );
+  // }
 
   config.resolve!.fallback = {
     path: require.resolve('path-browserify'),