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

package/dist/js/modern/config/default.js

@@ -1,31 +1,31 @@
-export function createDefaultConfig(appContext) {
+function createDefaultConfig(appContext) {
   const defaultAlias = appContext ? {
     [appContext.internalDirAlias]: appContext.internalDirectory,
     [appContext.internalSrcAlias]: appContext.srcDirectory,
-    '@': appContext.srcDirectory,
-    '@shared': appContext.sharedDirectory
+    "@": appContext.srcDirectory,
+    "@shared": appContext.sharedDirectory
   } : {};
   const source = {
-    entries: undefined,
+    entries: void 0,
     enableAsyncEntry: false,
     disableDefaultEntries: false,
-    entriesDir: './src',
-    configDir: './config',
-    globalVars: undefined,
-    moduleScopes: undefined,
+    entriesDir: "./src",
+    configDir: "./config",
+    globalVars: void 0,
+    moduleScopes: void 0,
     include: [],
     alias: defaultAlias
   };
   const output = {
-    assetPrefix: '/',
+    assetPrefix: "/",
     distPath: {
-      html: 'html',
-      js: 'static/js',
-      css: 'static/css',
-      media: 'static/media',
-      root: 'dist'
+      html: "html",
+      js: "static/js",
+      css: "static/css",
+      media: "static/media",
+      root: "dist"
     },
-    copy: undefined,
+    copy: void 0,
     disableCssModuleExtension: false,
     enableCssModuleTSDeclaration: false,
     disableMinimize: false,
@@ -35,43 +35,38 @@ export function createDefaultConfig(appContext) {
     disableInlineRuntimeChunk: false,
     disableFilenameHash: false,
     enableLatestDecorators: false,
-    polyfill: 'entry',
-    cssModuleLocalIdentName: undefined
+    polyfill: "entry",
+    cssModuleLocalIdentName: void 0
   };
   const html = {
-    title: '',
-    titleByEntries: undefined,
+    title: "",
+    titleByEntries: void 0,
     meta: {
-      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'
-      },
-      renderer: 'webkit',
-      layoutmode: 'standard',
-      imagemode: 'force',
-      'wap-font-scale': 'no',
-      'format-detection': 'telephone=no'
+      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" },
+      renderer: "webkit",
+      layoutmode: "standard",
+      imagemode: "force",
+      "wap-font-scale": "no",
+      "format-detection": "telephone=no"
     },
-    metaByEntries: undefined,
-    inject: 'head',
-    injectByEntries: undefined,
-    mountId: 'root',
-    favicon: '',
-    faviconByEntries: undefined,
+    metaByEntries: void 0,
+    inject: "head",
+    injectByEntries: void 0,
+    mountId: "root",
+    favicon: "",
+    faviconByEntries: void 0,
     disableHtmlFolder: false,
     templateParameters: {},
-    templateParametersByEntries: undefined
+    templateParametersByEntries: void 0
   };
   const server = {
-    routes: undefined,
-    publicRoutes: undefined,
-    ssr: undefined,
-    ssrByEntries: undefined,
-    baseUrl: '/',
+    routes: void 0,
+    publicRoutes: void 0,
+    ssr: void 0,
+    ssrByEntries: void 0,
+    baseUrl: "/",
     port: 8080
   };
   const dev = {
@@ -79,14 +74,14 @@ export function createDefaultConfig(appContext) {
     https: false
   };
   const tools = {
-    webpack: undefined,
-    babel: undefined,
-    postcss: undefined,
-    autoprefixer: undefined,
-    devServer: undefined,
-    tsLoader: undefined,
-    terser: undefined,
-    minifyCss: undefined
+    webpack: void 0,
+    babel: void 0,
+    postcss: void 0,
+    autoprefixer: void 0,
+    devServer: void 0,
+    tsLoader: void 0,
+    terser: void 0,
+    minifyCss: void 0
   };
   return {
     source,
@@ -100,57 +95,52 @@ export function createDefaultConfig(appContext) {
     runtimeByEntries: {}
   };
 }
-export function createLegacyDefaultConfig(appContext) {
+function createLegacyDefaultConfig(appContext) {
   const defaultAlias = appContext ? {
     [appContext.internalDirAlias]: appContext.internalDirectory,
     [appContext.internalSrcAlias]: appContext.srcDirectory,
-    '@': appContext.srcDirectory,
-    '@shared': appContext.sharedDirectory
+    "@": appContext.srcDirectory,
+    "@shared": appContext.sharedDirectory
   } : {};
   const sourceDefaults = {
-    entries: undefined,
+    entries: void 0,
     enableAsyncEntry: false,
     disableDefaultEntries: false,
-    entriesDir: './src',
-    configDir: './config',
-    apiDir: './api',
+    entriesDir: "./src",
+    configDir: "./config",
+    apiDir: "./api",
     envVars: [],
-    globalVars: undefined,
+    globalVars: void 0,
     alias: defaultAlias,
-    moduleScopes: undefined,
+    moduleScopes: void 0,
     include: []
   };
   const outputDefaults = {
-    assetPrefix: '/',
-    htmlPath: 'html',
-    jsPath: 'static/js',
-    cssPath: 'static/css',
-    mediaPath: 'static/media',
-    path: 'dist',
-    title: '',
-    titleByEntries: undefined,
+    assetPrefix: "/",
+    htmlPath: "html",
+    jsPath: "static/js",
+    cssPath: "static/css",
+    mediaPath: "static/media",
+    path: "dist",
+    title: "",
+    titleByEntries: void 0,
     meta: {
-      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'
-      },
-      renderer: 'webkit',
-      layoutmode: 'standard',
-      imagemode: 'force',
-      'wap-font-scale': 'no',
-      'format-detection': 'telephone=no'
+      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" },
+      renderer: "webkit",
+      layoutmode: "standard",
+      imagemode: "force",
+      "wap-font-scale": "no",
+      "format-detection": "telephone=no"
     },
-    metaByEntries: undefined,
-    inject: 'head',
-    injectByEntries: undefined,
-    mountId: 'root',
-    favicon: '',
-    faviconByEntries: undefined,
-    copy: undefined,
+    metaByEntries: void 0,
+    inject: "head",
+    injectByEntries: void 0,
+    mountId: "root",
+    favicon: "",
+    faviconByEntries: void 0,
+    copy: void 0,
     disableHtmlFolder: false,
     disableCssModuleExtension: false,
     disableCssExtract: false,
@@ -162,37 +152,33 @@ export function createLegacyDefaultConfig(appContext) {
     disableInlineRuntimeChunk: false,
     disableAssetsCache: false,
     enableLatestDecorators: false,
-    polyfill: 'entry',
-    dataUriLimit: 10000,
+    polyfill: "entry",
+    dataUriLimit: 1e4,
     templateParameters: {},
-    templateParametersByEntries: undefined,
-    cssModuleLocalIdentName: undefined,
-    enableModernMode: false,
+    templateParametersByEntries: void 0,
+    cssModuleLocalIdentName: void 0,
     disableNodePolyfill: false,
     enableTsLoader: false
   };
   const serverDefaults = {
-    routes: undefined,
-    publicRoutes: undefined,
-    ssr: undefined,
-    ssrByEntries: undefined,
-    baseUrl: '/',
+    routes: void 0,
+    publicRoutes: void 0,
+    ssr: void 0,
+    ssrByEntries: void 0,
+    baseUrl: "/",
     port: 8080
   };
-  const devDefaults = {
-    assetPrefix: false,
-    https: false
-  };
+  const devDefaults = { assetPrefix: false, https: false };
   const toolsDefaults = {
-    webpack: undefined,
-    babel: undefined,
-    postcss: undefined,
-    autoprefixer: undefined,
-    lodash: undefined,
-    devServer: undefined,
-    tsLoader: undefined,
-    terser: undefined,
-    minifyCss: undefined
+    webpack: void 0,
+    babel: void 0,
+    postcss: void 0,
+    autoprefixer: void 0,
+    lodash: void 0,
+    devServer: void 0,
+    tsLoader: void 0,
+    terser: void 0,
+    minifyCss: void 0
   };
   return {
     source: sourceDefaults,
@@ -203,4 +189,8 @@ export function createLegacyDefaultConfig(appContext) {
     runtime: {},
     runtimeByEntries: {}
   };
-}
+}
+export {
+  createDefaultConfig,
+  createLegacyDefaultConfig
+};

package/dist/js/modern/config/index.js

@@ -1,2 +1,8 @@
-export { createDefaultConfig, createLegacyDefaultConfig } from "./default";
-export { initialNormalizedConfig, checkIsLegacyConfig } from "./initial";
+import { createDefaultConfig, createLegacyDefaultConfig } from "./default";
+import { initialNormalizedConfig, checkIsLegacyConfig } from "./initial";
+export {
+  checkIsLegacyConfig,
+  createDefaultConfig,
+  createLegacyDefaultConfig,
+  initialNormalizedConfig
+};

package/dist/js/modern/config/initial/createHtmlConfig.js

@@ -1,4 +1,4 @@
-export function createHtmlConfig(config) {
+function createHtmlConfig(config) {
   const {
     disableHtmlFolder,
     favicon,
@@ -29,4 +29,7 @@ export function createHtmlConfig(config) {
     templateParameters,
     templateParametersByEntries
   };
-}
+}
+export {
+  createHtmlConfig
+};

package/dist/js/modern/config/initial/createOutputConfig.js

@@ -1,4 +1,4 @@
-export function createOutputConfig(config) {
+function createOutputConfig(config) {
   const {
     assetPrefix,
     copy,
@@ -23,7 +23,6 @@ export function createOutputConfig(config) {
     enableLatestDecorators,
     disableCssModuleExtension,
     ssg,
-    enableModernMode,
     disableNodePolyfill
   } = config.output;
   return {
@@ -34,11 +33,10 @@ export function createOutputConfig(config) {
       css: cssPath,
       js: jsPath,
       html: htmlPath,
-      // `@modern-js/webpack` output all media files to `dist/media` by default
-      svg: mediaPath || 'media',
-      image: mediaPath || 'media',
-      font: mediaPath || 'media',
-      media: mediaPath || 'media'
+      svg: mediaPath || "media",
+      image: mediaPath || "media",
+      font: mediaPath || "media",
+      media: mediaPath || "media"
     },
     dataUriLimit: {
       svg: dataUriLimit,
@@ -62,10 +60,11 @@ export function createOutputConfig(config) {
       css: cssModuleLocalIdentName
     },
     ssg,
-    // set `true`, only in legacy config
     enableAssetFallback: true,
     enableAssetManifest: true,
-    enableModernMode,
     disableNodePolyfill
   };
-}
+}
+export {
+  createOutputConfig
+};

package/dist/js/modern/config/initial/createSourceConfig.js

@@ -1,4 +1,4 @@
-export function createSourceConfig(config) {
+function createSourceConfig(config) {
   const {
     alias,
     envVars,
@@ -29,4 +29,7 @@ export function createSourceConfig(config) {
     entriesDir,
     configDir
   };
-}
+}
+export {
+  createSourceConfig
+};

package/dist/js/modern/config/initial/createToolsConfig.js

@@ -1,4 +1,4 @@
-export function createToolsConfig(config) {
+function createToolsConfig(config) {
   const {
     autoprefixer,
     babel,
@@ -17,11 +17,9 @@ export function createToolsConfig(config) {
     jest,
     esbuild
   } = config.tools;
-  const {
-    enableTsLoader
-  } = config.output;
+  const { enableTsLoader } = config.output;
   return {
-    tsLoader: enableTsLoader ? tsLoader : undefined,
+    tsLoader: enableTsLoader ? tsLoader : void 0,
     autoprefixer,
     babel,
     minifyCss,
@@ -38,4 +36,7 @@ export function createToolsConfig(config) {
     jest,
     esbuild
   };
-}
+}
+export {
+  createToolsConfig
+};

package/dist/js/modern/config/initial/index.js

@@ -1,11 +1,16 @@
 import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
-export { transformNormalizedConfig } from "./transformNormalizedConfig";
-export function checkIsLegacyConfig(config) {
+import { transformNormalizedConfig } from "./transformNormalizedConfig";
+function checkIsLegacyConfig(config) {
   return Boolean(config.legacy);
 }
-export function initialNormalizedConfig(config, appContext) {
+function initialNormalizedConfig(config, appContext) {
   initHtmlConfig(config, appContext);
   initSourceConfig(config, appContext);
   initToolsConfig(config);
   return config;
-}
+}
+export {
+  checkIsLegacyConfig,
+  initialNormalizedConfig,
+  transformNormalizedConfig
+};

package/dist/js/modern/config/initial/inits.js

@@ -1,69 +1,100 @@
-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; }
-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 path, { dirname, isAbsolute, posix, sep } from 'path';
-import { applyOptionsChain, findExists, findMonorepoRoot, globby, isModernjsMonorepo } from '@modern-js/utils';
-export function initHtmlConfig(config, appContext) {
-  const ICON_EXTENSIONS = ['png', 'jpg', 'jpeg', 'svg', 'ico'];
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import path, { dirname, isAbsolute, posix, sep } from "path";
+import {
+  applyOptionsChain,
+  findExists,
+  findMonorepoRoot,
+  globby,
+  isModernjsMonorepo
+} from "@modern-js/utils";
+function initHtmlConfig(config, appContext) {
+  const ICON_EXTENSIONS = ["png", "jpg", "jpeg", "svg", "ico"];
   config.html.appIcon = createBuilderAppIcon(config, appContext);
   config.html.favicon = createBuilderFavicon(config, appContext);
   return config.html;
-  function createBuilderAppIcon(config, appContext) {
-    const {
-      configDir
-    } = config.source;
-    const appIcon = findExists(ICON_EXTENSIONS.map(ext => path.resolve(appContext.appDirectory, configDir || './config', `icon.${ext}`)));
-    return typeof appIcon === 'string' ? appIcon : undefined;
+  function createBuilderAppIcon(config2, appContext2) {
+    const { configDir } = config2.source;
+    const appIcon = findExists(
+      ICON_EXTENSIONS.map(
+        (ext) => path.resolve(
+          appContext2.appDirectory,
+          configDir || "./config",
+          `icon.${ext}`
+        )
+      )
+    );
+    return typeof appIcon === "string" ? appIcon : void 0;
   }
-  function createBuilderFavicon(config, appContext) {
-    const {
-      configDir
-    } = config.source;
-    const {
-      favicon
-    } = config.html;
-    const defaultFavicon = findExists(ICON_EXTENSIONS.map(ext => path.resolve(appContext.appDirectory, configDir || './config', `favicon.${ext}`)));
-    return favicon || defaultFavicon || undefined;
+  function createBuilderFavicon(config2, appContext2) {
+    const { configDir } = config2.source;
+    const { favicon } = config2.html;
+    const defaultFavicon = findExists(
+      ICON_EXTENSIONS.map(
+        (ext) => path.resolve(
+          appContext2.appDirectory,
+          configDir || "./config",
+          `favicon.${ext}`
+        )
+      )
+    );
+    return favicon || defaultFavicon || void 0;
   }
 }
-export function initSourceConfig(config, appContext) {
+function initSourceConfig(config, appContext) {
   config.source.include = createBuilderInclude(config, appContext);
   config.source.moduleScopes = createBuilderModuleScope(config);
-  function createBuilderInclude(config, appContext) {
-    const {
-      include
-    } = config.source;
-    const defaultInclude = [appContext.internalDirectory];
-    const transformInclude = (include || []).map(include => {
-      if (typeof include === 'string') {
-        if (isAbsolute(include)) {
-          return include;
+  function createBuilderInclude(config2, appContext2) {
+    const { include } = config2.source;
+    const defaultInclude = [appContext2.internalDirectory];
+    const transformInclude = (include || []).map((include2) => {
+      if (typeof include2 === "string") {
+        if (isAbsolute(include2)) {
+          return include2;
         }
-        return new RegExp(include);
+        return new RegExp(include2);
       }
-      return include;
-    }).concat(defaultInclude); // concat default Include
-
-    const root = findMonorepoRoot(appContext.appDirectory);
+      return include2;
+    }).concat(defaultInclude);
+    const root = findMonorepoRoot(appContext2.appDirectory);
     if (!root) {
       return transformInclude;
     }
     const modernjsMonorepo = isModernjsMonorepo(root);
     if (modernjsMonorepo) {
-      const paths = globby.sync(posix.join(root, 'features', '**', 'package.json'), {
-        ignore: ['**/node_modules/**/*']
-      }).map(pathname => dirname(pathname) + sep);
+      const paths = globby.sync(posix.join(root, "features", "**", "package.json"), {
+        ignore: ["**/node_modules/**/*"]
+      }).map((pathname) => dirname(pathname) + sep);
       return [...paths, ...transformInclude];
     }
     return transformInclude;
   }
-  function createBuilderModuleScope(config) {
-    const {
-      moduleScopes
-    } = config.source;
+  function createBuilderModuleScope(config2) {
+    const { moduleScopes } = config2.source;
     if (moduleScopes) {
       let builderModuleScope = [];
-      const DEFAULT_SCOPES = ['./src', './shared', /node_modules/];
+      const DEFAULT_SCOPES = [
+        "./src",
+        "./shared",
+        /node_modules/
+      ];
       if (Array.isArray(moduleScopes)) {
         if (isPrimitiveScope(moduleScopes)) {
           builderModuleScope = DEFAULT_SCOPES.concat(moduleScopes);
@@ -75,43 +106,48 @@ export function initSourceConfig(config, appContext) {
       }
       return builderModuleScope;
     } else {
-      return undefined;
+      return void 0;
     }
     function isPrimitiveScope(items) {
-      return items.every(item => typeof item === 'string' || Object.prototype.toString.call(item) === '[object RegExp]');
+      return items.every(
+        (item) => typeof item === "string" || Object.prototype.toString.call(item) === "[object RegExp]"
+      );
     }
   }
 }
-export function initToolsConfig(config) {
+function initToolsConfig(config) {
   const defaultTsChecker = {
     issue: {
-      include: [{
-        file: '**/src/**/*'
-      }],
-      exclude: [{
-        file: '**/*.(spec|test).ts'
-      }, {
-        file: '**/node_modules/**/*'
-      }]
+      include: [{ file: "**/src/**/*" }],
+      exclude: [
+        { file: "**/*.(spec|test).ts" },
+        { file: "**/node_modules/**/*" }
+      ]
     }
   };
-  const {
-    tsChecker,
-    tsLoader,
-    htmlPlugin
-  } = config.tools;
+  const { tsChecker, tsLoader, htmlPlugin } = config.tools;
   config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
   tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
-    applyOptionsChain(_objectSpread(_objectSpread({}, tsLoaderConfig), {}, {
-      transpileOnly: false,
-      allowTsInNodeModules: true
-    }), tsLoader || {}, utils);
+    applyOptionsChain(
+      __spreadProps(__spreadValues({}, tsLoaderConfig), {
+        transpileOnly: false,
+        allowTsInNodeModules: true
+      }),
+      tsLoader || {},
+      utils
+    );
   });
-  config.tools.htmlPlugin = [config => _objectSpread(_objectSpread({}, config), {}, {
-    minify: typeof config.minify === 'object' ? _objectSpread(_objectSpread({}, config.minify), {}, {
-      removeComments: false
-    }) : config.minify
-  }),
-  // eslint-disable-next-line no-nested-ternary
-  ...(Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [htmlPlugin] : [])];
-}
+  config.tools.htmlPlugin = [
+    (config2) => __spreadProps(__spreadValues({}, config2), {
+      minify: typeof config2.minify === "object" ? __spreadProps(__spreadValues({}, config2.minify), {
+        removeComments: false
+      }) : config2.minify
+    }),
+    ...Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [htmlPlugin] : []
+  ];
+}
+export {
+  initHtmlConfig,
+  initSourceConfig,
+  initToolsConfig
+};