@modern-js/plugin-docsite 1.0.0 → 1.1.2

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/plugin-docsite
 
+## 1.1.2
+
+### Patch Changes
+
+- fix missing dependencies bug
+
+## 1.1.1
+
+### Patch Changes
+
+- 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
+
+## 1.1.0
+
+### Minor Changes
+
+- 96119db2: Relese v1.1.0### Patch Changes
+
+- 6b802b2a: use path method from @modern-js/utils
+- Updated dependencies [96119db2]
+  - @modern-js/core@1.1.0
+  - @modern-js/webpack@1.1.0
+  - @modern-js/utils@1.1.0
+
 ## 1.0.0
 
 ### Patch Changes

package/README.md

@@ -17,10 +17,7 @@
 
 > 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.
 
-- 介绍 Modern.js (即将上线)
-- [迈入现代 Web 开发](https://zhuanlan.zhihu.com/p/386607009)
-- [现代 Web 开发者问卷调查报告](https://zhuanlan.zhihu.com/p/403206195)
-- [字节跳动是如何落地微前端的](https://mp.weixin.qq.com/s/L9wbfNG5fTXF5bx7dcgj4Q)
+- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
 
 ## Getting Started
 

package/dist/js/modern/features/constant.js

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 export const UTILS_STATIC = path.join(__dirname, '../../static');
 export const DOCS_RENDER_PATH = '/api/v1/docs/render';
 export const MDX_DEFAULT_RENDERER = `

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

@@ -1,4 +1,5 @@
-import { path, logger } from '@modern-js/utils';
+import path from 'path';
+import { logger } from '@modern-js/utils';
 import webpack from 'webpack';
 import WebpackDevServer from 'webpack-dev-server';
 import { chokidarFile } from "./utils/chokidar";

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

@@ -1,4 +1,5 @@
-import { path, fs, Import, logger } from '@modern-js/utils';
+import path from 'path';
+import { fs, Import, logger } from '@modern-js/utils';
 import { valid } from "./utils/valid";
 const buildFeat = Import.lazy('./build', require);
 const devFeat = Import.lazy('./dev', require);

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

@@ -1,4 +1,5 @@
-import { path, logger } from '@modern-js/utils';
+import path from 'path';
+import { logger } from '@modern-js/utils';
 import chokidar from 'chokidar';
 import glob from 'glob';
 import { generateFiles } from "./generate-files";

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

@@ -10,7 +10,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-import { path, logger, fs } from '@modern-js/utils';
+import path from 'path';
+import { logger, fs } from '@modern-js/utils';
 import matter from 'gray-matter';
 import GithubSlugger from 'github-slugger';
 import sortPaths from 'sort-paths';

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

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

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

@@ -1,4 +1,5 @@
-import { path, fs, upath } from '@modern-js/utils';
+import path from 'path';
+import { fs } from '@modern-js/utils';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import webpack from 'webpack';
 import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
@@ -23,27 +24,45 @@ 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: upath.normalizeSafe(require.resolve('path-browserify'))
+    path: require.resolve('path-browserify')
   };
   return config;
 }

package/dist/js/modern/index.js

@@ -1,4 +1,4 @@
-import { Import, upath } from '@modern-js/utils';
+import { Import } from '@modern-js/utils';
 const core = Import.lazy('@modern-js/core', require);
 const features = Import.lazy('./features', require);
 export default core.createPlugin(() => ({
@@ -39,7 +39,7 @@ export default core.createPlugin(() => ({
     return {
       name: 'docsite',
       title: 'Run Docsite log',
-      taskPath: upath.normalizeSafe(require.resolve("./build-task")),
+      taskPath: require.resolve("./build-task"),
       params: []
     };
   }

package/dist/js/node/features/constant.js

@@ -5,9 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.UTILS_STATIC = exports.MDX_DEFAULT_RENDERER = exports.DOCS_RENDER_PATH = void 0;
 
-var _utils = require("@modern-js/utils");
+var _path = _interopRequireDefault(require("path"));
 
-const UTILS_STATIC = _utils.path.join(__dirname, '../../static');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const UTILS_STATIC = _path.default.join(__dirname, '../../static');
 
 exports.UTILS_STATIC = UTILS_STATIC;
 const DOCS_RENDER_PATH = '/api/v1/docs/render';

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.dev = dev;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 var _webpack = _interopRequireDefault(require("webpack"));
@@ -26,7 +28,7 @@ async function dev(appDirectory, tmpDir, files, webpackConfig, isDev, port) {
     port,
     historyApiFallback: true,
     static: {
-      directory: _utils.path.resolve(appDirectory, 'assets'),
+      directory: _path.default.resolve(appDirectory, 'assets'),
       publicPath: '/assets'
     }
   }, compiler);

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

@@ -5,10 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.buildDocs = buildDocs;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 var _valid = require("./utils/valid");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 const buildFeat = _utils.Import.lazy('./build', require);
 
 const devFeat = _utils.Import.lazy('./dev', require);
@@ -31,7 +35,7 @@ async function buildDocs({
     return;
   }
 
-  const docsDir = _utils.path.resolve(appDirectory, 'docs');
+  const docsDir = _path.default.resolve(appDirectory, 'docs');
 
   if (!_utils.fs.pathExistsSync(docsDir)) {
     return;
@@ -48,7 +52,7 @@ async function buildDocs({
     return;
   }
 
-  const tmpDir = _utils.path.join(appDirectory, './node_modules/.modern-js/docs');
+  const tmpDir = _path.default.join(appDirectory, './node_modules/.modern-js/docs');
 
   _utils.fs.ensureDirSync(tmpDir);
 

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.chokidarFile = chokidarFile;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 var _chokidar = _interopRequireDefault(require("chokidar"));
@@ -32,7 +34,7 @@ function chokidarFile(appDirectory, tmpDir, isDev) {
       _utils.logger.info('changed, collect and rebuild docs');
 
       const files = _glob.default.sync('**/*.{md,mdx}', {
-        cwd: _utils.path.resolve(appDirectory, 'docs'),
+        cwd: _path.default.resolve(appDirectory, 'docs'),
         ignore: '**/_*'
       });
 

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

@@ -15,6 +15,8 @@ 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"));
@@ -49,7 +51,7 @@ const loadTemplate = async (file, customPath = false) => {
   if (customPath) {
     result = await _utils.fs.readFile(file, 'utf-8');
   } else {
-    result = await _utils.fs.readFile(_utils.path.join(_constant.UTILS_STATIC, file), 'utf-8');
+    result = await _utils.fs.readFile(_path.default.join(_constant.UTILS_STATIC, file), 'utf-8');
   }
 
   return (0, _template2.default)(result, {
@@ -60,11 +62,11 @@ 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(_utils.path.resolve(appDirectory, 'docs', file));
+  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)(_utils.path.basename(moduleName)));
+    parsed.data.title = (0, _startCase2.default)((0, _camelCase2.default)(_path.default.basename(moduleName)));
   }
 
   const slugger = new _githubSlugger.default();
@@ -146,15 +148,15 @@ async function handleFile(appDirectory, tmpDir, file, images) {
       } = node;
 
       if (!url.startsWith('http')) {
-        const fullPath = _utils.path.resolve(_utils.path.dirname(_utils.path.resolve(appDirectory, 'docs', file)), url);
+        const fullPath = _path.default.resolve(_path.default.dirname(_path.default.resolve(appDirectory, 'docs', file)), url);
 
-        const relativePath = _utils.path.relative(_utils.path.resolve(appDirectory, 'assets'), fullPath);
+        const relativePath = _path.default.relative(_path.default.resolve(appDirectory, 'assets'), fullPath);
 
         if (relativePath.startsWith('..')) {
           _utils.logger.warn(`${url} referenced in ${file} is not under the "assets" folder`);
         } else {
           images.push(relativePath);
-          node.url = `/${_utils.path.relative(_utils.path.dirname(_utils.path.resolve(appDirectory, 'docs', file)), _utils.path.resolve(appDirectory, 'docs/assets', relativePath))}`;
+          node.url = `/${_path.default.relative(_path.default.dirname(_path.default.resolve(appDirectory, 'docs', file)), _path.default.resolve(appDirectory, 'docs/assets', relativePath))}`;
         }
       }
     });
@@ -165,19 +167,19 @@ async function handleFile(appDirectory, tmpDir, file, images) {
   });
   const totalExported = (0, _union2.default)(imported.map(n => n.id), exported.map(n => n.id));
 
-  const outputFile = _utils.path.resolve(tmpDir, `${moduleName}/mdx.jsx`);
+  const outputFile = _path.default.resolve(tmpDir, `${moduleName}/mdx.jsx`);
 
   await _utils.fs.outputFile(outputFile, _constant.MDX_DEFAULT_RENDERER + transpiled, {
     encoding: 'utf8'
   });
 
-  const pageFile = _utils.path.resolve(tmpDir, `${moduleName}/index.jsx`);
+  const pageFile = _path.default.resolve(tmpDir, `${moduleName}/index.jsx`);
 
   const pageTemplate = await loadTemplate('docs-page.jsx.tpl');
   const pageContent = pageTemplate({
     moduleName,
     toc: JSON.stringify(toc),
-    relRoot: _utils.path.relative(_utils.path.dirname(outputFile), tmpDir),
+    relRoot: _path.default.relative(_path.default.dirname(outputFile), tmpDir),
     imports: totalExported.length ? `import { ${totalExported.join(', ')} } from './mdx';` : '',
     imported: totalExported.join(',')
   });
@@ -197,16 +199,16 @@ async function generateFiles(appDirectory, tmpDir, files, isDev) {
   const meta = await Promise.all(files.map(file => handleFile(appDirectory, tmpDir, file, images)));
   const sorted = (0, _sortPaths.default)(meta, e => e.moduleName.endsWith('index') ? e.moduleName.replace(/index$/, '') : `${e.moduleName}/`, '/');
   const routesTemplate = await loadTemplate('DocsRoutes.jsx.tpl');
-  await _utils.fs.outputFile(_utils.path.resolve(tmpDir, 'DocsRoutes.jsx'), routesTemplate({
+  await _utils.fs.outputFile(_path.default.resolve(tmpDir, 'DocsRoutes.jsx'), routesTemplate({
     meta: sorted
   }));
-  const pkgInfo = await _utils.fs.readJson(_utils.path.resolve(appDirectory, 'package.json'));
+  const pkgInfo = await _utils.fs.readJson(_path.default.resolve(appDirectory, 'package.json'));
   const entryTemplate = await loadTemplate('docs-entry.jsx.tpl');
-  await _utils.fs.outputFile(_utils.path.resolve(tmpDir, 'docs-entry.jsx'), entryTemplate({
+  await _utils.fs.outputFile(_path.default.resolve(tmpDir, 'docs-entry.jsx'), entryTemplate({
     basename: isDev ? '/' : `${_constant.DOCS_RENDER_PATH}/${pkgInfo.name}/${pkgInfo.version}`
   }));
-  await Promise.all(['DocsNav.jsx.tpl', 'DocsToc.jsx.tpl', 'docs.css'].map(async file => _utils.fs.copyFile(_utils.path.resolve(_constant.UTILS_STATIC, file), _utils.path.resolve(tmpDir, file.replace('.tpl', '')))));
-  await _utils.fs.outputJson(_utils.path.resolve(tmpDir, 'meta.json'), sorted.map(({
+  await Promise.all(['DocsNav.jsx.tpl', 'DocsToc.jsx.tpl', 'docs.css'].map(async file => _utils.fs.copyFile(_path.default.resolve(_constant.UTILS_STATIC, file), _path.default.resolve(tmpDir, file.replace('.tpl', '')))));
+  await _utils.fs.outputJson(_path.default.resolve(tmpDir, 'meta.json'), sorted.map(({
     title,
     moduleName
   }) => ({
@@ -215,7 +217,7 @@ async function generateFiles(appDirectory, tmpDir, files, isDev) {
   })), {
     spaces: 2
   });
-  await _utils.fs.ensureDir(_utils.path.resolve(appDirectory, 'dist/docs/assets'));
-  await Promise.all(Array.from(new Set(images)).map(file => _utils.fs.copyFile(_utils.path.resolve(appDirectory, 'assets', file), _utils.path.resolve(appDirectory, 'dist/docs/assets', file))));
+  await _utils.fs.ensureDir(_path.default.resolve(appDirectory, 'dist/docs/assets'));
+  await Promise.all(Array.from(new Set(images)).map(file => _utils.fs.copyFile(_path.default.resolve(appDirectory, 'assets', file), _path.default.resolve(appDirectory, 'dist/docs/assets', file))));
   return sorted;
 }

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.valid = void 0;
 
-var path = _interopRequireWildcard(require("path"));
+var _path = _interopRequireDefault(require("path"));
 
 var glob = _interopRequireWildcard(require("glob"));
 
@@ -15,11 +15,14 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 = ({
   appDirectory,
   docsDir
 }) => {
-  const docsAbsPath = path.join(appDirectory, docsDir);
+  const docsAbsPath = _path.default.join(appDirectory, docsDir);
+
   const files = glob.sync(`${docsAbsPath}/**/*.{md,mdx}`);
 
   if (!_utils.fs.existsSync(docsAbsPath) || files.length <= 0) {

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

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.generatorWebpackConfig = generatorWebpackConfig;
 exports.runWebpack = runWebpack;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("@modern-js/utils");
 
 var _htmlWebpackPlugin = _interopRequireDefault(require("html-webpack-plugin"));
@@ -25,40 +27,58 @@ function generatorWebpackConfig(appDirectory, tmpDir, isDev) {
     mode: isDev ? 'development' : 'production',
     context: tmpDir,
     entry: {
-      index: _utils.path.resolve(tmpDir, 'docs-entry.jsx')
+      index: _path.default.resolve(tmpDir, 'docs-entry.jsx')
     },
     output: {
-      path: _utils.path.resolve(appDirectory, 'dist/docs')
+      path: _path.default.resolve(appDirectory, 'dist/docs')
     },
     resolve: originConfig.resolve || {
       alias: {}
     },
     module: originConfig.module,
     plugins: [...plugins, new _htmlWebpackPlugin.default({
-      templateContent: _utils.fs.readFileSync(_utils.path.resolve(_constant.UTILS_STATIC, 'index.html.ejs'), 'utf8')
+      templateContent: _utils.fs.readFileSync(_path.default.resolve(_constant.UTILS_STATIC, 'index.html.ejs'), 'utf8')
     })]
   };
-  config.resolve.modules = [...(config.resolve.modules || []), _utils.path.join(__dirname, '../../../../../', 'node_modules')];
-  config.resolve.alias['@assets'] = _utils.path.resolve(appDirectory, 'assets');
-  config.resolve.alias['@styles'] = _utils.path.resolve(appDirectory, 'styles'); // fix this since react-live relies on core-js@2
-
-  config.resolve.alias[`${_utils.path.dirname(require.resolve('core-js'))}/fn`] = 'core-js/es';
-  const pkgJSON = JSON.parse(_utils.fs.readFileSync(_utils.path.join(appDirectory, 'package.json'), 'utf-8'));
+  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
 
-  if (pkgJSON.dependencies.react || pkgJSON.devDependencies.react) {
-    config.resolve.alias.react = _utils.path.resolve('node_modules/react');
-  } else {
-    config.resolve.alias.react = _utils.path.resolve(__dirname, '../../../../../', 'node_modules', 'react');
-  }
+  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
 
-  if (pkgJSON.dependencies['react-dom'] || pkgJSON.devDependencies['react-dom']) {
-    config.resolve.alias['react-dom'] = _utils.path.resolve('node_modules/react-dom');
-  } else {
-    config.resolve.alias['react-dom'] = _utils.path.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: _utils.upath.normalizeSafe(require.resolve('path-browserify'))
+    path: require.resolve('path-browserify')
   };
   return config;
 }

package/dist/js/node/index.js

@@ -49,7 +49,7 @@ var _default = core.createPlugin(() => ({
     return {
       name: 'docsite',
       title: 'Run Docsite log',
-      taskPath: _utils.upath.normalizeSafe(require.resolve("./build-task")),
+      taskPath: require.resolve("./build-task"),
       params: []
     };
   }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.0",
+  "version": "1.1.2",
   "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.0.0",
-    "@modern-js/webpack": "^1.0.0",
+    "@modern-js/utils": "^1.1.2",
+    "@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.0.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.0.0",
-    "@modern-js/plugin-testing": "^1.0.0",
-    "@modern-js/module-tools": "^1.0.0"
+    "@modern-js/core": "^1.1.2",
+    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/module-tools": "^1.1.1"
   },
   "peerDependencies": {
-    "@modern-js/core": "^1.0.0"
+    "@modern-js/core": "^1.1.2"
   },
   "sideEffects": false,
   "modernConfig": {

package/src/features/constant.ts

@@ -1,4 +1,4 @@
-import { path } from '@modern-js/utils';
+import path from 'path';
 
 export const UTILS_STATIC = path.join(__dirname, '../../static');
 export const DOCS_RENDER_PATH = '/api/v1/docs/render';

package/src/features/dev.ts

@@ -1,4 +1,5 @@
-import { path, logger } from '@modern-js/utils';
+import path from 'path';
+import { logger } from '@modern-js/utils';
 import webpack, { Configuration } from 'webpack';
 import WebpackDevServer from 'webpack-dev-server';
 import { chokidarFile } from './utils/chokidar';

package/src/features/index.ts

@@ -1,4 +1,5 @@
-import { path, fs, Import, logger } from '@modern-js/utils';
+import path from 'path';
+import { fs, Import, logger } from '@modern-js/utils';
 import type { Configuration } from 'webpack';
 import { valid } from './utils/valid';
 

package/src/features/utils/chokidar.ts

@@ -1,4 +1,5 @@
-import { path, logger } from '@modern-js/utils';
+import path from 'path';
+import { logger } from '@modern-js/utils';
 import chokidar from 'chokidar';
 import glob from 'glob';
 import { generateFiles } from './generate-files';

package/src/features/utils/generate-files.ts

@@ -1,4 +1,5 @@
-import { path, logger, fs } from '@modern-js/utils';
+import path from 'path';
+import { logger, fs } from '@modern-js/utils';
 import matter from 'gray-matter';
 import { startCase, camelCase, union, template, difference } from 'lodash';
 import GithubSlugger from 'github-slugger';

package/src/features/utils/valid.ts

@@ -1,4 +1,4 @@
-import * as path from 'path';
+import path from 'path';
 import * as glob from 'glob';
 import { chalk, fs } from '@modern-js/utils';
 

package/src/features/utils/webpack.ts

@@ -1,4 +1,5 @@
-import { path, fs, upath } from '@modern-js/utils';
+import path from 'path';
+import { fs } from '@modern-js/utils';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import webpack, { Configuration, WebpackPluginInstance } from 'webpack';
 import { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
@@ -34,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,
@@ -52,37 +63,39 @@ 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: upath.normalizeSafe(require.resolve('path-browserify')) };
+  config.resolve!.fallback = {
+    path: require.resolve('path-browserify'),
+  };
   return config;
 }
 

package/src/index.ts

@@ -1,4 +1,4 @@
-import { Import, upath } from '@modern-js/utils';
+import { Import } from '@modern-js/utils';
 
 const core: typeof import('@modern-js/core') = Import.lazy(
   '@modern-js/core',
@@ -33,7 +33,7 @@ export default core.createPlugin(
       return {
         name: 'docsite',
         title: 'Run Docsite log',
-        taskPath: upath.normalizeSafe(require.resolve('./build-task')),
+        taskPath: require.resolve('./build-task'),
         params: [],
       };
     },