@modern-js/app-tools 1.4.1 → 1.4.4

package/CHANGELOG.md

@@ -1,5 +1,82 @@
 # @modern-js/app-tools
 
+## 1.4.4
+
+### Patch Changes
+
+- d5bf095a: fix: disable load webpack when apiOnly mode
+- Updated dependencies [5bf5868d]
+- Updated dependencies [80d3cfb7]
+- Updated dependencies [42c6b136]
+- Updated dependencies [80d8ddfe]
+- Updated dependencies [4e7dcbd5]
+- Updated dependencies [d95f28c3]
+- Updated dependencies [d95f28c3]
+- Updated dependencies [d5bf095a]
+- Updated dependencies [9e8bc4ab]
+- Updated dependencies [0923c182]
+- Updated dependencies [0c556e59]
+- Updated dependencies [80d8ddfe]
+- Updated dependencies [491145e3]
+- Updated dependencies [2008fdbd]
+- Updated dependencies [ca0bcf13]
+- Updated dependencies [9229dfd1]
+  - @modern-js/utils@1.3.5
+  - @modern-js/core@1.5.0
+  - @modern-js/plugin@1.3.0
+  - @modern-js/prod-server@1.0.4
+  - @modern-js/types@1.3.5
+  - @modern-js/server@1.4.7
+
+## 1.4.3
+
+### Patch Changes
+
+- 4b5d4bf4: feat: add img resource's inline and url type declaration
+- bdcf0865: fix: empty distDirectory for api service
+- 02fb4146: support product server
+- edc3bd3d: fix: @modern-js/core package not found
+- Updated dependencies [969f172f]
+- Updated dependencies [0ad75faa]
+- Updated dependencies [4c792f68]
+- Updated dependencies [83059b93]
+- Updated dependencies [4b5d4bf4]
+- Updated dependencies [0ad75faa]
+- Updated dependencies [62f5b8c8]
+- Updated dependencies [55e18278]
+- Updated dependencies [4499a674]
+- Updated dependencies [0ad75faa]
+- Updated dependencies [02fb4146]
+- Updated dependencies [403f5169]
+- Updated dependencies [e37ea5b2]
+- Updated dependencies [a7f42f48]
+- Updated dependencies [83059b93]
+  - @modern-js/core@1.4.4
+  - @modern-js/webpack@1.4.1
+  - @modern-js/utils@1.3.3
+  - @modern-js/new-action@1.3.3
+  - @modern-js/server@1.4.4
+  - @modern-js/types@1.3.4
+  - @modern-js/prod-server@1.0.1
+
+## 1.4.2
+
+### Patch Changes
+
+- fab92861: fix: @modern-js/core phantom dep
+- Updated dependencies [deeaa602]
+- Updated dependencies [54786e58]
+- Updated dependencies [6668a1bf]
+- Updated dependencies [fab92861]
+- Updated dependencies [3da3bf48]
+  - @modern-js/plugin-analyze@1.3.3
+  - @modern-js/server@1.4.3
+  - @modern-js/types@1.3.3
+  - @modern-js/utils@1.3.2
+  - @modern-js/webpack@1.4.0
+  - @modern-js/core@1.4.3
+  - @modern-js/new-action@1.3.2
+
 ## 1.4.1
 
 ### Patch Changes

package/dist/js/modern/commands/build.js

@@ -7,12 +7,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { webpack } from 'webpack';
 import { WebpackConfigTarget, getWebpackConfig } from '@modern-js/webpack';
 import { useAppContext, useResolvedConfigContext, mountHook, ResolvedConfigContext, manager } from '@modern-js/core';
-import { fs, formatWebpackMessages, measureFileSizesBeforeBuild, printFileSizesAfterBuild, printBuildError, logger, isUseSSRBundle } from '@modern-js/utils';
-import { generateRoutes } from "../utils/routes"; // These sizes are pretty large. We'll warn for bundles exceeding them.
-
+import { formatWebpackMessages, measureFileSizesBeforeBuild, printFileSizesAfterBuild, printBuildError, logger, isUseSSRBundle, emptyDir } from '@modern-js/utils';
+import { generateRoutes } from "../utils/routes";
+// These sizes are pretty large. We'll warn for bundles exceeding them.
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
-// eslint-disable-next-line max-statements
+const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024; // eslint-disable-next-line max-statements
+
 export const build = async options => {
   /* eslint-disable react-hooks/rules-of-hooks */
   const resolvedConfig = useResolvedConfigContext();
@@ -23,6 +23,10 @@ export const build = async options => {
   /* eslint-enable react-hooks/rules-of-hooks */
 
   if (!existSrc) {
+    const {
+      distDirectory
+    } = appContext;
+    await emptyDir(distDirectory);
     await mountHook().beforeBuild({
       webpackConfigs: []
     });
@@ -53,7 +57,7 @@ export const build = async options => {
 
           if (messages.errors.length === 0) {
             logger.info(`File sizes after ${label} build:\n`);
-            printFileSizesAfterBuild(stats, previousFileSizes, outputPath, WARN_AFTER_BUNDLE_GZIP_SIZE, WARN_AFTER_CHUNK_GZIP_SIZE);
+            printFileSizesAfterBuild(stats, previousFileSizes, distDirectory, WARN_AFTER_BUNDLE_GZIP_SIZE, WARN_AFTER_CHUNK_GZIP_SIZE);
             logger.log();
           }
         } // When using run or watch, call close and wait for it to finish before calling run or watch again.
@@ -87,9 +91,11 @@ export const build = async options => {
       cliOptions: options
     }));
   });
-  const outputPath = appContext.distDirectory;
-  const previousFileSizes = await measureFileSizesBeforeBuild(outputPath);
-  fs.emptyDirSync(outputPath);
+  const {
+    distDirectory
+  } = appContext;
+  const previousFileSizes = await measureFileSizesBeforeBuild(distDirectory);
+  await emptyDir(distDirectory);
   const buildConfigs = [];
   buildConfigs.push({
     type: 'legacy',

package/dist/js/modern/commands/dev.js

@@ -4,7 +4,6 @@ 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 { getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
 import { fs, logger, HMR_SOCK_PATH, clearConsole, chalk, isSSR } from '@modern-js/utils';
 import { useAppContext, useResolvedConfigContext, mountHook, AppContext } from '@modern-js/core';
 import { createCompiler } from "../utils/createCompiler";
@@ -35,6 +34,10 @@ export const dev = async options => {
   let compiler = null;
 
   if (existSrc) {
+    const {
+      getWebpackConfig,
+      WebpackConfigTarget
+    } = await import('@modern-js/webpack');
     const webpackConfigs = [isSSR(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE), getWebpackConfig(WebpackConfigTarget.CLIENT)].filter(Boolean);
     compiler = await createCompiler({
       webpackConfigs,
@@ -47,6 +50,7 @@ export const dev = async options => {
   const app = await createServer({
     dev: _objectSpread(_objectSpread({}, {
       client: {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         port: port.toString(),
         overlay: false,
         logging: 'none',

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

@@ -1,6 +1,6 @@
 import { logger, chalk } from '@modern-js/utils';
 import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
-import server from '@modern-js/server';
+import server from '@modern-js/prod-server';
 import { printInstructions } from "../utils/printInstructions";
 export const start = async () => {
   /* eslint-disable react-hooks/rules-of-hooks */

package/dist/js/modern/locale/zh.js

@@ -7,7 +7,7 @@ export const ZH_LOCALE = {
     },
     build: {
       describe: '构建应用命令',
-      analyze: '分析构建产物'
+      analyze: '分析构建产物体积，查看各个模块打包后的大小'
     },
     start: {
       describe: '应用启动命令'

package/dist/js/node/commands/build.js

@@ -23,9 +23,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 // These sizes are pretty large. We'll warn for bundles exceeding them.
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
+const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024; // eslint-disable-next-line max-statements
 
-// eslint-disable-next-line max-statements
 const build = async options => {
   /* eslint-disable react-hooks/rules-of-hooks */
   const resolvedConfig = (0, _core.useResolvedConfigContext)();
@@ -36,6 +35,10 @@ const build = async options => {
   /* eslint-enable react-hooks/rules-of-hooks */
 
   if (!existSrc) {
+    const {
+      distDirectory
+    } = appContext;
+    await (0, _utils.emptyDir)(distDirectory);
     await (0, _core.mountHook)().beforeBuild({
       webpackConfigs: []
     });
@@ -68,7 +71,7 @@ const build = async options => {
           if (messages.errors.length === 0) {
             _utils.logger.info(`File sizes after ${label} build:\n`);
 
-            (0, _utils.printFileSizesAfterBuild)(stats, previousFileSizes, outputPath, WARN_AFTER_BUNDLE_GZIP_SIZE, WARN_AFTER_CHUNK_GZIP_SIZE);
+            (0, _utils.printFileSizesAfterBuild)(stats, previousFileSizes, distDirectory, WARN_AFTER_BUNDLE_GZIP_SIZE, WARN_AFTER_CHUNK_GZIP_SIZE);
 
             _utils.logger.log();
           }
@@ -104,11 +107,11 @@ const build = async options => {
     }));
   });
 
-  const outputPath = appContext.distDirectory;
-  const previousFileSizes = await (0, _utils.measureFileSizesBeforeBuild)(outputPath);
-
-  _utils.fs.emptyDirSync(outputPath);
-
+  const {
+    distDirectory
+  } = appContext;
+  const previousFileSizes = await (0, _utils.measureFileSizesBeforeBuild)(distDirectory);
+  await (0, _utils.emptyDir)(distDirectory);
   const buildConfigs = [];
   buildConfigs.push({
     type: 'legacy',

package/dist/js/node/commands/dev.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.dev = void 0;
 
-var _webpack = require("@modern-js/webpack");
-
 var _utils = require("@modern-js/utils");
 
 var _core = require("@modern-js/core");
@@ -21,6 +19,10 @@ var _printInstructions = require("../utils/printInstructions");
 
 var _getSpecifiedEntries = require("../utils/getSpecifiedEntries");
 
+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 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; }
@@ -54,7 +56,11 @@ const dev = async options => {
   let compiler = null;
 
   if (existSrc) {
-    const webpackConfigs = [(0, _utils.isSSR)(userConfig) && (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.NODE), (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.CLIENT)].filter(Boolean);
+    const {
+      getWebpackConfig,
+      WebpackConfigTarget
+    } = await Promise.resolve().then(() => _interopRequireWildcard(require('@modern-js/webpack')));
+    const webpackConfigs = [(0, _utils.isSSR)(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE), getWebpackConfig(WebpackConfigTarget.CLIENT)].filter(Boolean);
     compiler = await (0, _createCompiler.createCompiler)({
       webpackConfigs,
       userConfig,
@@ -66,6 +72,7 @@ const dev = async options => {
   const app = await (0, _createServer.createServer)({
     dev: _objectSpread(_objectSpread({}, {
       client: {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         port: port.toString(),
         overlay: false,
         logging: 'none',

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

@@ -9,7 +9,7 @@ var _utils = require("@modern-js/utils");
 
 var _core = require("@modern-js/core");
 
-var _server = _interopRequireDefault(require("@modern-js/server"));
+var _prodServer = _interopRequireDefault(require("@modern-js/prod-server"));
 
 var _printInstructions = require("../utils/printInstructions");
 
@@ -28,7 +28,7 @@ const start = async () => {
 
   _utils.logger.log(_utils.chalk.cyan(`Starting the modern server...`));
 
-  const app = await (0, _server.default)({
+  const app = await (0, _prodServer.default)({
     pwd: appDirectory,
     config: userConfig,
     plugins: appContext.plugins.filter(p => p.server).map(p => p.server)

package/dist/js/node/locale/zh.js

@@ -13,7 +13,7 @@ const ZH_LOCALE = {
     },
     build: {
       describe: '构建应用命令',
-      analyze: '分析构建产物'
+      analyze: '分析构建产物体积，查看各个模块打包后的大小'
     },
     start: {
       describe: '应用启动命令'

package/dist/types/commands/build.d.ts

@@ -1,5 +1,2 @@
-interface CliOptions {
-  analyze?: boolean;
-}
-export declare const build: (options?: CliOptions | undefined) => Promise<void>;
-export {};
+import type { BuildOptions } from '../utils/types';
+export declare const build: (options?: BuildOptions | undefined) => Promise<void>;

package/dist/types/index.d.ts

@@ -1,23 +1,11 @@
 import { defineConfig } from '@modern-js/core';
 export { defineConfig };
 
-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>>>>;
+declare const _default: import("@modern-js/core").AsyncPlugin<import("@modern-js/core").CliHooks, {
+  setAppContext: (value: import("@modern-js/core").IAppContext) => void;
+  useAppContext: () => import("@modern-js/core").IAppContext;
+  useConfigContext: () => import("@modern-js/core/src/config").UserConfig;
+  useResolvedConfigContext: () => import("@modern-js/core").NormalizedConfig;
+}>;
 
 export default _default;

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

@@ -1,4 +1,4 @@
-import { Server, ModernServerOptions } from '@modern-js/server';
+import { Server, ModernDevServerOptions } from '@modern-js/server';
 export declare const getServer: () => Server | null;
 export declare const closeServer: () => Promise<void>;
-export declare const createServer: (options: ModernServerOptions) => Promise<Server>;
+export declare const createServer: (options: ModernDevServerOptions) => Promise<Server>;

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

@@ -1,3 +1,6 @@
 export declare type DevOptions = {
-  entry: string[] | boolean;
+  entry?: string[] | boolean;
+};
+export declare type BuildOptions = {
+  analyze?: boolean;
 };

package/lib/types.d.ts

@@ -56,6 +56,98 @@ declare module '*.svg' {
   export default src;
 }
 
+declare module '*.bmp?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.gif?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpg?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpeg?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.png?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.ico?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.webp?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.svg?inline' {
+  import * as React from 'react';
+
+  export const ReactComponent: React.FunctionComponent<
+    React.SVGProps<SVGSVGElement>
+  >;
+
+  const src: string;
+  export default src;
+}
+
+declare module '*.bmp?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.gif?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpg?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpeg?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.png?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.ico?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.webp?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.svg?url' {
+  import * as React from 'react';
+
+  export const ReactComponent: React.FunctionComponent<
+    React.SVGProps<SVGSVGElement>
+  >;
+
+  const src: string;
+  export default src;
+}
+
 declare module '*.css' {
   const classes: { readonly [key: string]: string };
   export default classes;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.1",
+  "version": "1.4.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -49,18 +49,19 @@
     "modern": "./bin/modern.js"
   },
   "dependencies": {
+    "@modern-js/core": "^1.5.0",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.4.1",
-    "@modern-js/types": "^1.3.1",
+    "@modern-js/types": "^1.3.5",
     "@modern-js/i18n-cli-language-detector": "^1.2.1",
-    "@modern-js/new-action": "^1.3.1",
-    "@modern-js/plugin": "^1.2.1",
-    "@modern-js/plugin-analyze": "^1.3.1",
+    "@modern-js/new-action": "^1.3.3",
+    "@modern-js/plugin": "^1.3.0",
+    "@modern-js/plugin-analyze": "^1.3.3",
     "@modern-js/plugin-fast-refresh": "^1.2.1",
     "@modern-js/plugin-i18n": "^1.2.1",
-    "@modern-js/server": "^1.4.1",
-    "@modern-js/utils": "^1.3.1",
-    "@modern-js/webpack": "^1.3.1",
+    "@modern-js/server": "^1.4.7",
+    "@modern-js/prod-server": "^1.0.4",
+    "@modern-js/utils": "^1.3.5",
+    "@modern-js/webpack": "^1.4.1",
     "inquirer": "^8.2.0",
     "webpack": "^5.54.0"
   },

package/tests/commands/build.test.ts

@@ -4,19 +4,23 @@ const mockBeforeBuild = jest.fn();
 const mockAfterBuild = jest.fn();
 const mockGenerateRoutes = jest.fn();
 
-jest.mock('@modern-js/core', () => ({
-  __esModule: true,
-  mountHook() {
-    return {
-      beforeBuild: mockBeforeBuild,
-      afterBuild: mockAfterBuild,
-    };
-  },
-  useAppContext: jest.fn(() => ({
-    existSrc: false,
-  })),
-  useResolvedConfigContext: jest.fn(),
-}));
+// eslint-disable-next-line arrow-body-style
+jest.mock('@modern-js/core', () => {
+  return {
+    __esModule: true,
+    mountHook() {
+      return {
+        beforeBuild: mockBeforeBuild,
+        afterBuild: mockAfterBuild,
+      };
+    },
+    useAppContext: jest.fn(() => ({
+      existSrc: false,
+      distDirectory: '',
+    })),
+    useResolvedConfigContext: jest.fn(),
+  };
+});
 
 jest.mock('../../src/utils/routes', () => ({
   __esModule: true,