@modern-js/app-tools 2.13.3 → 2.14.0

package/dist/esm-node/config/default.js

@@ -1,4 +1,5 @@
 import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
+import { getAutoInjectEnv } from "../utils/env";
 function createDefaultConfig(appContext, bundler) {
   const defaultBuilderConfig = createDefaultBuilderConfig();
   const dev = {
@@ -18,6 +19,7 @@ function createDefaultConfig(appContext, bundler) {
     disableDefaultEntries: false,
     entriesDir: "./src",
     configDir: "./config",
+    globalVars: getAutoInjectEnv(appContext),
     alias: {
       [appContext.internalDirAlias]: appContext.internalDirectory,
       [appContext.internalSrcAlias]: appContext.srcDirectory,
@@ -78,7 +80,7 @@ function createLegacyDefaultConfig(appContext) {
     configDir: "./config",
     apiDir: "./api",
     envVars: [],
-    globalVars: void 0,
+    globalVars: getAutoInjectEnv(appContext),
     alias: defaultAlias,
     moduleScopes: void 0,
     include: []

package/dist/esm-node/config/initialize/inits.js

@@ -6,7 +6,6 @@ import {
   globby,
   isModernjsMonorepo
 } from "@modern-js/utils";
-import { getAutoInjectEnv } from "../../utils/env";
 function initHtmlConfig(config, appContext) {
   const ICON_EXTENSIONS = ["png", "jpg", "jpeg", "svg", "ico"];
   config.html.appIcon = createBuilderAppIcon(config, appContext);
@@ -42,15 +41,9 @@ function initHtmlConfig(config, appContext) {
 }
 function initSourceConfig(config, appContext, bundler) {
   config.source.include = createBuilderInclude(config, appContext);
-  config.source.globalVars = createBuilderGlobalVars(config, appContext);
   if (bundler === "webpack") {
     config.source.moduleScopes = createBuilderModuleScope(config);
   }
-  function createBuilderGlobalVars(config2, appContext2) {
-    const { globalVars = {} } = config2.source;
-    const publicEnv = getAutoInjectEnv(appContext2);
-    return { ...globalVars, ...publicEnv };
-  }
   function createBuilderInclude(config2, appContext2) {
     const { include } = config2.source;
     const defaultInclude = [appContext2.internalDirectory];

package/dist/esm-node/index.js

@@ -120,7 +120,7 @@ var src_default = (options = {
           const { MWANewAction } = await import("@modern-js/new-action");
           await MWANewAction({ ...options2, locale: options2.lang || locale });
         });
-        program.command("inspect").description("inspect internal webpack config").option(
+        program.command("inspect").description("inspect the internal configs").option(
           `--env <env>`,
           i18n.t(localeKeys.command.inspect.env),
           "development"
@@ -140,8 +140,11 @@ var src_default = (options = {
       async prepare() {
         const command = getCommand();
         if (command === "dev" || command === "start" || command === "build" || command === "deploy") {
-          const appContext = api.useAppContext();
-          await emptyDir(appContext.distDirectory);
+          const resolvedConfig = api.useResolvedConfigContext();
+          if (resolvedConfig.output.cleanDistPath) {
+            const appContext = api.useAppContext();
+            await emptyDir(appContext.distDirectory);
+          }
         }
       },
       async watchFiles() {

package/dist/esm-node/locale/en.js

@@ -5,7 +5,7 @@ const EN_LOCALE = {
       config: "specify config file"
     },
     dev: {
-      describe: "start dev server",
+      describe: "starting the dev server",
       entry: "compiler by entry",
       apiOnly: "start api server only",
       webOnly: "start web server only",
@@ -13,12 +13,12 @@ const EN_LOCALE = {
       requireEntry: "You must choose at least one entry"
     },
     build: {
-      describe: "build application"
+      describe: "build the app for production"
     },
-    serve: { describe: "start server" },
-    deploy: { describe: "deploy application" },
+    serve: { describe: "preview the production build locally" },
+    deploy: { describe: "deploy the application" },
     new: {
-      describe: "generator runner for MWA project",
+      describe: "enable optional features or add a new entry",
       debug: "using debug mode to log something",
       config: "set default generator config(json string)",
       distTag: `use specified tag version for it's generator`,

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

@@ -5,7 +5,7 @@ const ZH_LOCALE = {
       config: "指定配置文件路径，可以为相对路径或绝对路径"
     },
     dev: {
-      describe: "本地开发命令",
+      describe: "启动开发服务器",
       entry: "指定入口，编译特定的页面",
       apiOnly: "仅启动 API 接口服务",
       webOnly: "仅启动 Web 服务",
@@ -13,10 +13,10 @@ const ZH_LOCALE = {
       requireEntry: "请至少选择一个入口"
     },
     build: {
-      describe: "构建应用命令"
+      describe: "构建生产环境产物"
     },
-    serve: { describe: "应用启动命令" },
-    deploy: { describe: "部署应用命令" },
+    serve: { describe: "启动生产环境服务" },
+    deploy: { describe: "部署应用" },
     new: {
       describe: "Web App 项目中执行生成器",
       debug: "开启 Debug 模式，打印调试日志信息",

package/dist/esm-node/schema/legacy.js

@@ -23,7 +23,7 @@ const source = {
   enableAsyncEntry: { type: "boolean" },
   disableDefaultEntries: { type: "boolean" },
   envVars: { type: "array" },
-  globalVars: { type: "object" },
+  globalVars: { typeof: ["object", "function"] },
   moduleScopes: { instanceof: ["Array", "Function"] },
   entriesDir: { type: "string" },
   configDir: { type: "string" },

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

@@ -26,6 +26,8 @@ export declare const NESTED_ROUTE: {
   LOADER_FILE: string;
   SPLATE_FILE: string;
   SPLATE_LOADER_FILE: string;
+  LAYOUT_CONFIG_FILE: string;
+  PAGE_CONFIG_FILE: string;
 };
 export declare const APP_CONFIG_NAME = "config";
 export declare const APP_INIT_EXPORTED = "init";

package/dist/types/builder/builder-rspack/adapterCopy.d.ts

@@ -0,0 +1,4 @@
+import { BuilderPlugin } from '@modern-js/builder-shared';
+import { BuilderPluginAPI } from '@modern-js/builder-rspack-provider';
+import { BuilderOptions } from '../shared';
+export declare const builderPluginAdpaterCopy: (options: BuilderOptions<'rspack'>) => BuilderPlugin<BuilderPluginAPI>;

package/dist/types/builder/builder-webpack/{builderPlugins/compatModern.d.ts → adapterModern.d.ts}

@@ -1,8 +1,8 @@
 import { BuilderPlugin } from '@modern-js/builder-shared';
 import type { BuilderPluginAPI } from '@modern-js/builder-webpack-provider';
-import { BuilderOptions } from '../../shared';
+import { BuilderOptions } from '../shared';
 /**
  * Provides default configuration consistent with modern.js v1
  */
 
-export declare const builderPluginCompatModern: (options: BuilderOptions<'webpack'>) => BuilderPlugin<BuilderPluginAPI>;
+export declare const builderPluginAdapterModern: (options: BuilderOptions<'webpack'>) => BuilderPlugin<BuilderPluginAPI>;

package/dist/types/builder/{shared → builder-webpack}/createCopyPattern.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { WebpackChain } from '@modern-js/builder-webpack-provider';
 import { AppNormalizedConfig, IAppContext } from '../../types';
-export declare function createCopyPattern(appContext: IAppContext, config: AppNormalizedConfig, patternsType: 'upload' | 'public', chain?: WebpackChain): {
+export declare function createPublicPattern(appContext: IAppContext, config: AppNormalizedConfig, chain: WebpackChain): {
   info: (file: {
     sourceFilename: string;
   }) => {
@@ -12,7 +12,8 @@ export declare function createCopyPattern(appContext: IAppContext, config: AppNo
   context: string;
   noErrorOnMissing: boolean;
   transform: (content: Buffer, absoluteFrom: string) => string | Buffer;
-} | {
+};
+export declare function createUploadPattern(appContext: IAppContext, config: AppNormalizedConfig): {
   info: (file: {
     sourceFilename: string;
   }) => {
@@ -22,5 +23,4 @@ export declare function createCopyPattern(appContext: IAppContext, config: AppNo
   to: string;
   context: string;
   noErrorOnMissing: boolean;
-  transform?: undefined;
 };

package/dist/types/builder/shared/createCopyInfo.d.ts

@@ -0,0 +1,6 @@
+import { AppNormalizedConfig, IAppContext } from '../../types';
+export declare function createCopyInfo(appContext: IAppContext, config: AppNormalizedConfig<'shared'>): {
+  configDir: string;
+  uploadDir: string;
+  publicDir: string;
+};

package/dist/types/builder/shared/index.d.ts

@@ -1,3 +1,3 @@
-export * from './createCopyPattern';
 export * from './types';
-export * from './builderPlugins';
+export * from './builderPlugins';
+export * from './createCopyInfo';

package/dist/types/types/config/deploy.d.ts

@@ -5,4 +5,7 @@ export interface MicroFrontend {
 }
 export interface DeployUserConfig {
   microFrontend?: boolean | MicroFrontend;
+  worker?: {
+    ssr?: boolean;
+  };
 }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.13.3",
+  "version": "2.14.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,23 +69,23 @@
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
     "rspack-plugin-virtual-module": "0.1.0",
-    "@modern-js/builder": "2.13.3",
-    "@modern-js/builder-plugin-esbuild": "2.13.3",
-    "@modern-js/builder-plugin-node-polyfill": "2.13.3",
-    "@modern-js/builder-shared": "2.13.3",
-    "@modern-js/builder-webpack-provider": "2.13.3",
-    "@modern-js/core": "2.13.3",
-    "@modern-js/new-action": "2.13.3",
-    "@modern-js/node-bundle-require": "2.13.3",
-    "@modern-js/plugin": "2.13.3",
-    "@modern-js/plugin-data-loader": "2.13.3",
-    "@modern-js/plugin-i18n": "2.13.3",
-    "@modern-js/plugin-lint": "2.13.3",
-    "@modern-js/prod-server": "2.13.3",
-    "@modern-js/server": "2.13.3",
-    "@modern-js/types": "2.13.3",
-    "@modern-js/upgrade": "2.13.3",
-    "@modern-js/utils": "2.13.3"
+    "@modern-js/builder": "2.14.0",
+    "@modern-js/builder-plugin-esbuild": "2.14.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.14.0",
+    "@modern-js/builder-shared": "2.14.0",
+    "@modern-js/builder-webpack-provider": "2.14.0",
+    "@modern-js/core": "2.14.0",
+    "@modern-js/new-action": "2.14.0",
+    "@modern-js/node-bundle-require": "2.14.0",
+    "@modern-js/plugin": "2.14.0",
+    "@modern-js/plugin-data-loader": "2.14.0",
+    "@modern-js/plugin-i18n": "2.14.0",
+    "@modern-js/plugin-lint": "2.14.0",
+    "@modern-js/prod-server": "2.14.0",
+    "@modern-js/server": "2.14.0",
+    "@modern-js/types": "2.14.0",
+    "@modern-js/upgrade": "2.14.0",
+    "@modern-js/utils": "2.14.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -94,14 +94,14 @@
     "jest": "^29",
     "typescript": "^4",
     "webpack": "^5.76.2",
-    "@modern-js/builder-plugin-swc": "2.13.3",
-    "@modern-js/builder-rspack-provider": "2.13.3",
-    "@modern-js/server-core": "2.13.3",
-    "@scripts/build": "2.13.3",
-    "@scripts/jest-config": "2.13.3"
+    "@modern-js/builder-plugin-swc": "2.14.0",
+    "@modern-js/builder-rspack-provider": "2.14.0",
+    "@modern-js/server-core": "2.14.0",
+    "@scripts/build": "2.14.0",
+    "@scripts/jest-config": "2.14.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.13.3"
+    "@modern-js/builder-rspack-provider": "^2.14.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {

package/dist/esm/builder/shared/createCopyPattern.js

@@ -1,44 +0,0 @@
-import path from "path";
-import { removeTailSlash } from "@modern-js/utils";
-function createCopyPattern(appContext, config, patternsType, chain) {
-    var configDir = path.resolve(appContext.appDirectory, config.source.configDir || "./config");
-    var uploadDir = path.posix.join(configDir.replace(/\\/g, "/"), "upload");
-    var publicDir = path.posix.join(configDir.replace(/\\/g, "/"), "public");
-    var minifiedJsRexExp = /\.min\.js/;
-    var info = function(file) {
-        return {
-            // If the file name ends with `.min.js`, we assume it's a compressed file.
-            // So we don't want copy-webpack-plugin to minify it.
-            // ref: https://github.com/webpack-contrib/copy-webpack-plugin#info
-            minimized: minifiedJsRexExp.test(file.sourceFilename)
-        };
-    };
-    if (patternsType === "public") {
-        if (!chain) {
-            throw new Error("expect get a webpackChain, but receive 'undefined'");
-        }
-        return {
-            info: info,
-            from: "**/*",
-            to: "public",
-            context: publicDir,
-            noErrorOnMissing: true,
-            // eslint-disable-next-line node/prefer-global/buffer
-            transform: function(content, absoluteFrom) {
-                if (!/\.html?$/.test(absoluteFrom)) {
-                    return content;
-                }
-                return content.toString("utf8").replace(/<%=\s*assetPrefix\s*%>/g, removeTailSlash(chain.output.get("publicPath")));
-            }
-        };
-    } else {
-        return {
-            info: info,
-            from: "**/*",
-            to: "upload",
-            context: uploadDir,
-            noErrorOnMissing: true
-        };
-    }
-}
-export { createCopyPattern };

package/dist/esm-node/builder/shared/createCopyPattern.js

@@ -1,50 +0,0 @@
-import path from "path";
-import { removeTailSlash } from "@modern-js/utils";
-function createCopyPattern(appContext, config, patternsType, chain) {
-  const configDir = path.resolve(
-    appContext.appDirectory,
-    config.source.configDir || "./config"
-  );
-  const uploadDir = path.posix.join(configDir.replace(/\\/g, "/"), "upload");
-  const publicDir = path.posix.join(configDir.replace(/\\/g, "/"), "public");
-  const minifiedJsRexExp = /\.min\.js/;
-  const info = (file) => ({
-    // If the file name ends with `.min.js`, we assume it's a compressed file.
-    // So we don't want copy-webpack-plugin to minify it.
-    // ref: https://github.com/webpack-contrib/copy-webpack-plugin#info
-    minimized: minifiedJsRexExp.test(file.sourceFilename)
-  });
-  if (patternsType === "public") {
-    if (!chain) {
-      throw new Error("expect get a webpackChain, but receive 'undefined'");
-    }
-    return {
-      info,
-      from: "**/*",
-      to: "public",
-      context: publicDir,
-      noErrorOnMissing: true,
-      // eslint-disable-next-line node/prefer-global/buffer
-      transform: (content, absoluteFrom) => {
-        if (!/\.html?$/.test(absoluteFrom)) {
-          return content;
-        }
-        return content.toString("utf8").replace(
-          /<%=\s*assetPrefix\s*%>/g,
-          removeTailSlash(chain.output.get("publicPath"))
-        );
-      }
-    };
-  } else {
-    return {
-      info,
-      from: "**/*",
-      to: "upload",
-      context: uploadDir,
-      noErrorOnMissing: true
-    };
-  }
-}
-export {
-  createCopyPattern
-};