@modern-js/plugin-docsite 1.2.5 → 1.2.8

package/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig.json'],
+  },
+};

package/CHANGELOG.md

@@ -1,5 +1,62 @@
 # @modern-js/plugin-docsite
 
+## 1.2.8
+
+### Patch Changes
+
+- 77519490: refactor(webpack): remove `@modern-js/core`
+- Updated dependencies [2d155c4c]
+- Updated dependencies [a0475f1a]
+- Updated dependencies [123e432d]
+- Updated dependencies [e5a9b26d]
+- Updated dependencies [0b26b93b]
+- Updated dependencies [123e432d]
+- Updated dependencies [f9f66ef9]
+- Updated dependencies [71526621]
+- Updated dependencies [77519490]
+- Updated dependencies [592edabc]
+- Updated dependencies [3578716a]
+- Updated dependencies [895fa0ff]
+- Updated dependencies [3d1fac2a]
+- Updated dependencies [3578913e]
+- Updated dependencies [1c3beab3]
+  - @modern-js/utils@1.6.0
+  - @modern-js/webpack@1.5.7
+
+## 1.2.7
+
+### Patch Changes
+
+- 6cffe99d: chore:
+  remove react eslint rules for `modern-js` rule set.
+  add .eslintrc for each package to speed up linting
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- 5dbbeb57: fix: export extended Command type
+- Updated dependencies [b8599d09]
+- Updated dependencies [6cffe99d]
+- Updated dependencies [04ae5262]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [e4cec1ce]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/webpack@1.5.5
+
+## 1.2.6
+
+### Patch Changes
+
+- 17d0cc46: feat: prebundle lodash to @modern-js/utils/lodash
+- Updated dependencies [ec1b7367]
+- Updated dependencies [77ff9754]
+- Updated dependencies [d2d1d6b2]
+- Updated dependencies [07a4887e]
+- Updated dependencies [ea2ae711]
+- Updated dependencies [17d0cc46]
+- Updated dependencies [d2d1d6b2]
+  - @modern-js/webpack@1.5.4
+  - @modern-js/utils@1.4.0
+
 ## 1.2.5
 
 ### Patch Changes

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;

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

@@ -1,9 +1,3 @@
-import _difference from "lodash/difference";
-import _template from "lodash/template";
-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); 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 = 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; }
@@ -13,6 +7,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import path from 'path';
 import { logger, fs } from '@modern-js/utils';
 import matter from 'gray-matter';
+import { startCase, camelCase, union, template, difference } from '@modern-js/utils/lodash';
 import GithubSlugger from 'github-slugger';
 import sortPaths from 'sort-paths';
 import visit from 'unist-util-visit';
@@ -31,19 +26,18 @@ const loadTemplate = async (file, customPath = false) => {
     result = await fs.readFile(path.join(UTILS_STATIC, file), 'utf-8');
   }
 
-  return _template(result, {
+  return template(result, {
     interpolate: /<%=([\s\S]+?)%>/g
   });
 };
 
-// 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));
   const parsed = matter(content);
 
   if (!parsed.data.title) {
-    parsed.data.title = _startCase(_camelCase(path.basename(moduleName)));
+    parsed.data.title = startCase(camelCase(path.basename(moduleName)));
   }
 
   const slugger = new GithubSlugger();
@@ -85,12 +79,10 @@ async function handleFile(appDirectory, tmpDir, file, images) {
         }
       });
     });
-
-    const extraImported = _difference(imported.map(n => n.id), exported.map(n => n.id)); // we have to put the export statement with the import,
+    const extraImported = difference(imported.map(n => n.id), exported.map(n => n.id)); // we have to put the export statement with the import,
     // otherwise the mdx's babel transformer cannot found
     // the corresponding imports
 
-
     extraImported.forEach(id => {
       const {
         node
@@ -141,9 +133,7 @@ async function handleFile(appDirectory, tmpDir, file, images) {
   const transpiled = await mdx(parsed.content, {
     remarkPlugins: [modifier]
   });
-
-  const totalExported = _union(imported.map(n => n.id), exported.map(n => n.id));
-
+  const totalExported = union(imported.map(n => n.id), exported.map(n => n.id));
   const outputFile = path.resolve(tmpDir, `${moduleName}/mdx.jsx`);
   await fs.outputFile(outputFile, MDX_DEFAULT_RENDERER + transpiled, {
     encoding: 'utf8'

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/features/utils/webpack.js

@@ -5,7 +5,8 @@ import webpack from 'webpack';
 import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
 import { UTILS_STATIC } from "../constant";
 export function generatorWebpackConfig(appDirectory, tmpDir, isDev) {
-  const originConfig = getWebpackConfig(WebpackConfigTarget.CLIENT);
+  // FIXME: 这个包现在没有使用，待使用时再重构 webpack 配置的获取
+  const originConfig = getWebpackConfig(WebpackConfigTarget.CLIENT, {}, {});
   const plugins = (originConfig.plugins || []).filter(p => p.constructor !== webpack.HotModuleReplacementPlugin);
   const config = {
     mode: isDev ? 'development' : 'production',

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: '**/_*'
       });

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

@@ -5,22 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.generateFiles = generateFiles;
 
-var _difference2 = _interopRequireDefault(require("lodash/difference"));
-
-var _template2 = _interopRequireDefault(require("lodash/template"));
-
-var _union2 = _interopRequireDefault(require("lodash/union"));
-
-var _camelCase2 = _interopRequireDefault(require("lodash/camelCase"));
-
-var _startCase2 = _interopRequireDefault(require("lodash/startCase"));
-
 var _path = _interopRequireDefault(require("path"));
 
 var _utils = require("@modern-js/utils");
 
 var _grayMatter = _interopRequireDefault(require("gray-matter"));
 
+var _lodash = require("@modern-js/utils/lodash");
+
 var _githubSlugger = _interopRequireDefault(require("github-slugger"));
 
 var _sortPaths = _interopRequireDefault(require("sort-paths"));
@@ -54,19 +46,18 @@ const loadTemplate = async (file, customPath = false) => {
     result = await _utils.fs.readFile(_path.default.join(_constant.UTILS_STATIC, file), 'utf-8');
   }
 
-  return (0, _template2.default)(result, {
+  return (0, _lodash.template)(result, {
     interpolate: /<%=([\s\S]+?)%>/g
   });
 };
 
-// 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));
   const parsed = (0, _grayMatter.default)(content);
 
   if (!parsed.data.title) {
-    parsed.data.title = (0, _startCase2.default)((0, _camelCase2.default)(_path.default.basename(moduleName)));
+    parsed.data.title = (0, _lodash.startCase)((0, _lodash.camelCase)(_path.default.basename(moduleName)));
   }
 
   const slugger = new _githubSlugger.default();
@@ -110,7 +101,7 @@ async function handleFile(appDirectory, tmpDir, file, images) {
         }
       });
     });
-    const extraImported = (0, _difference2.default)(imported.map(n => n.id), exported.map(n => n.id)); // we have to put the export statement with the import,
+    const extraImported = (0, _lodash.difference)(imported.map(n => n.id), exported.map(n => n.id)); // we have to put the export statement with the import,
     // otherwise the mdx's babel transformer cannot found
     // the corresponding imports
 
@@ -165,7 +156,7 @@ async function handleFile(appDirectory, tmpDir, file, images) {
   const transpiled = await (0, _mdx.default)(parsed.content, {
     remarkPlugins: [modifier]
   });
-  const totalExported = (0, _union2.default)(imported.map(n => n.id), exported.map(n => n.id));
+  const totalExported = (0, _lodash.union)(imported.map(n => n.id), exported.map(n => n.id));
 
   const outputFile = _path.default.resolve(tmpDir, `${moduleName}/mdx.jsx`);
 

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/features/utils/webpack.js

@@ -21,7 +21,8 @@ var _constant = require("../constant");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function generatorWebpackConfig(appDirectory, tmpDir, isDev) {
-  const originConfig = (0, _webpack2.getWebpackConfig)(_webpack2.WebpackConfigTarget.CLIENT);
+  // FIXME: 这个包现在没有使用，待使用时再重构 webpack 配置的获取
+  const originConfig = (0, _webpack2.getWebpackConfig)(_webpack2.WebpackConfigTarget.CLIENT, {}, {});
   const plugins = (originConfig.plugins || []).filter(p => p.constructor !== _webpack.default.HotModuleReplacementPlugin);
   const config = {
     mode: isDev ? 'development' : 'production',

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.5",
+  "version": "1.2.8",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -37,16 +37,13 @@
     "@babel/runtime": "^7",
     "@mdx-js/mdx": "^1.6.22",
     "@mdx-js/react": "^1.6.22",
-    "@modern-js/utils": "^1.3.7",
-    "@modern-js/webpack": "^1.5.3",
+    "@modern-js/utils": "^1.6.0",
+    "@modern-js/webpack": "^1.5.7",
     "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",
     "mdast-util-to-string": "^2.0.0",
     "path-browserify": "^1.0.1",
     "prism-react-renderer": "^1.2.1",
@@ -61,14 +58,13 @@
     "webpack-dev-server": "^4.1.1"
   },
   "devDependencies": {
-    "@modern-js/core": "1.6.1",
+    "@modern-js/core": "1.9.0",
     "@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",
     "@types/jest": "^26",
-    "@types/lodash": "^4.14.168",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",

package/tests/index.test.ts

@@ -1,7 +0,0 @@
-import plugin from '../src';
-
-describe('plugin-docset', () => {
-  it('default', () => {
-    expect(plugin).toBeDefined();
-  });
-});

package/tests/tsconfig.json

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