@modern-js/plugin-docsite 1.2.11 → 1.2.12

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @modern-js/plugin-docsite
 
+## 1.2.12
+
+### Patch Changes
+
+- df5e115ad: fix run docsite fail
+- Updated dependencies [06b411dc3]
+- Updated dependencies [5d4806f86]
+- Updated dependencies [63c354ad5]
+- Updated dependencies [4165e50c7]
+- Updated dependencies [073e9ad78]
+- Updated dependencies [cda99c441]
+- Updated dependencies [b96dcf364]
+- Updated dependencies [f4a7d49e1]
+- Updated dependencies [9e36d3a01]
+  - @modern-js/webpack@1.11.1
+  - @modern-js/utils@1.7.8
+
 ## 1.2.11
 
 ### Patch Changes

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

@@ -2,16 +2,10 @@ import { Import } from '@modern-js/utils';
 const core = Import.lazy('@modern-js/core', require);
 const features = Import.lazy('./features', require);
 
-const taskMain = async ({
-  appContext
-}) => {
-  const {
-    appDirectory,
-    internalDirectory
-  } = appContext;
+const taskMain = async (appContext, modernConfig) => {
   await features.buildDocs({
-    appDirectory,
-    internalDirectory
+    appContext,
+    modernConfig
   });
 };
 
@@ -25,13 +19,12 @@ const taskMain = async ({
   }
 
   const {
-    appContext
+    appContext,
+    resolved
   } = await core.cli.init([], options);
   await core.manager.run(async () => {
     try {
-      await taskMain({
-        appContext
-      });
+      await taskMain(appContext, resolved);
     } catch (e) {
       console.error(e.message);
     }

package/dist/js/modern/features/index.js

@@ -6,11 +6,16 @@ const devFeat = Import.lazy('./dev', require);
 const wp = Import.lazy('./utils/webpack', require);
 const DEFAULT_PORT = 5000;
 export async function buildDocs({
-  appDirectory,
-  internalDirectory,
+  appContext,
+  modernConfig,
   isDev = false,
   port = DEFAULT_PORT
 }) {
+  const {
+    appDirectory,
+    internalDirectory
+  } = appContext;
+
   if (!valid({
     appDirectory,
     docsDir: 'docs'
@@ -36,7 +41,7 @@ export async function buildDocs({
 
   const tmpDir = path.join(internalDirectory, './docs');
   fs.ensureDirSync(tmpDir);
-  const finalWebpackConfig = wp.generatorWebpackConfig(appDirectory, tmpDir, isDev);
+  const finalWebpackConfig = wp.generatorWebpackConfig(appContext, modernConfig, tmpDir, isDev);
 
   if (!isDev) {
     logger.info('build docs');

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

@@ -4,9 +4,12 @@ import HtmlWebpackPlugin from 'html-webpack-plugin';
 import webpack from 'webpack';
 import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
 import { UTILS_STATIC } from "../constant";
-export function generatorWebpackConfig(appDirectory, tmpDir, isDev) {
-  // FIXME: 这个包现在没有使用，待使用时再重构 webpack 配置的获取
-  const originConfig = getWebpackConfig(WebpackConfigTarget.CLIENT, {}, {});
+export function generatorWebpackConfig(appContext, modernConfig, tmpDir, isDev) {
+  const {
+    appDirectory
+  } = appContext; // FIXME: 这个包现在没有使用，待使用时再重构 webpack 配置的获取
+
+  const originConfig = getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, modernConfig);
   const plugins = (originConfig.plugins || []).filter(p => p.constructor !== webpack.HotModuleReplacementPlugin);
   const config = {
     mode: isDev ? 'development' : 'production',
@@ -25,9 +28,11 @@ export function generatorWebpackConfig(appDirectory, tmpDir, isDev) {
       templateContent: fs.readFileSync(path.resolve(UTILS_STATIC, 'index.html.ejs'), 'utf8')
     })]
   };
+  const pluginDocsiteDir = path.dirname(require.resolve('@modern-js/plugin-docsite/package.json'));
   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
+  pluginDocsiteDir, // for pnpm
+  path.resolve(pluginDocsiteDir, '../..'), // for modern.js repo
+  path.join(pluginDocsiteDir, './node_modules/')]; // maybe check if outside appDir or monorepoDir
 
   config.resolve.modules = [...(config.resolve.modules || []), ...docsiteNodeModules];
   config.resolve.alias['@assets'] = path.resolve(appDirectory, 'assets');

package/dist/js/modern/index.js

@@ -6,17 +6,15 @@ export default (() => ({
     commands({
       program
     }) {
-      const {
-        appDirectory,
-        internalDirectory
-      } = api.useAppContext();
+      const appContext = api.useAppContext();
+      const modernConfig = api.useResolvedConfigContext();
       const devCommand = program.commandsMap.get('dev');
 
       if (devCommand) {
         devCommand.command('docs').action(async () => {
           await features.buildDocs({
-            appDirectory,
-            internalDirectory,
+            appContext,
+            modernConfig,
             isDev: true
           });
         });
@@ -25,17 +23,17 @@ export default (() => ({
 
     // module-tools menu mode
     moduleToolsMenu() {
+      const appContext = api.useAppContext();
+      const modernConfig = api.useResolvedConfigContext();
       const {
-        appDirectory,
-        internalDirectory,
         port
-      } = api.useAppContext();
+      } = appContext;
       return {
         name: 'Docsite 调试',
         value: 'docsite',
         runTask: async () => features.buildDocs({
-          appDirectory,
-          internalDirectory,
+          appContext,
+          modernConfig,
           isDev: true,
           port
         })

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

@@ -6,16 +6,10 @@ const core = _utils.Import.lazy('@modern-js/core', require);
 
 const features = _utils.Import.lazy('./features', require);
 
-const taskMain = async ({
-  appContext
-}) => {
-  const {
-    appDirectory,
-    internalDirectory
-  } = appContext;
+const taskMain = async (appContext, modernConfig) => {
   await features.buildDocs({
-    appDirectory,
-    internalDirectory
+    appContext,
+    modernConfig
   });
 };
 
@@ -29,13 +23,12 @@ const taskMain = async ({
   }
 
   const {
-    appContext
+    appContext,
+    resolved
   } = await core.cli.init([], options);
   await core.manager.run(async () => {
     try {
-      await taskMain({
-        appContext
-      });
+      await taskMain(appContext, resolved);
     } catch (e) {
       console.error(e.message);
     }

package/dist/js/node/features/index.js

@@ -22,11 +22,16 @@ const wp = _utils.Import.lazy('./utils/webpack', require);
 const DEFAULT_PORT = 5000;
 
 async function buildDocs({
-  appDirectory,
-  internalDirectory,
+  appContext,
+  modernConfig,
   isDev = false,
   port = DEFAULT_PORT
 }) {
+  const {
+    appDirectory,
+    internalDirectory
+  } = appContext;
+
   if (!(0, _valid.valid)({
     appDirectory,
     docsDir: 'docs'
@@ -55,7 +60,7 @@ async function buildDocs({
 
   _utils.fs.ensureDirSync(tmpDir);
 
-  const finalWebpackConfig = wp.generatorWebpackConfig(appDirectory, tmpDir, isDev);
+  const finalWebpackConfig = wp.generatorWebpackConfig(appContext, modernConfig, tmpDir, isDev);
 
   if (!isDev) {
     _utils.logger.info('build docs');

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

@@ -20,9 +20,12 @@ var _constant = require("../constant");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function generatorWebpackConfig(appDirectory, tmpDir, isDev) {
-  // FIXME: 这个包现在没有使用，待使用时再重构 webpack 配置的获取
-  const originConfig = (0, _webpack2.getWebpackConfig)(_webpack2.WebpackConfigTarget.CLIENT, {}, {});
+function generatorWebpackConfig(appContext, modernConfig, tmpDir, isDev) {
+  const {
+    appDirectory
+  } = appContext; // FIXME: 这个包现在没有使用，待使用时再重构 webpack 配置的获取
+
+  const originConfig = (0, _webpack2.getWebpackConfig)(_webpack2.WebpackConfigTarget.CLIENT, appContext, modernConfig);
   const plugins = (originConfig.plugins || []).filter(p => p.constructor !== _webpack.default.HotModuleReplacementPlugin);
   const config = {
     mode: isDev ? 'development' : 'production',
@@ -41,9 +44,13 @@ function generatorWebpackConfig(appDirectory, tmpDir, isDev) {
       templateContent: _utils.fs.readFileSync(_path.default.resolve(_constant.UTILS_STATIC, 'index.html.ejs'), 'utf8')
     })]
   };
+
+  const pluginDocsiteDir = _path.default.dirname(require.resolve('@modern-js/plugin-docsite/package.json'));
+
   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
+  pluginDocsiteDir, // for pnpm
+  _path.default.resolve(pluginDocsiteDir, '../..'), // for modern.js repo
+  _path.default.join(pluginDocsiteDir, './node_modules/')]; // maybe check if outside appDir or monorepoDir
 
   config.resolve.modules = [...(config.resolve.modules || []), ...docsiteNodeModules];
   config.resolve.alias['@assets'] = _path.default.resolve(appDirectory, 'assets');

package/dist/js/node/index.js

@@ -15,17 +15,15 @@ var _default = () => ({
     commands({
       program
     }) {
-      const {
-        appDirectory,
-        internalDirectory
-      } = api.useAppContext();
+      const appContext = api.useAppContext();
+      const modernConfig = api.useResolvedConfigContext();
       const devCommand = program.commandsMap.get('dev');
 
       if (devCommand) {
         devCommand.command('docs').action(async () => {
           await features.buildDocs({
-            appDirectory,
-            internalDirectory,
+            appContext,
+            modernConfig,
             isDev: true
           });
         });
@@ -34,17 +32,17 @@ var _default = () => ({
 
     // module-tools menu mode
     moduleToolsMenu() {
+      const appContext = api.useAppContext();
+      const modernConfig = api.useResolvedConfigContext();
       const {
-        appDirectory,
-        internalDirectory,
         port
-      } = api.useAppContext();
+      } = appContext;
       return {
         name: 'Docsite 调试',
         value: 'docsite',
         runTask: async () => features.buildDocs({
-          appDirectory,
-          internalDirectory,
+          appContext,
+          modernConfig,
           isDev: true,
           port
         })

package/dist/types/features/index.d.ts

@@ -1,14 +1,15 @@
+import type { IAppContext, NormalizedConfig } from '@modern-js/core';
 import type { Configuration } from 'webpack';
 interface IBuildDocsParams {
-  appDirectory: string;
-  internalDirectory: string;
+  appContext: IAppContext;
+  modernConfig: NormalizedConfig;
   webpackConfig?: Configuration;
   isDev?: boolean;
   port?: number;
 }
 export declare function buildDocs({
-  appDirectory,
-  internalDirectory,
+  appContext,
+  modernConfig,
   isDev,
   port
 }: IBuildDocsParams): Promise<void>;

package/dist/types/features/utils/webpack.d.ts

@@ -1,3 +1,4 @@
+import type { IAppContext, NormalizedConfig } from '@modern-js/core';
 import { Configuration } from 'webpack';
-export declare function generatorWebpackConfig(appDirectory: string, tmpDir: string, isDev: boolean): Configuration;
+export declare function generatorWebpackConfig(appContext: IAppContext, modernConfig: NormalizedConfig, tmpDir: string, isDev: boolean): Configuration;
 export declare function runWebpack(config: Configuration): Promise<void>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.11",
+  "version": "1.2.12",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -37,8 +37,8 @@
     "@babel/runtime": "^7.18.0",
     "@mdx-js/mdx": "^1.6.22",
     "@mdx-js/react": "^1.6.22",
-    "@modern-js/utils": "^1.7.6",
-    "@modern-js/webpack": "^1.10.0",
+    "@modern-js/utils": "^1.7.8",
+    "@modern-js/webpack": "^1.11.1",
     "antd": "^4.16.13",
     "core-js": "^3.17.2",
     "github-slugger": "^1.4.0",
@@ -55,10 +55,11 @@
     "unist-builder": "^2.0.3",
     "unist-util-visit": "^2.0.3",
     "webpack": "^5.71.0",
-    "webpack-dev-server": "^4.1.1"
+    "webpack-dev-server": "^4.1.1",
+    "styled-components": "^5.3.5"
   },
   "devDependencies": {
-    "@modern-js/core": "1.11.2",
+    "@modern-js/core": "1.12.1",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/core-js": "^2.5.5",
@@ -114,7 +115,8 @@
   "scripts": {
     "new": "modern new",
     "build": "wireit",
-    "test": "wireit"
+    "test": "wireit",
+    "dev": "modern build --watch"
   },
   "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"
 }