@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-beta.4

package/dist/js/node/builder/loaders/routerLoader.js

@@ -1,27 +1,36 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  default: () => routerLoader_default
 });
-exports.default = void 0;
+module.exports = __toCommonJS(stdin_exports);
+var import_utils = require("@modern-js/utils");
 function loader(source) {
-  // eslint-disable-next-line @babel/no-invalid-this
   this.cacheable();
-  // eslint-disable-next-line @babel/no-invalid-this
-  const {
-    target
-  } = this._compiler.options;
-  if (target === 'node' || Array.isArray(target) && target.includes('node')) {
+  const { target } = this._compiler.options;
+  if (target === "node" || Array.isArray(target) && target.includes("node")) {
     return source;
   }
-  // eslint-disable-next-line @babel/no-invalid-this
-  const {
-    resourcePath
-  } = this;
+  const { resourcePath } = this;
   const code = `
-    export { default } from "${resourcePath}";
+    export { default } from "${(0, import_utils.slash)(resourcePath)}";
   `;
   return code;
 }
-var _default = loader;
-exports.default = _default;
+var routerLoader_default = loader;

package/dist/js/node/builder/loaders/serverModuleLoader.js

@@ -1,11 +1,26 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  default: () => serverModuleLoader_default
 });
-exports.default = void 0;
+module.exports = __toCommonJS(stdin_exports);
 function loader() {
   return `module.exports = {}`;
 }
-var _default = loader;
-exports.default = _default;
+var serverModuleLoader_default = loader;

package/dist/js/node/builder/share.js

@@ -1,51 +1,71 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  createCopyPattern: () => createCopyPattern
 });
-exports.createCopyPattern = createCopyPattern;
-var _path = _interopRequireDefault(require("path"));
-var _lodash = require("@modern-js/utils/lodash");
-var _utils = require("@modern-js/utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
 function createCopyPattern(appContext, config, patternsType, chain) {
-  const configDir = _path.default.resolve(appContext.appDirectory, config.source.configDir || './config');
-  const uploadDir = _path.default.posix.join(configDir.replace(/\\/g, '/'), 'upload');
-  const publicDir = _path.default.posix.join(configDir.replace(/\\/g, '/'), 'public');
+  const configDir = import_path.default.resolve(
+    appContext.appDirectory,
+    config.source.configDir || "./config"
+  );
+  const uploadDir = import_path.default.posix.join(configDir.replace(/\\/g, "/"), "upload");
+  const publicDir = import_path.default.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
+  const info = (file) => ({
     minimized: minifiedJsRexExp.test(file.sourceFilename)
   });
-  if (patternsType === 'public') {
+  if (patternsType === "public") {
     if (!chain) {
       throw new Error("expect get a webpackChain, but receive 'undefined'");
     }
     return {
       info,
-      from: '**/*',
-      to: 'public',
+      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 (0, _lodash.template)(content.toString('utf8'))({
-          assetPrefix: (0, _utils.removeTailSlash)(chain.output.get('publicPath'))
-        });
+        return content.toString("utf8").replace(
+          /<%=\s*assetPrefix\s*%>/g,
+          (0, import_utils.removeTailSlash)(chain.output.get("publicPath"))
+        );
       }
     };
   } else {
     return {
       info,
-      from: '**/*',
-      to: 'upload',
+      from: "**/*",
+      to: "upload",
       context: uploadDir,
       noErrorOnMissing: true
     };
   }
-}
+}

package/dist/js/node/builder/webpackPlugins/htmlAsyncChunkPlugin.js

@@ -1,36 +1,49 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  HtmlAsyncChunkPlugin: () => HtmlAsyncChunkPlugin
 });
-exports.HtmlAsyncChunkPlugin = void 0;
-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; }
+module.exports = __toCommonJS(stdin_exports);
 class HtmlAsyncChunkPlugin {
   constructor(htmlWebpackPlugin) {
-    _defineProperty(this, "name", void 0);
-    _defineProperty(this, "htmlWebpackPlugin", void 0);
-    this.name = 'HtmlAsyncChunkPlugin';
+    this.name = "HtmlAsyncChunkPlugin";
     this.htmlWebpackPlugin = htmlWebpackPlugin;
   }
   apply(compiler) {
-    compiler.hooks.compilation.tap(this.name, compilation => {
-      const hooks = this.htmlWebpackPlugin.getHooks(compilation);
-      hooks.alterAssetTagGroups.tap(this.name, assets => {
-        const tags = [...assets.headTags, ...assets.bodyTags];
-        for (const tag of tags) {
-          if (tag.tagName === 'script') {
-            const {
-              attributes
-            } = tag;
-            if (attributes && attributes.defer === true) {
-              attributes.async = true;
-              delete attributes.defer;
+    compiler.hooks.compilation.tap(
+      this.name,
+      (compilation) => {
+        const hooks = this.htmlWebpackPlugin.getHooks(compilation);
+        hooks.alterAssetTagGroups.tap(this.name, (assets) => {
+          const tags = [...assets.headTags, ...assets.bodyTags];
+          for (const tag of tags) {
+            if (tag.tagName === "script") {
+              const { attributes } = tag;
+              if (attributes && attributes.defer === true) {
+                attributes.async = true;
+                delete attributes.defer;
+              }
             }
           }
-        }
-        return assets;
-      });
-    });
+          return assets;
+        });
+      }
+    );
   }
 }
-exports.HtmlAsyncChunkPlugin = HtmlAsyncChunkPlugin;

package/dist/js/node/builder/webpackPlugins/htmlBottomTemplate.js

@@ -1,40 +1,56 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  BottomTemplatePlugin: () => BottomTemplatePlugin
 });
-exports.BottomTemplatePlugin = void 0;
-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; }
+module.exports = __toCommonJS(stdin_exports);
 class BottomTemplatePlugin {
   constructor(htmlWebpackPlugin) {
-    _defineProperty(this, "htmlWebpackPlugin", void 0);
-    _defineProperty(this, "bottomTemplateReg", /<!--<\?-\s*bottomTemplate\s*\?>-->/);
-    _defineProperty(this, "bodyRegExp", /(<\/\s*body\s*>)/i);
-    _defineProperty(this, "name", void 0);
+    this.bottomTemplateReg = /<!--<\?-\s*bottomTemplate\s*\?>-->/;
+    this.bodyRegExp = /(<\/\s*body\s*>)/i;
     this.htmlWebpackPlugin = htmlWebpackPlugin;
-    this.name = 'bottom-template';
+    this.name = "bottom-template";
   }
   apply(compiler) {
-    compiler.hooks.compilation.tap(this.name, compilation => {
-      this.htmlWebpackPlugin.getHooks(compilation).beforeEmit.tap(this.name, data => {
-        var _data$plugin$options;
-        if (!((_data$plugin$options = data.plugin.options) !== null && _data$plugin$options !== void 0 && _data$plugin$options.__internal__)) {
-          return data;
-        }
-        // 含有 <!--<?- bottomTemplate ?>--> 占位符时才需要注入 bottom.html
-        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 => `\n${bottomTemplate}\n${match}`);
+    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__)) {
+            return data;
           }
-        }
-        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) => `
+${bottomTemplate}
+${match}`
+              );
+            }
+          }
+          return data;
+        });
+      }
+    );
   }
 }
-exports.BottomTemplatePlugin = BottomTemplatePlugin;

package/dist/js/node/builder/webpackPlugins/routerPlugin.js

@@ -1,105 +1,133 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  default: () => RouterPlugin
 });
-exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
-const PLUGIN_NAME = 'ModernjsRoutePlugin';
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+const PLUGIN_NAME = "ModernjsRoutePlugin";
 class RouterPlugin {
-  constructor(options) {
-    _defineProperty(this, "existNestedRoutes", void 0);
-    this.existNestedRoutes = options.existNestedRoutes;
-  }
   apply(compiler) {
-    const {
-      existNestedRoutes
-    } = this;
-    const {
-      target
-    } = compiler.options;
-    if (target === 'node' || Array.isArray(target) && target.includes('node')) {
-      return;
-    }
-    if (!existNestedRoutes) {
+    const { target } = compiler.options;
+    if (target === "node" || Array.isArray(target) && target.includes("node")) {
       return;
     }
-    const {
-      webpack
-    } = compiler;
-    const {
-      Compilation,
-      sources
-    } = webpack;
-    const {
-      RawSource
-    } = sources;
-    const {
-      PROCESS_ASSETS_STAGE_REPORT
-    } = Compilation;
+    const { webpack } = compiler;
+    const { Compilation, sources } = webpack;
+    const { RawSource } = sources;
+    const { PROCESS_ASSETS_STAGE_REPORT } = Compilation;
     const outputPath = compiler.options.output.path;
-    const newAssetsMap = new Map();
-    const normalizePath = path => {
-      if (!path.endsWith('/')) {
-        return `${path}/`;
+    const newAssetsMap = /* @__PURE__ */ new Map();
+    const normalizePath = (path2) => {
+      if (!path2.endsWith("/")) {
+        return `${path2}/`;
       }
-      return path;
+      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({
-          chunkGroups: true,
-          chunks: true
-        });
-        const {
-          publicPath
-        } = stats;
-        const routeAssets = {};
-        const {
-          namedChunkGroups,
-          assetsByChunkName
-        } = stats;
-        if (!namedChunkGroups || !assetsByChunkName) {
-          _utils.logger.warn('Route manifest does not exist, performance will be affected');
-          return;
-        }
-        for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
-          routeAssets[name] = {
-            chunkIds: chunkGroup.chunks,
-            assets: assetsByChunkName[name].map(item => publicPath ? normalizePath(publicPath) + item : item)
+    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+      compilation.hooks.processAssets.tapPromise(
+        {
+          name: PLUGIN_NAME,
+          stage: PROCESS_ASSETS_STAGE_REPORT
+        },
+        () => __async(this, null, function* () {
+          const stats = compilation.getStats().toJson({
+            chunkGroups: true,
+            chunks: true
+          });
+          const { publicPath } = stats;
+          const routeAssets = {};
+          const { namedChunkGroups, assetsByChunkName } = stats;
+          if (!namedChunkGroups || !assetsByChunkName) {
+            import_utils.logger.warn(
+              "Route manifest does not exist, performance will be affected"
+            );
+            return;
+          }
+          for (const [name, chunkGroup] of Object.entries(namedChunkGroups)) {
+            if (assetsByChunkName[name]) {
+              routeAssets[name] = {
+                chunkIds: chunkGroup.chunks,
+                assets: assetsByChunkName[name].map(
+                  (item) => publicPath ? normalizePath(publicPath) + item : item
+                )
+              };
+            }
+          }
+          const manifest = {
+            routeAssets
           };
-        }
-        const manifest = {
-          routeAssets
-        };
-        const injectedContent = `
+          const injectedContent = `
             ;(function(){
-              window.${_utils.ROUTE_MANIFEST} = ${JSON.stringify(manifest)};
+              window.${import_utils.ROUTE_MANIFEST} = ${JSON.stringify(manifest)};
             })();
           `;
-        const entrypointsArray = Array.from(compilation.entrypoints.entries());
-        const entryChunkIds = entrypointsArray.map(entrypoint => entrypoint[0]);
-        const entryChunks = [...compilation.chunks].filter(chunk => {
-          return entryChunkIds.includes(chunk.name);
-        });
-        const entryChunkFiles = entryChunks.map(chunk => [...chunk.files][0]);
-        for (const file of entryChunkFiles) {
-          const asset = compilation.assets[file];
-          const newContent = `${injectedContent}${asset.source().toString()}`;
-          newAssetsMap.set(_path.default.join(outputPath, file), newContent);
-          compilation.updateAsset(file, new RawSource(newContent));
-        }
-        const filename = _path.default.join(outputPath, _utils.ROUTE_MINIFEST_FILE);
-        await _utils.fs.ensureFile(filename);
-        await _utils.fs.writeFile(filename, JSON.stringify(manifest, null, 2));
-      });
+          const entrypointsArray = Array.from(
+            compilation.entrypoints.entries()
+          );
+          const entryChunkIds = entrypointsArray.map(
+            (entrypoint) => entrypoint[0]
+          );
+          const entryChunks = [...compilation.chunks].filter((chunk) => {
+            return entryChunkIds.includes(chunk.name);
+          });
+          const entryChunkFiles = entryChunks.map(
+            (chunk) => [...chunk.files].find((fname) => fname.includes(".js"))
+          );
+          for (const file of entryChunkFiles) {
+            const asset = compilation.assets[file];
+            const newContent = `${injectedContent}${asset.source().toString()}`;
+            newAssetsMap.set(import_path.default.join(outputPath, file), newContent);
+            compilation.updateAsset(file, new RawSource(newContent));
+          }
+          const filename = import_path.default.join(outputPath, import_utils.ROUTE_MINIFEST_FILE);
+          yield import_utils.fs.ensureFile(filename);
+          yield import_utils.fs.writeFile(filename, JSON.stringify(manifest, null, 2));
+        })
+      );
     });
   }
 }
-exports.default = RouterPlugin;