@modern-js/app-tools 1.8.4 → 1.17.0

package/CHANGELOG.md

@@ -1,5 +1,104 @@
 # @modern-js/app-tools
 
+## 1.17.0
+
+### Patch Changes
+
+- fb30bca: feat: add upgrade tools and command
+
+  feat: 增加升级工具和升级命令
+
+- c3d4a6a: feat: support react 18 ssr
+  feat: 支持 React 18 下使用 SSR
+- Updated dependencies [1b9176f]
+- Updated dependencies [77d3a38]
+- Updated dependencies [fb30bca]
+- Updated dependencies [f3fab28]
+- Updated dependencies [151329d]
+- Updated dependencies [367405a]
+- Updated dependencies [5af9472]
+- Updated dependencies [6b6a534]
+- Updated dependencies [6b43a2b]
+- Updated dependencies [9f4e5ce]
+- Updated dependencies [58c53a7]
+- Updated dependencies [a7be124]
+- Updated dependencies [31547b4]
+  - @modern-js/utils@1.17.0
+  - @modern-js/upgrade@1.17.0
+  - @modern-js/new-action@1.17.0
+  - @modern-js/webpack@1.17.0
+  - @modern-js/server@1.17.0
+  - @modern-js/core@1.17.0
+  - @modern-js/plugin-i18n@1.17.0
+  - @modern-js/plugin-jarvis@1.17.0
+  - @modern-js/prod-server@1.17.0
+  - @modern-js/node-bundle-require@1.17.0
+  - @modern-js/plugin@1.17.0
+  - @modern-js/types@1.17.0
+
+## 1.16.0
+
+### Minor Changes
+
+- 1100dd58c: chore: support react 18
+
+  chore: 支持 React 18
+
+### Patch Changes
+
+- 3904b30a5: fix: check apiOnly while has source.entriesDir
+
+  fix: 当配置 source.entriesDir 存在时，apiOnly 检查错误
+
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [2808ff5a2]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+- Updated dependencies [9d9bbfd05]
+  - @modern-js/utils@1.16.0
+  - @modern-js/webpack@1.16.0
+  - @modern-js/types@1.16.0
+  - @modern-js/server@1.16.0
+  - @modern-js/prod-server@1.16.0
+  - @modern-js/new-action@1.16.0
+  - @modern-js/core@1.16.0
+  - @modern-js/plugin-i18n@1.16.0
+  - @modern-js/plugin-jarvis@1.16.0
+  - @modern-js/node-bundle-require@1.16.0
+  - @modern-js/plugin@1.16.0
+
+## 1.15.0
+
+### Patch Changes
+
+- d85a20d: fix(app-tools): should not modify entry when using disableDefaultEntries
+
+  fix(app-tools): 修复开启 disableDefaultEntries 后 entry 名称被修改的问题
+
+- 37cd159: feat(webpack): log more detailed error messages
+- Updated dependencies [8658a78]
+- Updated dependencies [0df4970]
+- Updated dependencies [05d4a4f]
+- Updated dependencies [b1f7000]
+- Updated dependencies [ad05af9]
+- Updated dependencies [5d53d1c]
+- Updated dependencies [c087148]
+- Updated dependencies [37cd159]
+  - @modern-js/utils@1.15.0
+  - @modern-js/webpack@1.15.0
+  - @modern-js/server@1.15.0
+  - @modern-js/types@1.15.0
+  - @modern-js/prod-server@1.15.0
+  - @modern-js/new-action@1.15.0
+  - @modern-js/core@1.15.0
+  - @modern-js/plugin-i18n@1.15.0
+  - @modern-js/plugin-jarvis@1.15.0
+  - @modern-js/node-bundle-require@1.15.0
+  - @modern-js/plugin@1.15.0
+
 ## 1.8.4
 
 ### Patch Changes

package/dist/js/modern/analyze/generateCode.js

@@ -123,7 +123,8 @@ export const generateCode = async (appContext, config, entrypoints, api) => {
           entrypoint,
           srcDirectory,
           internalSrcAlias,
-          internalDirAlias
+          internalDirAlias,
+          internalDirectory
         })
       }); // call modifyEntryRuntimePlugins hook
 

package/dist/js/modern/analyze/getBundleEntry.js

@@ -59,14 +59,17 @@ export const getBundleEntry = (appContext, config) => {
         defaults.push(entrypoint);
       }
     });
-  } // find main entry point which server route is '/'.
+  }
 
+  if (!disableDefaultEntries) {
+    // find main entry point which server route is '/'.
+    const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir);
+    const found = defaults.find(({
+      entryName,
+      entry
+    }) => entryName === packageName || path.dirname(entry) === entriesDirAbs);
+    found && (found.entryName = MAIN_ENTRY_NAME);
+  }
 
-  const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir);
-  const found = defaults.find(({
-    entryName,
-    entry
-  }) => entryName === packageName || path.dirname(entry) === entriesDirAbs);
-  found && (found.entryName = MAIN_ENTRY_NAME);
   return defaults;
 };

package/dist/js/modern/analyze/index.js

@@ -39,6 +39,8 @@ export default (() => ({
     let originEntrypoints = [];
     return {
       async prepare() {
+        var _resolvedConfig$sourc;
+
         const appContext = api.useAppContext();
         const resolvedConfig = api.useResolvedConfigContext();
         const hookRunners = api.useHookRunners();
@@ -48,7 +50,7 @@ export default (() => ({
         } catch (_unused) {// FIXME:
         }
 
-        const apiOnly = await isApiOnly(appContext.appDirectory);
+        const apiOnly = await isApiOnly(appContext.appDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$sourc = resolvedConfig.source) === null || _resolvedConfig$sourc === void 0 ? void 0 : _resolvedConfig$sourc.entriesDir);
         await hookRunners.addRuntimeExports();
 
         if (apiOnly) {

package/dist/js/modern/analyze/templates.js

@@ -5,12 +5,15 @@ export const index = ({
   exportStatement
 }) => `
 const IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';
+const IS_REACT18 = process.env.IS_REACT18 === 'true';
 const MOUNT_ID = '${mountId}';
 
 ${imports}
 
 let AppWrapper = null;
 
+let root = null;
+
 function render() {
   ${renderFunction}
 }
@@ -35,7 +38,7 @@ export const renderFunction = ({
   })(${fileSystemRoutes ? '' : `App`})
 
   if (IS_BROWSER) {
-    ${customBootstrap ? `customBootstrap(AppWrapper);` : `bootstrap(AppWrapper, MOUNT_ID);`}
+    ${customBootstrap ? `customBootstrap(AppWrapper);` : `bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);`}
   }
 
   return AppWrapper

package/dist/js/modern/analyze/utils.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { normalizeToPosixPath } from '@modern-js/utils';
+import { isReact18, normalizeToPosixPath } from '@modern-js/utils';
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "./constants";
 export const walkDirectory = dir => fs.readdirSync(dir).reduce((previous, filename) => {
   const filePath = path.join(dir, filename);
@@ -15,7 +15,8 @@ export const getDefaultImports = ({
   entrypoint,
   srcDirectory,
   internalSrcAlias,
-  internalDirAlias
+  internalDirAlias,
+  internalDirectory
 }) => {
   const {
     entryName,
@@ -28,6 +29,11 @@ export const getDefaultImports = ({
       local: 'React'
     }],
     value: 'react'
+  }, {
+    specifiers: [{
+      local: 'ReactDOM'
+    }],
+    value: isReact18(path.join(internalDirectory, '../../')) ? 'react-dom/client' : 'react-dom'
   }, {
     specifiers: [{
       imported: 'createApp'

package/dist/js/modern/commands/start.js

@@ -2,6 +2,8 @@ import { logger, chalk, isApiOnly } from '@modern-js/utils';
 import server from '@modern-js/prod-server';
 import { printInstructions } from "../utils/printInstructions";
 export const start = async api => {
+  var _userConfig$source;
+
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
@@ -11,7 +13,7 @@ export const start = async api => {
     serverConfigFile
   } = appContext;
   logger.log(chalk.cyan(`Starting the modern server...`));
-  const apiOnly = await isApiOnly(appContext.appDirectory);
+  const apiOnly = await isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$source = userConfig.source) === null || _userConfig$source === void 0 ? void 0 : _userConfig$source.entriesDir);
   const app = await server({
     pwd: appDirectory,
     config: userConfig,

package/dist/js/modern/index.js

@@ -7,12 +7,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import path from 'path';
 import { defineConfig, cli } from '@modern-js/core';
 import LintPlugin from '@modern-js/plugin-jarvis';
-import { cleanRequireCache } from '@modern-js/utils';
+import { cleanRequireCache, Import } from '@modern-js/utils';
 import AnalyzePlugin from "./analyze";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
 export { defineConfig };
+const upgradeModel = Import.lazy('@modern-js/upgrade', require);
 export default (() => ({
   name: '@modern-js/app-tools',
   post: ['@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-polyfill'],
@@ -74,6 +75,7 @@ export default (() => ({
           } = await import("./commands/inspect");
           inspect(api, options);
         });
+        upgradeModel.defineCommand(program.command('upgrade'));
       },
 
       // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart

package/dist/js/modern/utils/createCompiler.js

@@ -24,10 +24,7 @@ export const createCompiler = async ({
     });
     compiler.hooks.done.tap('done', async stats => {
       const statsData = stats.toJson({
-        all: false,
-        warnings: true,
-        errors: true,
-        timings: true
+        preset: 'errors-warnings'
       });
       const {
         errors,

package/dist/js/node/analyze/generateCode.js

@@ -145,7 +145,8 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           entrypoint,
           srcDirectory,
           internalSrcAlias,
-          internalDirAlias
+          internalDirAlias,
+          internalDirectory
         })
       }); // call modifyEntryRuntimePlugins hook
 

package/dist/js/node/analyze/getBundleEntry.js

@@ -71,15 +71,18 @@ const getBundleEntry = (appContext, config) => {
         defaults.push(entrypoint);
       }
     });
-  } // find main entry point which server route is '/'.
+  }
 
+  if (!disableDefaultEntries) {
+    // find main entry point which server route is '/'.
+    const entriesDirAbs = (0, _utils.ensureAbsolutePath)(appDirectory, entriesDir);
+    const found = defaults.find(({
+      entryName,
+      entry
+    }) => entryName === packageName || _path.default.dirname(entry) === entriesDirAbs);
+    found && (found.entryName = _utils.MAIN_ENTRY_NAME);
+  }
 
-  const entriesDirAbs = (0, _utils.ensureAbsolutePath)(appDirectory, entriesDir);
-  const found = defaults.find(({
-    entryName,
-    entry
-  }) => entryName === packageName || _path.default.dirname(entry) === entriesDirAbs);
-  found && (found.entryName = _utils.MAIN_ENTRY_NAME);
   return defaults;
 };
 

package/dist/js/node/analyze/index.js

@@ -66,6 +66,8 @@ var _default = () => ({
     let originEntrypoints = [];
     return {
       async prepare() {
+        var _resolvedConfig$sourc;
+
         const appContext = api.useAppContext();
         const resolvedConfig = api.useResolvedConfigContext();
         const hookRunners = api.useHookRunners();
@@ -75,7 +77,7 @@ var _default = () => ({
         } catch (_unused) {// FIXME:
         }
 
-        const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory);
+        const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$sourc = resolvedConfig.source) === null || _resolvedConfig$sourc === void 0 ? void 0 : _resolvedConfig$sourc.entriesDir);
         await hookRunners.addRuntimeExports();
 
         if (apiOnly) {

package/dist/js/node/analyze/templates.js

@@ -12,12 +12,15 @@ const index = ({
   exportStatement
 }) => `
 const IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';
+const IS_REACT18 = process.env.IS_REACT18 === 'true';
 const MOUNT_ID = '${mountId}';
 
 ${imports}
 
 let AppWrapper = null;
 
+let root = null;
+
 function render() {
   ${renderFunction}
 }
@@ -45,7 +48,7 @@ const renderFunction = ({
   })(${fileSystemRoutes ? '' : `App`})
 
   if (IS_BROWSER) {
-    ${customBootstrap ? `customBootstrap(AppWrapper);` : `bootstrap(AppWrapper, MOUNT_ID);`}
+    ${customBootstrap ? `customBootstrap(AppWrapper);` : `bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM);`}
   }
 
   return AppWrapper

package/dist/js/node/analyze/utils.js

@@ -31,7 +31,8 @@ const getDefaultImports = ({
   entrypoint,
   srcDirectory,
   internalSrcAlias,
-  internalDirAlias
+  internalDirAlias,
+  internalDirectory
 }) => {
   const {
     entryName,
@@ -44,6 +45,11 @@ const getDefaultImports = ({
       local: 'React'
     }],
     value: 'react'
+  }, {
+    specifiers: [{
+      local: 'ReactDOM'
+    }],
+    value: (0, _utils.isReact18)(_path.default.join(internalDirectory, '../../')) ? 'react-dom/client' : 'react-dom'
   }, {
     specifiers: [{
       imported: 'createApp'

package/dist/js/node/commands/start.js

@@ -14,6 +14,8 @@ var _printInstructions = require("../utils/printInstructions");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const start = async api => {
+  var _userConfig$source;
+
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
@@ -25,7 +27,7 @@ const start = async api => {
 
   _utils.logger.log(_utils.chalk.cyan(`Starting the modern server...`));
 
-  const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory);
+  const apiOnly = await (0, _utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig$source = userConfig.source) === null || _userConfig$source === void 0 ? void 0 : _userConfig$source.entriesDir);
   const app = await (0, _prodServer.default)({
     pwd: appDirectory,
     config: userConfig,

package/dist/js/node/index.js

@@ -39,6 +39,8 @@ 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; }
 
+const upgradeModel = _utils.Import.lazy('@modern-js/upgrade', require);
+
 var _default = () => ({
   name: '@modern-js/app-tools',
   post: ['@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-polyfill'],
@@ -102,6 +104,7 @@ var _default = () => ({
           } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands/inspect")));
           inspect(api, options);
         });
+        upgradeModel.defineCommand(program.command('upgrade'));
       },
 
       // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart

package/dist/js/node/utils/createCompiler.js

@@ -35,10 +35,7 @@ const createCompiler = async ({
     });
     compiler.hooks.done.tap('done', async stats => {
       const statsData = stats.toJson({
-        all: false,
-        warnings: true,
-        errors: true,
-        timings: true
+        preset: 'errors-warnings'
       });
       const {
         errors,

package/dist/types/analyze/utils.d.ts

@@ -5,11 +5,13 @@ export declare const getDefaultImports: ({
   entrypoint,
   srcDirectory,
   internalSrcAlias,
-  internalDirAlias
+  internalDirAlias,
+  internalDirectory
 }: {
   entrypoint: Entrypoint;
   srcDirectory: string;
   internalSrcAlias: string;
   internalDirAlias: string;
+  internalDirectory: string;
 }) => ImportStatement[];
 export declare const isRouteComponentFile: (filePath: string) => boolean;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.8.4",
+  "version": "1.17.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -56,30 +56,29 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/core": "^1.14.0",
-    "@modern-js/new-action": "^1.4.0",
-    "@modern-js/node-bundle-require": "^1.3.8",
-    "@modern-js/plugin": "^1.4.1",
-    "@modern-js/plugin-i18n": "^1.3.0",
-    "@modern-js/plugin-jarvis": "^1.2.14",
-    "@modern-js/prod-server": "^1.2.2",
-    "@modern-js/server": "^1.6.0",
-    "@modern-js/types": "^1.6.2",
-    "@modern-js/utils": "^1.9.0",
-    "@modern-js/webpack": "^1.12.4",
+    "@modern-js/core": "1.17.0",
+    "@modern-js/new-action": "1.17.0",
+    "@modern-js/upgrade": "1.17.0",
+    "@modern-js/node-bundle-require": "1.17.0",
+    "@modern-js/plugin": "1.17.0",
+    "@modern-js/plugin-i18n": "1.17.0",
+    "@modern-js/plugin-jarvis": "1.17.0",
+    "@modern-js/prod-server": "1.17.0",
+    "@modern-js/server": "1.17.0",
+    "@modern-js/types": "1.17.0",
+    "@modern-js/utils": "1.17.0",
+    "@modern-js/webpack": "1.17.0",
     "@babel/parser": "^7.18.0",
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0"
   },
   "devDependencies": {
-    "@modern-js/server-core": "1.4.1",
+    "@modern-js/server-core": "1.17.0",
     "@types/babel__traverse": "^7.14.2",
-    "@scripts/build": "0.0.0",
-    "@scripts/jest-config": "0.0.0",
+    "@scripts/build": "1.17.0",
+    "@scripts/jest-config": "1.17.0",
     "@types/jest": "^27",
     "@types/node": "^14",
-    "@types/react": "^17",
-    "@types/react-dom": "^17",
     "jest": "^27",
     "typescript": "^4"
   },