@modern-js/plugin-docsite 0.0.0-canary-20220211033927 → 0.0.0-canary-20220413101957

package/CHANGELOG.md

@@ -1,20 +1,67 @@
 # @modern-js/plugin-docsite
 
-## 0.0.0-canary-20220211033927
+## 1.2.5
+
+### Patch Changes
+
+- bebb39b6: chore: improve devDependencies and peerDependencies
+- 133a5dd7: remove module hooks dep
+- Updated dependencies [bebb39b6]
+- Updated dependencies [4b4e73b7]
+- Updated dependencies [da60172c]
+- Updated dependencies [6cff93dc]
+- Updated dependencies [132f7b53]
+- Updated dependencies [9d4a005b]
+  - @modern-js/webpack@1.5.3
+  - @modern-js/utils@1.3.7
+
+## 1.2.4
+
+### Patch Changes
+
+- 3e6d9f6d: convert to new plugin
+- 681a1ff9: feat: remove unnecessary peerDependencies
+- Updated dependencies [c2046f37]
+- Updated dependencies [66cbef42]
+  - @modern-js/utils@1.3.6
+  - @modern-js/webpack@1.5.0
+
+## 1.2.3
+
+### Patch Changes
+
+- 969f172f: fix port problem
+- Updated dependencies [969f172f]
+- Updated dependencies [0ad75faa]
+- Updated dependencies [4c792f68]
+- Updated dependencies [4b5d4bf4]
+- Updated dependencies [0ad75faa]
+- Updated dependencies [62f5b8c8]
+- Updated dependencies [55e18278]
+- Updated dependencies [4499a674]
+- Updated dependencies [0ad75faa]
+- Updated dependencies [403f5169]
+- Updated dependencies [a7f42f48]
+  - @modern-js/core@1.4.4
+  - @modern-js/webpack@1.4.1
+  - @modern-js/utils@1.3.3
+
+## 1.2.2
 
 ### Patch Changes
 
 - 24f616ca: feat: support custom meta info
 - Updated dependencies [d9cc5ea9]
+- Updated dependencies [ddf0c3a6]
 - Updated dependencies [bd819a8d]
 - Updated dependencies [ec4dbffb]
 - Updated dependencies [d099e5c5]
 - Updated dependencies [bada2879]
 - Updated dependencies [24f616ca]
 - Updated dependencies [bd819a8d]
-  - @modern-js/core@0.0.0-canary-20220211033927
-  - @modern-js/webpack@0.0.0-canary-20220211033927
-  - @modern-js/utils@0.0.0-canary-20220211033927
+  - @modern-js/core@1.4.0
+  - @modern-js/webpack@1.3.0
+  - @modern-js/utils@1.3.0
 
 ## 1.2.1
 

package/dist/js/modern/features/build.js

@@ -1,7 +1,6 @@
 import { logger, Import, chalk } from '@modern-js/utils';
 const wp = Import.lazy('./utils/webpack', require);
-const gen = Import.lazy('./utils/generate-files', require); // eslint-disable-next-line max-params
-
+const gen = Import.lazy('./utils/generate-files', require);
 export async function build(appDirectory, tmpDir, files, webpackConfig, isDev) {
   const meta = await gen.generateFiles(appDirectory, tmpDir, files, isDev);
 

package/dist/js/modern/features/dev.js

@@ -3,8 +3,7 @@ import { logger } from '@modern-js/utils';
 import webpack from 'webpack';
 import WebpackDevServer from 'webpack-dev-server';
 import { chokidarFile } from "./utils/chokidar";
-import { generateFiles } from "./utils/generate-files"; // eslint-disable-next-line max-params
-
+import { generateFiles } from "./utils/generate-files";
 export async function dev(appDirectory, tmpDir, files, webpackConfig, isDev, port) {
   await generateFiles(appDirectory, tmpDir, files, isDev);
   const compiler = webpack(webpackConfig);

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

@@ -1,10 +1,9 @@
 import path from 'path';
-import { fs, Import, logger } from '@modern-js/utils';
+import { fs, glob, Import, logger } from '@modern-js/utils';
 import { valid } from "./utils/valid";
 const buildFeat = Import.lazy('./build', require);
 const devFeat = Import.lazy('./dev', require);
 const wp = Import.lazy('./utils/webpack', require);
-const glob = Import.lazy('glob', require);
 const DEFAULT_PORT = 5000;
 export async function buildDocs({
   appDirectory,

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

@@ -1,7 +1,5 @@
 import path from 'path';
-import { logger } from '@modern-js/utils';
-import chokidar from 'chokidar';
-import glob from 'glob';
+import { glob, logger, chokidar } from '@modern-js/utils';
 import { generateFiles } from "./generate-files";
 export function chokidarFile(appDirectory, tmpDir, isDev) {
   let dirty = false;
@@ -24,8 +22,7 @@ export function chokidarFile(appDirectory, tmpDir, isDev) {
       if (files.length) {
         await generateFiles(appDirectory, tmpDir, files, isDev);
         logger.info('built');
-      } // eslint-disable-next-line require-atomic-updates
-
+      }
 
       building = false;
 

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

@@ -36,7 +36,6 @@ const loadTemplate = async (file, customPath = false) => {
   });
 };
 
-// eslint-disable-next-line max-statements
 async function handleFile(appDirectory, tmpDir, file, images) {
   const moduleName = file.replace(/\.(md|mdx)$/, '');
   const content = await fs.readFile(path.resolve(appDirectory, 'docs', file));

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

@@ -1,6 +1,5 @@
 import path from 'path';
-import * as glob from 'glob';
-import { chalk, fs } from '@modern-js/utils';
+import { chalk, fs, glob } from '@modern-js/utils';
 export const valid = ({
   appDirectory,
   docsDir

package/dist/js/modern/index.js

@@ -1,53 +1,55 @@
 import { Import } from '@modern-js/utils';
-const core = Import.lazy('@modern-js/core', require);
 const features = Import.lazy('./features', require);
-export default core.createPlugin(() => ({
-  commands({
-    program
-  }) {
-    const {
-      appDirectory,
-      internalDirectory
-    } = core.useAppContext();
-    const devCommand = program.commandsMap.get('dev');
+export default (() => ({
+  name: '@modern-js/plugin-docsite',
+  setup: api => ({
+    commands({
+      program
+    }) {
+      const {
+        appDirectory,
+        internalDirectory
+      } = api.useAppContext();
+      const devCommand = program.commandsMap.get('dev');
 
-    if (devCommand) {
-      devCommand.command('docs').action(async () => {
-        await features.buildDocs({
-          appDirectory,
-          internalDirectory,
-          isDev: true
+      if (devCommand) {
+        devCommand.command('docs').action(async () => {
+          await features.buildDocs({
+            appDirectory,
+            internalDirectory,
+            isDev: true
+          });
         });
-      });
-    }
-  },
+      }
+    },
 
-  // module-tools menu mode
-  moduleToolsMenu() {
-    const {
-      appDirectory,
-      internalDirectory
-    } = core.useAppContext();
-    return {
-      name: 'Docsite 调试',
-      value: 'docsite',
-      runTask: async () => features.buildDocs({
+    // module-tools menu mode
+    moduleToolsMenu() {
+      const {
         appDirectory,
         internalDirectory,
-        isDev: true
-      })
-    };
-  },
+        port
+      } = api.useAppContext();
+      return {
+        name: 'Docsite 调试',
+        value: 'docsite',
+        runTask: async () => features.buildDocs({
+          appDirectory,
+          internalDirectory,
+          isDev: true,
+          port
+        })
+      };
+    },
 
-  platformBuild() {
-    return {
-      name: 'docsite',
-      title: 'Run Docsite log',
-      taskPath: require.resolve("./build-task"),
-      params: []
-    };
-  }
+    platformBuild() {
+      return {
+        name: 'docsite',
+        title: 'Run Docsite log',
+        taskPath: require.resolve("./build-task"),
+        params: []
+      };
+    }
 
-}), {
-  name: '@modern-js/plugin-docsite'
-});
+  })
+}));

package/dist/js/node/features/build.js

@@ -9,8 +9,7 @@ var _utils = require("@modern-js/utils");
 
 const wp = _utils.Import.lazy('./utils/webpack', require);
 
-const gen = _utils.Import.lazy('./utils/generate-files', require); // eslint-disable-next-line max-params
-
+const gen = _utils.Import.lazy('./utils/generate-files', require);
 
 async function build(appDirectory, tmpDir, files, webpackConfig, isDev) {
   const meta = await gen.generateFiles(appDirectory, tmpDir, files, isDev);

package/dist/js/node/features/dev.js

@@ -19,7 +19,6 @@ var _generateFiles = require("./utils/generate-files");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// eslint-disable-next-line max-params
 async function dev(appDirectory, tmpDir, files, webpackConfig, isDev, port) {
   await (0, _generateFiles.generateFiles)(appDirectory, tmpDir, files, isDev);
   const compiler = (0, _webpack.default)(webpackConfig);

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

@@ -19,8 +19,6 @@ const devFeat = _utils.Import.lazy('./dev', require);
 
 const wp = _utils.Import.lazy('./utils/webpack', require);
 
-const glob = _utils.Import.lazy('glob', require);
-
 const DEFAULT_PORT = 5000;
 
 async function buildDocs({
@@ -42,7 +40,7 @@ async function buildDocs({
     return;
   }
 
-  const files = glob.sync('**/*.{md,mdx}', {
+  const files = _utils.glob.sync('**/*.{md,mdx}', {
     cwd: docsDir,
     ignore: '**/_*'
   });

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

@@ -9,10 +9,6 @@ var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
-var _chokidar = _interopRequireDefault(require("chokidar"));
-
-var _glob = _interopRequireDefault(require("glob"));
-
 var _generateFiles = require("./generate-files");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -21,7 +17,7 @@ function chokidarFile(appDirectory, tmpDir, isDev) {
   let dirty = false;
   let building = false;
 
-  _chokidar.default.watch('docs/**/*.{md,mdx}', {
+  _utils.chokidar.watch('docs/**/*.{md,mdx}', {
     cwd: appDirectory,
     ignoreInitial: true
   }).on('all', async () => {
@@ -33,7 +29,7 @@ function chokidarFile(appDirectory, tmpDir, isDev) {
 
       _utils.logger.info('changed, collect and rebuild docs');
 
-      const files = _glob.default.sync('**/*.{md,mdx}', {
+      const files = _utils.glob.sync('**/*.{md,mdx}', {
         cwd: _path.default.resolve(appDirectory, 'docs'),
         ignore: '**/_*'
       });
@@ -42,8 +38,7 @@ function chokidarFile(appDirectory, tmpDir, isDev) {
         await (0, _generateFiles.generateFiles)(appDirectory, tmpDir, files, isDev);
 
         _utils.logger.info('built');
-      } // eslint-disable-next-line require-atomic-updates
-
+      }
 
       building = false;
 

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

@@ -59,7 +59,6 @@ const loadTemplate = async (file, customPath = false) => {
   });
 };
 
-// eslint-disable-next-line max-statements
 async function handleFile(appDirectory, tmpDir, file, images) {
   const moduleName = file.replace(/\.(md|mdx)$/, '');
   const content = await _utils.fs.readFile(_path.default.resolve(appDirectory, 'docs', file));

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

@@ -7,14 +7,8 @@ exports.valid = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var glob = _interopRequireWildcard(require("glob"));
-
 var _utils = require("@modern-js/utils");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const valid = ({
@@ -23,7 +17,7 @@ const valid = ({
 }) => {
   const docsAbsPath = _path.default.join(appDirectory, docsDir);
 
-  const files = glob.sync(`${docsAbsPath}/**/*.{md,mdx}`);
+  const files = _utils.glob.sync(`${docsAbsPath}/**/*.{md,mdx}`);
 
   if (!_utils.fs.existsSync(docsAbsPath) || files.length <= 0) {
     console.info(_utils.chalk.yellow('No docs found, create directory "./docs" and add md(x) files'));

package/dist/js/node/index.js

@@ -7,59 +7,60 @@ exports.default = void 0;
 
 var _utils = require("@modern-js/utils");
 
-const core = _utils.Import.lazy('@modern-js/core', require);
-
 const features = _utils.Import.lazy('./features', require);
 
-var _default = core.createPlugin(() => ({
-  commands({
-    program
-  }) {
-    const {
-      appDirectory,
-      internalDirectory
-    } = core.useAppContext();
-    const devCommand = program.commandsMap.get('dev');
+var _default = () => ({
+  name: '@modern-js/plugin-docsite',
+  setup: api => ({
+    commands({
+      program
+    }) {
+      const {
+        appDirectory,
+        internalDirectory
+      } = api.useAppContext();
+      const devCommand = program.commandsMap.get('dev');
 
-    if (devCommand) {
-      devCommand.command('docs').action(async () => {
-        await features.buildDocs({
-          appDirectory,
-          internalDirectory,
-          isDev: true
+      if (devCommand) {
+        devCommand.command('docs').action(async () => {
+          await features.buildDocs({
+            appDirectory,
+            internalDirectory,
+            isDev: true
+          });
         });
-      });
-    }
-  },
+      }
+    },
 
-  // module-tools menu mode
-  moduleToolsMenu() {
-    const {
-      appDirectory,
-      internalDirectory
-    } = core.useAppContext();
-    return {
-      name: 'Docsite 调试',
-      value: 'docsite',
-      runTask: async () => features.buildDocs({
+    // module-tools menu mode
+    moduleToolsMenu() {
+      const {
         appDirectory,
         internalDirectory,
-        isDev: true
-      })
-    };
-  },
+        port
+      } = api.useAppContext();
+      return {
+        name: 'Docsite 调试',
+        value: 'docsite',
+        runTask: async () => features.buildDocs({
+          appDirectory,
+          internalDirectory,
+          isDev: true,
+          port
+        })
+      };
+    },
 
-  platformBuild() {
-    return {
-      name: 'docsite',
-      title: 'Run Docsite log',
-      taskPath: require.resolve("./build-task"),
-      params: []
-    };
-  }
+    platformBuild() {
+      return {
+        name: 'docsite',
+        title: 'Run Docsite log',
+        taskPath: require.resolve("./build-task"),
+        params: []
+      };
+    }
 
-}), {
-  name: '@modern-js/plugin-docsite'
+  })
 });
 
 exports.default = _default;

package/dist/types/index.d.ts

@@ -1,20 +1,5 @@
-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<{
-    program: import("commander").Command;
-  }, void>;
-  watchFiles: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  fileChange: import("@modern-js/core").AsyncWorkflow<{
-    filename: string;
-    eventType: "add" | "unlink" | "change";
-  }, void>;
-  beforeExit: import("@modern-js/core").AsyncWorkflow<void, void>;
-  beforeRestart: import("@modern-js/core").AsyncWorkflow<void, void>;
-} & import("@modern-js/core").ClearDraftProgress<import("@modern-js/core").Hooks>>>>;
+import type { CliPlugin } from '@modern-js/core';
+
+declare const _default: () => CliPlugin;
 
 export default _default;

package/jest.config.js

@@ -2,7 +2,6 @@ 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": "0.0.0-canary-20220211033927",
+  "version": "0.0.0-canary-20220413101957",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -37,13 +37,11 @@
     "@babel/runtime": "^7",
     "@mdx-js/mdx": "^1.6.22",
     "@mdx-js/react": "^1.6.22",
-    "@modern-js/utils": "^0.0.0-canary-20220211033927",
-    "@modern-js/webpack": "^0.0.0-canary-20220211033927",
+    "@modern-js/utils": "^0.0.0-canary-20220413101957",
+    "@modern-js/webpack": "^0.0.0-canary-20220413101957",
     "antd": "^4.16.13",
-    "chokidar": "^3.5.2",
     "core-js": "^3.17.2",
     "github-slugger": "^1.4.0",
-    "glob": "^7.1.6",
     "gray-matter": "^4.0.3",
     "html-webpack-plugin": "^5.3.2",
     "lodash": "^4.17.21",
@@ -55,14 +53,15 @@
     "react-live": "^2.3.0",
     "react-router-dom": "^5.3.0",
     "sort-paths": "^1.1.1",
-    "styled-components": "^5.3.1",
     "unist-builder": "^2.0.3",
     "unist-util-visit": "^2.0.3",
-    "webpack": "^5.54.0",
+    "webpack": "^5.71.0",
     "webpack-dev-server": "^4.1.1"
   },
   "devDependencies": {
-    "@modern-js/module-tools-hooks": "^1.2.1",
+    "@modern-js/core": "0.0.0-canary-20220413101957",
+    "@scripts/build": "0.0.0",
+    "@scripts/jest-config": "0.0.0",
     "@types/core-js": "^2.5.5",
     "@types/github-slugger": "^1.3.0",
     "@types/glob": "^7.1.4",
@@ -72,14 +71,8 @@
     "@types/react": "^17",
     "@types/react-dom": "^17",
     "@types/webpack-dev-server": "^4.1.0",
-    "typescript": "^4",
-    "@modern-js/core": "^0.0.0-canary-20220211033927",
-    "@scripts/build": "0.0.0",
     "jest": "^27",
-    "@scripts/jest-config": "0.0.0"
-  },
-  "peerDependencies": {
-    "@modern-js/core": "^0.0.0-canary-20220211033927"
+    "typescript": "^4"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -95,8 +88,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",