@modern-js/module-tools 1.0.0-rc.2 → 1.0.0-rc.7

package/CHANGELOG.md

@@ -0,0 +1,114 @@
+# @modern-js/module-tools
+
+## 1.0.0-rc.7
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/babel-preset-module@1.0.0-rc.7
+  - @modern-js/core@1.0.0-rc.7
+  - @modern-js/css-config@1.0.0-rc.7
+  - @modern-js/i18n-cli-language-detector@1.0.0-rc.7
+  - @modern-js/plugin-analyze@1.0.0-rc.7
+  - @modern-js/plugin-changeset@1.0.0-rc.7
+  - @modern-js/plugin-fast-refresh@1.0.0-rc.7
+  - @modern-js/plugin-i18n@1.0.0-rc.7
+  - @modern-js/new-action@1.0.0-rc.7
+  - @modern-js/babel-compiler@1.0.0-rc.7
+  - @modern-js/style-compiler@1.0.0-rc.7
+  - @modern-js/module-tools-hooks@1.0.0-rc.7
+  - @modern-js/plugin@1.0.0-rc.7
+  - @modern-js/utils@1.0.0-rc.7
+
+## 1.0.0-rc.6
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/babel-preset-module@1.0.0-rc.6
+  - @modern-js/core@1.0.0-rc.6
+  - @modern-js/css-config@1.0.0-rc.6
+  - @modern-js/i18n-cli-language-detector@1.0.0-rc.6
+  - @modern-js/plugin-analyze@1.0.0-rc.6
+  - @modern-js/plugin-changeset@1.0.0-rc.6
+  - @modern-js/plugin-fast-refresh@1.0.0-rc.6
+  - @modern-js/plugin-i18n@1.0.0-rc.6
+  - @modern-js/new-action@1.0.0-rc.6
+  - @modern-js/babel-compiler@1.0.0-rc.6
+  - @modern-js/style-compiler@1.0.0-rc.6
+  - @modern-js/module-tools-hooks@1.0.0-rc.6
+  - @modern-js/plugin@1.0.0-rc.6
+  - @modern-js/utils@1.0.0-rc.6
+
+## 1.0.0-rc.5
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [204c626]
+  - @modern-js/babel-preset-module@1.0.0-rc.5
+  - @modern-js/core@1.0.0-rc.5
+  - @modern-js/css-config@1.0.0-rc.5
+  - @modern-js/i18n-cli-language-detector@1.0.0-rc.5
+  - @modern-js/plugin-analyze@1.0.0-rc.5
+  - @modern-js/plugin-changeset@1.0.0-rc.5
+  - @modern-js/plugin-fast-refresh@1.0.0-rc.5
+  - @modern-js/plugin-i18n@1.0.0-rc.5
+  - @modern-js/new-action@1.0.0-rc.5
+  - @modern-js/babel-compiler@1.0.0-rc.5
+  - @modern-js/style-compiler@1.0.0-rc.5
+  - @modern-js/module-tools-hooks@1.0.0-rc.5
+  - @modern-js/plugin@1.0.0-rc.5
+  - @modern-js/utils@1.0.0-rc.5
+
+## 1.0.0-rc.4
+
+### Patch Changes
+
+- fix server route match
+- 204c626: feat: initial
+- Updated dependencies [undefined]
+- Updated dependencies [204c626]
+  - @modern-js/babel-preset-module@1.0.0-rc.4
+  - @modern-js/core@1.0.0-rc.4
+  - @modern-js/css-config@1.0.0-rc.4
+  - @modern-js/i18n-cli-language-detector@1.0.0-rc.4
+  - @modern-js/plugin-analyze@1.0.0-rc.4
+  - @modern-js/plugin-changeset@1.0.0-rc.4
+  - @modern-js/plugin-fast-refresh@1.0.0-rc.4
+  - @modern-js/plugin-i18n@1.0.0-rc.4
+  - @modern-js/new-action@1.0.0-rc.4
+  - @modern-js/babel-compiler@1.0.0-rc.4
+  - @modern-js/style-compiler@1.0.0-rc.4
+  - @modern-js/module-tools-hooks@1.0.0-rc.4
+  - @modern-js/plugin@1.0.0-rc.4
+  - @modern-js/utils@1.0.0-rc.4
+
+## 1.0.0-rc.3
+
+### Patch Changes
+
+- feat: initial
+- Updated dependencies [undefined]
+  - @modern-js/babel-preset-module@1.0.0-rc.3
+  - @modern-js/core@1.0.0-rc.3
+  - @modern-js/css-config@1.0.0-rc.3
+  - @modern-js/i18n-cli-language-detector@1.0.0-rc.3
+  - @modern-js/plugin-analyze@1.0.0-rc.3
+  - @modern-js/plugin-changeset@1.0.0-rc.3
+  - @modern-js/plugin-fast-refresh@1.0.0-rc.3
+  - @modern-js/plugin-i18n@1.0.0-rc.3
+  - @modern-js/new-action@1.0.0-rc.3
+  - @modern-js/babel-compiler@1.0.0-rc.3
+  - @modern-js/style-compiler@1.0.0-rc.3
+  - @modern-js/module-tools-hooks@1.0.0-rc.3
+  - @modern-js/plugin@1.0.0-rc.3
+  - @modern-js/utils@1.0.0-rc.3

package/README.md

@@ -1,6 +1,6 @@
 
 <p align="center">
-  <a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs.png" width="300" alt="Modern.js Logo" /></a>
+  <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>
 </p>
 
 <p align="center">现代 Web 工程体系</p>

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

@@ -34,7 +34,7 @@ export const devStorybook = async config => {
   if (findStorybook) {
     await findStorybook.runTask(config);
   } else {
-    console.info(chalk.yellow('You need to enable storybook functionality with the `new` script or `modern new` or install @modern-js/plugin-storybook')); // eslint-disable-next-line no-process-exit
+    console.info(chalk.yellow('No development features found.\nYou can use the `new` command to enable the development features')); // eslint-disable-next-line no-process-exit
 
     process.exit(0);
   }

package/dist/js/modern/tasks/build-style.js

@@ -76,15 +76,28 @@ const taskMain = async ({
     modernConfig
   }, // eslint-disable-next-line @typescript-eslint/require-await
   {
-    onLast: async _ => null
+    onLast: async _ => undefined
   });
   const sassOption = await core.mountHook().moduleSassConfig({
     modernConfig
   }, // eslint-disable-next-line @typescript-eslint/require-await
   {
-    onLast: async _ => null
+    onLast: async _ => undefined
+  });
+  const tailwindPlugin = await core.mountHook().moduleTailwindConfig({
+    modernConfig
+  }, // eslint-disable-next-line @typescript-eslint/require-await
+  {
+    onLast: async _ => undefined
   });
   const postcssOption = getPostcssOption(appDirectory, modernConfig);
+
+  if (tailwindPlugin) {
+    var _postcssOption$plugin;
+
+    (_postcssOption$plugin = postcssOption.plugins) === null || _postcssOption$plugin === void 0 ? void 0 : _postcssOption$plugin.push(tailwindPlugin);
+  }
+
   const {
     importStyle
   } = modernConfig.output;

package/dist/js/modern/utils/babel.js

@@ -62,7 +62,9 @@ export const resolveBabelConfig = (appDirectory, modernConfig, option) => {
   }, {
     type: option.type,
     syntax: option.syntax
-  });
+  }); // Preventing warning when files are too large
+
+  internalBabelConfig.compact = false;
   const babelChain = getModuleBabelChain({
     appDirectory,
     enableReactPreset: true,

package/dist/js/modern/utils/copy.js

@@ -21,9 +21,11 @@ export const copyTask = async option => {
   const {
     output: {
       copy,
-      path: outputPath = 'dist'
+      path: outputPath = 'dist',
+      jsPath = 'js'
     }
   } = modernConfig;
+  const copyDistDir = path.join(outputPath, jsPath);
 
   if (!copy) {
     return;
@@ -70,7 +72,7 @@ export const copyTask = async option => {
         const relativeFrom = path.relative(context, item); // 如果 to 是目录，通过相对路径计算完整的产物路径；如果 to 是文件，直接作为最终产物路径
 
         const fileName = isToDirectory ? path.join(to, relativeFrom) : to;
-        const finalToPath = path.resolve(outputPath, fileName);
+        const finalToPath = path.resolve(copyDistDir, fileName);
         fs.copySync(item, finalToPath);
       });
     }

package/dist/js/node/commands/index.js

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "dev", {
+Object.defineProperty(exports, "build", {
   enumerable: true,
   get: function () {
-    return _dev.dev;
+    return _build.build;
   }
 });
-Object.defineProperty(exports, "build", {
+Object.defineProperty(exports, "dev", {
   enumerable: true,
   get: function () {
-    return _build.build;
+    return _dev.dev;
   }
 });
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.clearFlag = exports.runStyleCompilerTitle = exports.runTscTitle = exports.runTscWatchTitle = exports.runBabelCompilerTitle = exports.PACKAGE_MODES = exports.DEFAULT_PACKAGE_MODE = void 0;
+exports.runTscWatchTitle = exports.runTscTitle = exports.runStyleCompilerTitle = exports.runBabelCompilerTitle = exports.clearFlag = exports.PACKAGE_MODES = exports.DEFAULT_PACKAGE_MODE = void 0;
 // Universal JS 的默认选择，三份构建产物，支持 Node.js，对现代浏览器有优化
 const universalJs = [{
   type: 'module',

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.LoggerText = exports.logTemplate = exports.clearFlag = exports.colors = void 0;
+exports.logTemplate = exports.colors = exports.clearFlag = exports.LoggerText = void 0;
 
 var _utils = require("@modern-js/utils");
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TimeCounter = exports.logTemplate = exports.LogStack = exports.getDtsMapper = exports.getCodeMapper = exports.getCodeInitMapper = void 0;
+exports.logTemplate = exports.getDtsMapper = exports.getCodeMapper = exports.getCodeInitMapper = exports.TimeCounter = exports.LogStack = void 0;
 
 var path = _interopRequireWildcard(require("path"));
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.devStorybook = exports.showMenu = void 0;
+exports.showMenu = exports.devStorybook = void 0;
 
 var _utils = require("@modern-js/utils");
 
@@ -51,7 +51,7 @@ const devStorybook = async config => {
   if (findStorybook) {
     await findStorybook.runTask(config);
   } else {
-    console.info(_chalk.default.yellow('You need to enable storybook functionality with the `new` script or `modern new` or install @modern-js/plugin-storybook')); // eslint-disable-next-line no-process-exit
+    console.info(_chalk.default.yellow('No development features found.\nYou can use the `new` command to enable the development features')); // eslint-disable-next-line no-process-exit
 
     process.exit(0);
   }

package/dist/js/node/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.defineConfig = void 0;
+exports.defineConfig = exports.default = void 0;
 
 var _utils = require("@modern-js/utils");
 

package/dist/js/node/tasks/build-source-code.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.initEnv = exports.buildSourceCode = exports.getWillCompilerCode = exports.Compiler = void 0;
+exports.initEnv = exports.getWillCompilerCode = exports.buildSourceCode = exports.Compiler = void 0;
 
 var _utils = require("@modern-js/utils");
 

package/dist/js/node/tasks/build-style.js

@@ -92,15 +92,28 @@ const taskMain = async ({
     modernConfig
   }, // eslint-disable-next-line @typescript-eslint/require-await
   {
-    onLast: async _ => null
+    onLast: async _ => undefined
   });
   const sassOption = await core.mountHook().moduleSassConfig({
     modernConfig
   }, // eslint-disable-next-line @typescript-eslint/require-await
   {
-    onLast: async _ => null
+    onLast: async _ => undefined
+  });
+  const tailwindPlugin = await core.mountHook().moduleTailwindConfig({
+    modernConfig
+  }, // eslint-disable-next-line @typescript-eslint/require-await
+  {
+    onLast: async _ => undefined
   });
   const postcssOption = getPostcssOption(appDirectory, modernConfig);
+
+  if (tailwindPlugin) {
+    var _postcssOption$plugin;
+
+    (_postcssOption$plugin = postcssOption.plugins) === null || _postcssOption$plugin === void 0 ? void 0 : _postcssOption$plugin.push(tailwindPlugin);
+  }
+
   const {
     importStyle
   } = modernConfig.output;

package/dist/js/node/utils/babel.js

@@ -74,7 +74,9 @@ const resolveBabelConfig = (appDirectory, modernConfig, option) => {
   }, {
     type: option.type,
     syntax: option.syntax
-  });
+  }); // Preventing warning when files are too large
+
+  internalBabelConfig.compact = false;
   const babelChain = (0, _babelPresetModule.getModuleBabelChain)({
     appDirectory,
     enableReactPreset: true,

package/dist/js/node/utils/copy.js

@@ -37,9 +37,11 @@ const copyTask = async option => {
   const {
     output: {
       copy,
-      path: outputPath = 'dist'
+      path: outputPath = 'dist',
+      jsPath = 'js'
     }
   } = modernConfig;
+  const copyDistDir = path.join(outputPath, jsPath);
 
   if (!copy) {
     return;
@@ -86,7 +88,7 @@ const copyTask = async option => {
         const relativeFrom = path.relative(context, item); // 如果 to 是目录，通过相对路径计算完整的产物路径；如果 to 是文件，直接作为最终产物路径
 
         const fileName = isToDirectory ? path.join(to, relativeFrom) : to;
-        const finalToPath = path.resolve(outputPath, fileName);
+        const finalToPath = path.resolve(copyDistDir, fileName);
 
         _utils.fs.copySync(item, finalToPath);
       });

package/dist/js/node/utils/logger.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.LoggerManager = exports.LoggerText = exports.logTemplate = exports.clearFlag = void 0;
+exports.logTemplate = exports.clearFlag = exports.LoggerText = exports.LoggerManager = void 0;
 
 var _events = _interopRequireDefault(require("events"));
 

package/dist/js/node/utils/tsconfig.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.existTsConfigFile = exports.readTsConfig = void 0;
+exports.readTsConfig = exports.existTsConfigFile = void 0;
 
 var _utils = require("@modern-js/utils");
 

package/dist/js/node/utils/tspaths-transform/utils.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.matchesPattern = matchesPattern;
 exports.isImportCall = isImportCall;
+exports.matchesPattern = matchesPattern;
 
 var _utils = require("@modern-js/utils");
 

package/dist/js/node/utils/valide.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.modernConfigValid = exports.valideBeforeTask = void 0;
+exports.valideBeforeTask = exports.modernConfigValid = void 0;
 
 var _utils = require("@modern-js/utils");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.7",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -33,20 +33,20 @@
     "@babel/runtime": "^7",
     "@babel/traverse": "^7.15.0",
     "@babel/types": "^7.15.0",
-    "@modern-js/babel-compiler": "^1.0.0-rc.2",
-    "@modern-js/babel-preset-module": "^1.0.0-rc.2",
-    "@modern-js/core": "^1.0.0-rc.2",
-    "@modern-js/css-config": "^1.0.0-rc.2",
-    "@modern-js/i18n-cli-language-detector": "^1.0.0-rc.2",
-    "@modern-js/module-tools-hooks": "^1.0.0-rc.2",
-    "@modern-js/new-action": "^1.0.0-rc.2",
-    "@modern-js/plugin": "^1.0.0-rc.2",
-    "@modern-js/plugin-analyze": "^1.0.0-rc.2",
-    "@modern-js/plugin-changeset": "^1.0.0-rc.2",
-    "@modern-js/plugin-fast-refresh": "^1.0.0-rc.2",
-    "@modern-js/plugin-i18n": "^1.0.0-rc.2",
-    "@modern-js/style-compiler": "^1.0.0-rc.2",
-    "@modern-js/utils": "^1.0.0-rc.2",
+    "@modern-js/babel-compiler": "^1.0.0-rc.7",
+    "@modern-js/babel-preset-module": "^1.0.0-rc.7",
+    "@modern-js/core": "^1.0.0-rc.7",
+    "@modern-js/css-config": "^1.0.0-rc.7",
+    "@modern-js/i18n-cli-language-detector": "^1.0.0-rc.7",
+    "@modern-js/module-tools-hooks": "^1.0.0-rc.7",
+    "@modern-js/new-action": "^1.0.0-rc.7",
+    "@modern-js/plugin": "^1.0.0-rc.7",
+    "@modern-js/plugin-analyze": "^1.0.0-rc.7",
+    "@modern-js/plugin-changeset": "^1.0.0-rc.7",
+    "@modern-js/plugin-fast-refresh": "^1.0.0-rc.7",
+    "@modern-js/plugin-i18n": "^1.0.0-rc.7",
+    "@modern-js/style-compiler": "^1.0.0-rc.7",
+    "@modern-js/utils": "^1.0.0-rc.7",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "dotenv": "^10.0.0",
@@ -65,7 +65,7 @@
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.15.0",
-    "@modern-js/babel-chain": "^1.0.0-rc.2",
+    "@modern-js/babel-chain": "^1.0.0-rc.7",
     "@types/babel__core": "^7.1.15",
     "@types/babel__generator": "^7.6.3",
     "@types/babel__traverse": "^7.14.2",
@@ -78,8 +78,8 @@
     "@types/signale": "^1.4.2",
     "commander": "^8.1.0",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.0.0-rc.2",
-    "@modern-js/module-tools": "^1.0.0-rc.2"
+    "@modern-js/plugin-testing": "^1.0.0-rc.7",
+    "@modern-js/module-tools": "^1.0.0-rc.7"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -87,6 +87,10 @@
       "packageMode": "node-js"
     }
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  },
   "scripts": {
     "new": "modern new",
     "build": "modern build",

package/src/features/dev/index.ts

@@ -53,7 +53,7 @@ export const devStorybook = async (config: IDevConfig) => {
   } else {
     console.info(
       chalk.yellow(
-        'You need to enable storybook functionality with the `new` script or `modern new` or install @modern-js/plugin-storybook',
+        'No development features found.\nYou can use the `new` command to enable the development features',
       ),
     );
     // eslint-disable-next-line no-process-exit

package/src/tasks/build-style.ts

@@ -100,17 +100,26 @@ const taskMain = async ({
   } = modernConfig.output as ModuleToolsOutput;
   const { appDirectory } = appContext;
 
-  const lessOption = await (core.mountHook() as any).moduleLessConfig(
+  const lessOption = await core.mountHook().moduleLessConfig(
     { modernConfig },
     // eslint-disable-next-line @typescript-eslint/require-await
-    { onLast: async (_: any) => null as any },
+    { onLast: async (_: any) => undefined },
   );
-  const sassOption = await (core.mountHook() as any).moduleSassConfig(
+  const sassOption = await core.mountHook().moduleSassConfig(
     { modernConfig },
     // eslint-disable-next-line @typescript-eslint/require-await
-    { onLast: async (_: any) => null as any },
+    { onLast: async (_: any) => undefined },
+  );
+  const tailwindPlugin = await core.mountHook().moduleTailwindConfig(
+    { modernConfig },
+    // eslint-disable-next-line @typescript-eslint/require-await
+    { onLast: async (_: any) => undefined },
   );
   const postcssOption = getPostcssOption(appDirectory, modernConfig);
+  if (tailwindPlugin) {
+    postcssOption.plugins?.push(tailwindPlugin);
+  }
+
   const { importStyle } = modernConfig.output as ModuleToolsOutput;
   const existStylesDir = checkStylesDirExist({ appDirectory });
   // 编译 styles 目录样式

package/src/utils/babel.ts

@@ -73,6 +73,10 @@ export const resolveBabelConfig = (
       syntax: option.syntax,
     },
   );
+
+  // Preventing warning when files are too large
+  internalBabelConfig.compact = false;
+
   const babelChain = getModuleBabelChain(
     {
       appDirectory,

package/src/utils/copy.ts

@@ -17,8 +17,9 @@ export const copyTask = async (option: {
   const { modernConfig, appContext } = option;
   const { appDirectory } = appContext;
   const {
-    output: { copy, path: outputPath = 'dist' },
+    output: { copy, path: outputPath = 'dist', jsPath = 'js' },
   } = modernConfig;
+  const copyDistDir = path.join(outputPath, jsPath);
 
   if (!copy) {
     return;
@@ -60,7 +61,7 @@ export const copyTask = async (option: {
         const relativeFrom = path.relative(context, item);
         // 如果 to 是目录，通过相对路径计算完整的产物路径；如果 to 是文件，直接作为最终产物路径
         const fileName = isToDirectory ? path.join(to, relativeFrom) : to;
-        const finalToPath = path.resolve(outputPath, fileName);
+        const finalToPath = path.resolve(copyDistDir, fileName);
         fs.copySync(item, finalToPath);
       });
     }