@modern-js/app-tools 2.15.0 → 2.17.0

package/dist/esm-node/builder/shared/bundlerPlugins/HtmlBottomTemplate.js

@@ -1,34 +1,43 @@
-class BottomTemplatePlugin {
-  constructor(htmlWebpackPlugin) {
-    this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
-    this.bodyRegExp = /(<\/\s*body\s*>)/i;
-    this.htmlWebpackPlugin = htmlWebpackPlugin;
-    this.name = "bottom-template";
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
   }
+  return obj;
+}
+export class BottomTemplatePlugin {
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, (compilation) => {
       this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, (data) => {
-        var _a;
-        if (!((_a = data.plugin.options) == null ? void 0 : _a.__internal__)) {
+        var _data_plugin_options;
+        if (!((_data_plugin_options = data.plugin.options) === null || _data_plugin_options === void 0 ? void 0 : _data_plugin_options.__internal__)) {
           return data;
         }
         if (this.bottomTemplateReg.test(data.html)) {
           data.html = data.html.replace(this.bottomTemplateReg, "");
           const { bottomTemplate } = data.plugin.options;
           if (bottomTemplate) {
-            data.html = data.html.replace(
-              this.bodyRegExp,
-              (match) => `
+            data.html = data.html.replace(this.bodyRegExp, (match) => `
 ${bottomTemplate}
-${match}`
-            );
+${match}`);
           }
         }
         return data;
       });
     });
   }
+  constructor(htmlWebpackPlugin) {
+    _define_property(this, "htmlWebpackPlugin", void 0);
+    _define_property(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
+    _define_property(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
+    _define_property(this, "name", void 0);
+    this.htmlWebpackPlugin = htmlWebpackPlugin;
+    this.name = "bottom-template";
+  }
 }
-export {
-  BottomTemplatePlugin
-};

package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -3,7 +3,7 @@ import { fs } from "@modern-js/utils";
 import { ROUTE_MANIFEST_FILE } from "@modern-js/utils/constants";
 import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
 const PLUGIN_NAME = "ModernjsRoutePlugin";
-class RouterPlugin {
+export class RouterPlugin {
   apply(compiler) {
     const { target } = compiler.options;
     if (target === "node" || Array.isArray(target) && target.includes("node")) {
@@ -25,89 +25,79 @@ class RouterPlugin {
       return path2;
     };
     compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
-      compilation.hooks.processAssets.tapPromise(
-        {
-          name: PLUGIN_NAME,
-          stage: PROCESS_ASSETS_STAGE_REPORT
-        },
-        async () => {
-          const stats = compilation.getStats().toJson({
-            all: false,
-            publicPath: true,
-            assets: true,
-            chunkGroups: true,
-            chunks: true,
-            ids: true
+      compilation.hooks.processAssets.tapPromise({
+        name: PLUGIN_NAME,
+        stage: PROCESS_ASSETS_STAGE_REPORT
+      }, async () => {
+        const stats = compilation.getStats().toJson({
+          all: false,
+          publicPath: true,
+          assets: true,
+          chunkGroups: true,
+          chunks: true,
+          ids: true
+        });
+        const { publicPath, chunks = [], namedChunkGroups } = stats;
+        const routeAssets = {};
+        if (!namedChunkGroups) {
+          return;
+        }
+        for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
+          const assets = chunkGroup.assets.map((asset) => {
+            const filename2 = asset.name;
+            return publicPath ? normalizePath(publicPath) + filename2 : filename2;
           });
-          const { publicPath, chunks = [], namedChunkGroups } = stats;
-          const routeAssets = {};
-          if (!namedChunkGroups) {
-            return;
-          }
-          for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
-            const assets = chunkGroup.assets.map((asset) => {
-              const filename2 = asset.name;
-              return publicPath ? normalizePath(publicPath) + filename2 : filename2;
-            });
-            const referenceCssAssets = assets.filter(
-              (asset) => /\.css$/.test(asset)
-            );
-            routeAssets[name] = {
-              chunkIds: chunkGroup.chunks,
-              assets,
-              referenceCssAssets
-            };
-          }
-          const manifest = {
-            routeAssets
+          const referenceCssAssets = assets.filter((asset) => /\.css$/.test(asset));
+          routeAssets[name] = {
+            chunkIds: chunkGroup.chunks,
+            assets,
+            referenceCssAssets
           };
-          const injectedContent = `
+        }
+        const manifest = {
+          routeAssets
+        };
+        const injectedContent = `
             ;(function(){
               window.${ROUTE_MANIFEST} = ${JSON.stringify(manifest, (k, v) => {
-            if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
-              return v.map((item) => {
-                return item.replace(publicPath, "");
-              });
-            }
-            return v;
-          })};
+          if ((k === "assets" || k === "referenceCssAssets") && Array.isArray(v)) {
+            return v.map((item) => {
+              return item.replace(publicPath, "");
+            });
+          }
+          return v;
+        })};
             })();
           `;
-          const entrypointsArray = Array.from(
-            compilation.entrypoints.entries()
-          );
-          const entryChunkIds = entrypointsArray.map(
-            (entrypoint) => entrypoint[0]
-          );
-          const entryChunks = [...chunks].filter((chunk) => {
-            var _a;
-            return (_a = chunk.names) == null ? void 0 : _a.some((name) => entryChunkIds.includes(name));
-          });
-          const entryChunkFiles = entryChunks.map(
-            (chunk) => [...chunk.files || []].find((fname) => fname.includes(".js"))
-          );
-          for (const file of entryChunkFiles) {
-            const asset = compilation.assets[file];
-            if (!asset) {
-              continue;
-            }
-            const newContent = `${injectedContent}${asset.source().toString()}`;
-            newAssetsMap.set(path.join(outputPath, file), newContent);
-            compilation.updateAsset(
-              file,
-              new RawSource(newContent),
-              // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
-              void 0
-            );
+        const entrypointsArray = Array.from(compilation.entrypoints.entries());
+        const entryChunkIds = entrypointsArray.map((entrypoint) => entrypoint[0]);
+        const entryChunks = [
+          ...chunks
+        ].filter((chunk) => {
+          var _chunk_names;
+          return (_chunk_names = chunk.names) === null || _chunk_names === void 0 ? void 0 : _chunk_names.some((name) => entryChunkIds.includes(name));
+        });
+        const entryChunkFiles = entryChunks.map((chunk) => [
+          ...chunk.files || []
+        ].find((fname) => fname.includes(".js")));
+        for (const file of entryChunkFiles) {
+          const asset = compilation.assets[file];
+          if (!asset) {
+            continue;
           }
-          const filename = path.join(outputPath, ROUTE_MANIFEST_FILE);
-          await fs.ensureFile(filename);
-          await fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+          const newContent = `${injectedContent}${asset.source().toString()}`;
+          newAssetsMap.set(path.join(outputPath, file), newContent);
+          compilation.updateAsset(
+            file,
+            new RawSource(newContent),
+            // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+            void 0
+          );
         }
-      );
+        const filename = path.join(outputPath, ROUTE_MANIFEST_FILE);
+        await fs.ensureFile(filename);
+        await fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+      });
     });
   }
 }
-export {
-  RouterPlugin
-};

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

@@ -1,9 +1,6 @@
 import path from "path";
-function createCopyInfo(appContext, config) {
-  const configDir = path.resolve(
-    appContext.appDirectory,
-    config.source.configDir || "./config"
-  );
+export function createCopyInfo(appContext, config) {
+  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");
   return {
@@ -12,6 +9,3 @@ function createCopyInfo(appContext, config) {
     publicDir
   };
 }
-export {
-  createCopyInfo
-};

package/dist/esm-node/builder/shared/loaders/serverModuleLoader.js

@@ -1,7 +1,4 @@
 function loader() {
   return `module.exports = {}`;
 }
-var serverModuleLoader_default = loader;
-export {
-  serverModuleLoader_default as default
-};
+export default loader;

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

@@ -0,0 +1 @@
+export {};

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

@@ -2,8 +2,8 @@ import { ResolvedConfigContext } from "@modern-js/core";
 import { logger, printBuildError } from "@modern-js/utils";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
-const build = async (api, options) => {
-  if (options == null ? void 0 : options.analyze) {
+export const build = async (api, options) => {
+  if (options === null || options === void 0 ? void 0 : options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
   let resolvedConfig = api.useResolvedConfigContext();
@@ -28,7 +28,10 @@ const build = async (api, options) => {
     });
     return;
   }
-  resolvedConfig = { ...resolvedConfig, cliOptions: options };
+  resolvedConfig = {
+    ...resolvedConfig,
+    cliOptions: options
+  };
   ResolvedConfigContext.set(resolvedConfig);
   const { distDirectory, appDirectory, serverConfigFile } = appContext;
   await buildServerConfig({
@@ -39,9 +42,7 @@ const build = async (api, options) => {
   try {
     logger.info("Create a production build...\n");
     if (!appContext.builder) {
-      throw new Error(
-        "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
-      );
+      throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
     }
     await appContext.builder.build();
   } catch (error) {
@@ -49,6 +50,3 @@ const build = async (api, options) => {
     process.exit(1);
   }
 };
-export {
-  build
-};

package/dist/esm-node/commands/deploy.js

@@ -1,8 +1,5 @@
-const deploy = async (api, options) => {
+export const deploy = async (api, options) => {
   const hookRunners = api.useHookRunners();
   await hookRunners.beforeDeploy(options);
   await hookRunners.afterDeploy(options);
 };
-export {
-  deploy
-};

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

@@ -1,23 +1,22 @@
 import { ResolvedConfigContext } from "@modern-js/core";
 import { DEFAULT_DEV_HOST } from "@modern-js/utils";
 import { printInstructions } from "../utils/printInstructions";
-import {
-  setServer,
-  createServer,
-  injectDataLoaderPlugin
-} from "../utils/createServer";
+import { setServer, createServer, injectDataLoaderPlugin } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
-const dev = async (api, options) => {
-  var _a, _b;
+export const dev = async (api, options) => {
+  var _normalizedConfig_tools;
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
   let normalizedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  normalizedConfig = { ...normalizedConfig, cliOptions: options };
+  normalizedConfig = {
+    ...normalizedConfig,
+    cliOptions: options
+  };
   ResolvedConfigContext.set(normalizedConfig);
   const { appDirectory, distDirectory, port, apiOnly, serverConfigFile } = appContext;
   await buildServerConfig({
@@ -32,9 +31,7 @@ const dev = async (api, options) => {
   });
   await hookRunners.beforeDev();
   if (!appContext.builder && !apiOnly) {
-    throw new Error(
-      "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
-    );
+    throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
   await generateRoutes(appContext);
   const serverInternalPlugins = await getServerInternalPlugins(api);
@@ -43,7 +40,7 @@ const dev = async (api, options) => {
       port,
       https: normalizedConfig.dev.https,
       host: normalizedConfig.dev.host,
-      ...(_a = normalizedConfig.tools) == null ? void 0 : _a.devServer
+      ...(_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer
     },
     appContext: {
       appDirectory: appContext.appDirectory,
@@ -57,23 +54,21 @@ const dev = async (api, options) => {
     internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
   };
   if (apiOnly) {
+    var _normalizedConfig_dev;
     const app = await createServer({
       ...serverOptions,
       compiler: null
     });
-    const host = ((_b = normalizedConfig.dev) == null ? void 0 : _b.host) || DEFAULT_DEV_HOST;
-    app.listen(
-      {
-        port,
-        host
-      },
-      async (err) => {
-        if (err) {
-          throw err;
-        }
-        printInstructions(hookRunners, appContext, normalizedConfig);
+    const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
+    app.listen({
+      port,
+      host
+    }, async (err) => {
+      if (err) {
+        throw err;
       }
-    );
+      printInstructions(hookRunners, appContext, normalizedConfig);
+    });
   } else {
     const { server } = await appContext.builder.startDevServer({
       printURLs: false,
@@ -82,6 +77,3 @@ const dev = async (api, options) => {
     setServer(server);
   }
 };
-export {
-  dev
-};

package/dist/esm-node/commands/inspect.js

@@ -1,18 +1,13 @@
 import { join } from "path";
-const inspect = async (api, options) => {
+export const inspect = async (api, options) => {
   const appContext = api.useAppContext();
   if (!appContext.builder) {
-    throw new Error(
-      "Expect the Builder to have been initialized, But the appContext.builder received `undefined`"
-    );
+    throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
   return appContext.builder.inspectConfig({
     env: options.env,
     verbose: options.verbose,
-    outputPath: join(appContext == null ? void 0 : appContext.builder.context.distPath, options.output),
+    outputPath: join(appContext === null || appContext === void 0 ? void 0 : appContext.builder.context.distPath, options.output),
     writeToDisk: true
   });
 };
-export {
-  inspect
-};

package/dist/esm-node/commands/serve.js

@@ -3,17 +3,14 @@ import server from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
 import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
-const start = async (api) => {
-  var _a, _b;
+export const start = async (api) => {
+  var _userConfig_source, _userConfig_output_distPath;
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
   const { appDirectory, port, serverConfigFile } = appContext;
   logger.log(chalk.cyan(`Starting the modern server...`));
-  const apiOnly = await isApiOnly(
-    appContext.appDirectory,
-    (_a = userConfig == null ? void 0 : userConfig.source) == null ? void 0 : _a.entriesDir
-  );
+  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 serverInternalPlugins = await getServerInternalPlugins(api);
   const app = await server({
     pwd: appDirectory,
@@ -21,26 +18,14 @@ const start = async (api) => {
       ...userConfig,
       dev: userConfig.dev,
       output: {
-        path: (_b = userConfig.output.distPath) == null ? void 0 : _b.root,
+        path: (_userConfig_output_distPath = userConfig.output.distPath) === null || _userConfig_output_distPath === void 0 ? void 0 : _userConfig_output_distPath.root,
         ...userConfig.output || {}
       }
     },
     appContext: {
-      sharedDirectory: getTargetDir(
-        appContext.sharedDirectory,
-        appContext.appDirectory,
-        appContext.distDirectory
-      ),
-      apiDirectory: getTargetDir(
-        appContext.apiDirectory,
-        appContext.appDirectory,
-        appContext.distDirectory
-      ),
-      lambdaDirectory: getTargetDir(
-        appContext.lambdaDirectory,
-        appContext.appDirectory,
-        appContext.distDirectory
-      )
+      sharedDirectory: getTargetDir(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
+      apiDirectory: getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
+      lambdaDirectory: getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
     },
     serverConfigFile,
     internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
@@ -53,6 +38,3 @@ const start = async (api) => {
     await printInstructions(hookRunners, appContext, userConfig);
   });
 };
-export {
-  start
-};

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

@@ -1,6 +1,6 @@
 import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
 import { getAutoInjectEnv } from "../utils/env";
-function createDefaultConfig(appContext, bundler) {
+export function createDefaultConfig(appContext, bundler) {
   const defaultBuilderConfig = createDefaultBuilderConfig();
   const dev = {
     ...defaultBuilderConfig.dev,
@@ -31,9 +31,14 @@ function createDefaultConfig(appContext, bundler) {
     ...defaultBuilderConfig.html,
     title: "",
     meta: {
-      charset: { charset: "utf-8" },
+      charset: {
+        charset: "utf-8"
+      },
       viewport: "width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no",
-      "http-equiv": { "http-equiv": "x-ua-compatible", content: "ie=edge" },
+      "http-equiv": {
+        "http-equiv": "x-ua-compatible",
+        content: "ie=edge"
+      },
       renderer: "webkit",
       layoutmode: "standard",
       imagemode: "force",
@@ -65,7 +70,7 @@ function createDefaultConfig(appContext, bundler) {
     runtimeByEntries: {}
   };
 }
-function createLegacyDefaultConfig(appContext) {
+export function createLegacyDefaultConfig(appContext) {
   const defaultAlias = appContext ? {
     [appContext.internalDirAlias]: appContext.internalDirectory,
     [appContext.internalSrcAlias]: appContext.srcDirectory,
@@ -95,9 +100,14 @@ function createLegacyDefaultConfig(appContext) {
     title: "",
     titleByEntries: void 0,
     meta: {
-      charset: { charset: "utf-8" },
+      charset: {
+        charset: "utf-8"
+      },
       viewport: "width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no",
-      "http-equiv": { "http-equiv": "x-ua-compatible", content: "ie=edge" },
+      "http-equiv": {
+        "http-equiv": "x-ua-compatible",
+        content: "ie=edge"
+      },
       renderer: "webkit",
       layoutmode: "standard",
       imagemode: "force",
@@ -138,7 +148,10 @@ function createLegacyDefaultConfig(appContext) {
     baseUrl: "/",
     port: 8080
   };
-  const devDefaults = { assetPrefix: false, https: false };
+  const devDefaults = {
+    assetPrefix: false,
+    https: false
+  };
   const toolsDefaults = {
     webpack: void 0,
     babel: void 0,
@@ -160,7 +173,3 @@ function createLegacyDefaultConfig(appContext) {
     runtimeByEntries: {}
   };
 }
-export {
-  createDefaultConfig,
-  createLegacyDefaultConfig
-};

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

@@ -1,5 +1,5 @@
 import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
-function initialNormalizedConfig(config, appContext, bundler) {
+export function initialNormalizedConfig(config, appContext, bundler) {
   initHtmlConfig(config, appContext);
   initSourceConfig(config, appContext, bundler);
   if (bundler === "webpack") {
@@ -7,6 +7,3 @@ function initialNormalizedConfig(config, appContext, bundler) {
   }
   return config;
 }
-export {
-  initialNormalizedConfig
-};