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

package/dist/js/node/builder/createSourceConfig.js

@@ -1,82 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createBuilderInclude = createBuilderInclude;
-exports.createBuilderModuleScope = createBuilderModuleScope;
-exports.createSourceConfig = createSourceConfig;
-var _path = require("path");
-var _utils = require("@modern-js/utils");
-function createSourceConfig(normalizedConfig, appContext) {
-  const {
-    alias,
-    envVars,
-    globalVars,
-    include,
-    moduleScopes,
-    preEntry
-  } = normalizedConfig.source;
-  const builderGlobalVars = globalVars || {};
-  for (const envVar of envVars || []) {
-    const envVarValue = process.env[envVar];
-    envVarValue && (builderGlobalVars[`process.env.${envVar}`] = envVarValue);
-  }
-  const builderModuleScope = createBuilderModuleScope(moduleScopes);
-  const builderInclude = createBuilderInclude(include, appContext);
-  return {
-    alias: (0, _utils.mergeAlias)(alias),
-    moduleScopes: builderModuleScope,
-    globalVars: builderGlobalVars,
-    include: builderInclude,
-    preEntry,
-    // ensure resolve.extensions same as before
-    resolveExtensionPrefix: '.web'
-  };
-}
-function createBuilderInclude(include, appContext) {
-  const defaultInclude = [appContext.internalDirectory];
-  const transformInclude = (include || []).map(include => {
-    if (typeof include === 'string') {
-      if ((0, _path.isAbsolute)(include)) {
-        return include;
-      }
-      return new RegExp(include);
-    }
-    return include;
-  }).concat(defaultInclude); // concat default Include
-
-  const root = (0, _utils.findMonorepoRoot)(appContext.appDirectory);
-  if (!root) {
-    return transformInclude;
-  }
-  const modernjsMonorepo = (0, _utils.isModernjsMonorepo)(root);
-  if (modernjsMonorepo) {
-    const paths = _utils.globby.sync(_path.posix.join(root, 'features', '**', 'package.json'), {
-      ignore: ['**/node_modules/**/*']
-    }).map(pathname => (0, _path.dirname)(pathname) + _path.sep);
-    return [...paths, ...transformInclude];
-  }
-  return transformInclude;
-}
-function createBuilderModuleScope(moduleScopes) {
-  if (moduleScopes) {
-    let builderModuleScope = [];
-    const DEFAULT_SCOPES = ['./src', './shared', /node_modules/];
-    if (Array.isArray(moduleScopes)) {
-      if (isPrimitiveScope(moduleScopes)) {
-        builderModuleScope = DEFAULT_SCOPES.concat(moduleScopes);
-      } else {
-        builderModuleScope = [DEFAULT_SCOPES, ...moduleScopes];
-      }
-    } else {
-      builderModuleScope = [DEFAULT_SCOPES, moduleScopes];
-    }
-    return builderModuleScope;
-  } else {
-    return undefined;
-  }
-  function isPrimitiveScope(items) {
-    return items.every(item => typeof item === 'string' || Object.prototype.toString.call(item) === '[object RegExp]');
-  }
-}

package/dist/js/node/builder/createToolsConfig.js

@@ -1,94 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createBuilderTsChecker = createBuilderTsChecker;
-exports.createToolsConfig = createToolsConfig;
-var _utils = require("@modern-js/utils");
-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; }
-function createToolsConfig(normalizedConfig) {
-  const {
-    disableCssExtract,
-    enableTsLoader
-  } = normalizedConfig.output;
-  const {
-    autoprefixer,
-    babel,
-    minifyCss,
-    terser,
-    webpack,
-    webpackChain,
-    tsLoader,
-    styledComponents,
-    sass,
-    postcss,
-    less,
-    htmlPlugin,
-    // TODO: remove modernjs tools.lodash config
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    lodash
-  } = normalizedConfig.tools;
-  const builderTsLoader = createBuilderTsLoader(tsLoader, enableTsLoader);
-  const builderTsChecker = createBuilderTsChecker(normalizedConfig.output);
-  return {
-    tsChecker: builderTsChecker,
-    styleLoader: disableCssExtract ? {} : undefined,
-    cssExtract: disableCssExtract ? false : undefined,
-    autoprefixer,
-    babel,
-    minifyCss,
-    terser,
-    webpack,
-    webpackChain: webpackChain,
-    tsLoader: builderTsLoader,
-    styledComponents: styledComponents,
-    sass: sass,
-    postcss: postcss,
-    less: less,
-    // can't remove comment in html minify.
-    // some html template insert by using those comments.
-    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] : [])]
-  };
-}
-function createBuilderTsLoader(tsLoader, enableTsLoader) {
-  const useTsLoader = Boolean(enableTsLoader);
-  if (!useTsLoader) {
-    return undefined;
-  }
-  const defaultTsLoader = {
-    compilerOptions: {
-      target: 'es5',
-      module: 'ESNext'
-    },
-    transpileOnly: false,
-    allowTsInNodeModules: true
-  };
-  return (_, utils) => (0, _utils.applyOptionsChain)(defaultTsLoader, tsLoader, utils);
-}
-function createBuilderTsChecker(output) {
-  if (output.enableTsLoader) {
-    return false;
-  }
-  const defaultTsChecker = {
-    issue: {
-      include: [{
-        file: '**/src/**/*'
-      }],
-      exclude: [{
-        file: '**/*.(spec|test).ts'
-      }, {
-        file: '**/node_modules/**/*'
-      }]
-    }
-  };
-  return defaultTsChecker;
-}

package/dist/js/treeshaking/builder/createHtmlConfig.js

@@ -1,59 +0,0 @@
-import path from 'path';
-import { findExists } from '@modern-js/utils';
-export function createHtmlConfig(normalizedConfig, appContext) {
-  var _normalizedConfig$out = normalizedConfig.output,
-    disableHtmlFolder = _normalizedConfig$out.disableHtmlFolder,
-    favicon = _normalizedConfig$out.favicon,
-    faviconByEntries = _normalizedConfig$out.faviconByEntries,
-    inject = _normalizedConfig$out.inject,
-    injectByEntries = _normalizedConfig$out.injectByEntries,
-    meta = _normalizedConfig$out.meta,
-    metaByEntries = _normalizedConfig$out.metaByEntries,
-    mountId = _normalizedConfig$out.mountId,
-    title = _normalizedConfig$out.title,
-    titleByEntries = _normalizedConfig$out.titleByEntries,
-    scriptExt = _normalizedConfig$out.scriptExt,
-    templateParameters = _normalizedConfig$out.templateParameters,
-    templateParametersByEntries = _normalizedConfig$out.templateParametersByEntries;
-  var configDir = normalizedConfig.source.configDir;
-
-  // transform Modernjs `output.scriptExt` to Builder `html.crossorigin`  configuration
-  var builderCrossorigin = createBuilderCrossorigin(scriptExt);
-  var builderAppIcon = createBuilderAppIcon(configDir, appContext);
-  var builderFavicon = createBuilderFavicon(favicon, configDir, appContext);
-  return {
-    appIcon: builderAppIcon,
-    disableHtmlFolder: disableHtmlFolder,
-    favicon: builderFavicon,
-    faviconByEntries: faviconByEntries,
-    inject: inject,
-    injectByEntries: injectByEntries,
-    meta: meta,
-    metaByEntries: metaByEntries,
-    mountId: mountId,
-    title: title,
-    titleByEntries: titleByEntries,
-    crossorigin: builderCrossorigin,
-    templateByEntries: appContext.htmlTemplates,
-    templateParameters: templateParameters,
-    templateParametersByEntries: templateParametersByEntries
-  };
-}
-var ICON_EXTENSIONS = ['png', 'jpg', 'jpeg', 'svg', 'ico'];
-export function createBuilderAppIcon(configDir, appContext) {
-  var appIcon = findExists(ICON_EXTENSIONS.map(function (ext) {
-    return path.resolve(appContext.appDirectory, configDir, "icon.".concat(ext));
-  }));
-  return typeof appIcon === 'string' ? appIcon : undefined;
-}
-export function createBuilderCrossorigin(scriptExt) {
-  var _scriptExtCustomConfi;
-  var scriptExtCustomConfig = scriptExt === null || scriptExt === void 0 ? void 0 : scriptExt.custom;
-  return scriptExtCustomConfig !== null && scriptExtCustomConfig !== void 0 && (_scriptExtCustomConfi = scriptExtCustomConfig.test) !== null && _scriptExtCustomConfi !== void 0 && _scriptExtCustomConfi.test('.js') && (scriptExtCustomConfig === null || scriptExtCustomConfig === void 0 ? void 0 : scriptExtCustomConfig.attribute) === 'crossorigin' ? scriptExtCustomConfig.value : undefined;
-}
-export function createBuilderFavicon(favicon, configDir, appContext) {
-  var defaultFavicon = findExists(ICON_EXTENSIONS.map(function (ext) {
-    return path.resolve(appContext.appDirectory, configDir, "favicon.".concat(ext));
-  }));
-  return favicon || defaultFavicon || undefined;
-}

package/dist/js/treeshaking/builder/createOutputConfig.js

@@ -1,70 +0,0 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { createCopyPattern } from "./share";
-export function createOutputConfig(normalizedConfig, appContext) {
-  // TODO: add `externals` options in Modern.
-
-  var _normalizedConfig$out = normalizedConfig.output,
-    assetPrefix = _normalizedConfig$out.assetPrefix,
-    copy = _normalizedConfig$out.copy,
-    cssModuleLocalIdentName = _normalizedConfig$out.cssModuleLocalIdentName,
-    cssPath = _normalizedConfig$out.cssPath,
-    jsPath = _normalizedConfig$out.jsPath,
-    htmlPath = _normalizedConfig$out.htmlPath,
-    mediaPath = _normalizedConfig$out.mediaPath,
-    path = _normalizedConfig$out.path,
-    disableInlineRuntimeChunk = _normalizedConfig$out.disableInlineRuntimeChunk,
-    disableMinimize = _normalizedConfig$out.disableMinimize,
-    disableSourceMap = _normalizedConfig$out.disableSourceMap,
-    disableTsChecker = _normalizedConfig$out.disableTsChecker,
-    enableCssModuleTSDeclaration = _normalizedConfig$out.enableCssModuleTSDeclaration,
-    enableInlineScripts = _normalizedConfig$out.enableInlineScripts,
-    enableInlineStyles = _normalizedConfig$out.enableInlineStyles,
-    polyfill = _normalizedConfig$out.polyfill,
-    dataUriLimit = _normalizedConfig$out.dataUriLimit,
-    disableAssetsCache = _normalizedConfig$out.disableAssetsCache,
-    enableLatestDecorators = _normalizedConfig$out.enableLatestDecorators,
-    disableCssModuleExtension = _normalizedConfig$out.disableCssModuleExtension;
-  var defaultCopyPattern = createCopyPattern(appContext, normalizedConfig, 'upload');
-  var builderCopy = copy ? [].concat(_toConsumableArray(copy), [defaultCopyPattern]) : [defaultCopyPattern];
-  return {
-    assetPrefix: assetPrefix,
-    copy: builderCopy,
-    distPath: {
-      root: path,
-      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'
-    },
-    dataUriLimit: {
-      svg: dataUriLimit,
-      image: dataUriLimit,
-      font: dataUriLimit,
-      media: dataUriLimit
-    },
-    disableCssModuleExtension: disableCssModuleExtension,
-    disableInlineRuntimeChunk: disableInlineRuntimeChunk,
-    disableMinimize: disableMinimize,
-    disableSourceMap: disableSourceMap,
-    disableTsChecker: disableTsChecker,
-    enableCssModuleTSDeclaration: enableCssModuleTSDeclaration,
-    enableInlineScripts: enableInlineScripts,
-    enableInlineStyles: enableInlineStyles,
-    polyfill: polyfill,
-    // We need to do this in the app-tools prepare hook because some files will be generated into the dist directory in the analyze process
-    cleanDistPath: false,
-    disableFilenameHash: disableAssetsCache,
-    enableLatestDecorators: enableLatestDecorators,
-    filename: {
-      css: cssModuleLocalIdentName
-    },
-    // `@modern-js/webpack` used to generate asset manifest by default
-    enableAssetManifest: true,
-    // compatible the modern-js with fallback behavior
-    enableAssetFallback: true
-  };
-}

package/dist/js/treeshaking/builder/createSourceConfig.js

@@ -1,88 +0,0 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import { dirname, isAbsolute, posix, sep } from 'path';
-import { globby, mergeAlias, findMonorepoRoot, isModernjsMonorepo } from '@modern-js/utils';
-export function createSourceConfig(normalizedConfig, appContext) {
-  var _normalizedConfig$sou = normalizedConfig.source,
-    alias = _normalizedConfig$sou.alias,
-    envVars = _normalizedConfig$sou.envVars,
-    globalVars = _normalizedConfig$sou.globalVars,
-    include = _normalizedConfig$sou.include,
-    moduleScopes = _normalizedConfig$sou.moduleScopes,
-    preEntry = _normalizedConfig$sou.preEntry;
-  var builderGlobalVars = globalVars || {};
-  var _iterator = _createForOfIteratorHelper(envVars || []),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var envVar = _step.value;
-      var envVarValue = process.env[envVar];
-      envVarValue && (builderGlobalVars["process.env.".concat(envVar)] = envVarValue);
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  var builderModuleScope = createBuilderModuleScope(moduleScopes);
-  var builderInclude = createBuilderInclude(include, appContext);
-  return {
-    alias: mergeAlias(alias),
-    moduleScopes: builderModuleScope,
-    globalVars: builderGlobalVars,
-    include: builderInclude,
-    preEntry: preEntry,
-    // ensure resolve.extensions same as before
-    resolveExtensionPrefix: '.web'
-  };
-}
-export function createBuilderInclude(include, appContext) {
-  var defaultInclude = [appContext.internalDirectory];
-  var transformInclude = (include || []).map(function (include) {
-    if (typeof include === 'string') {
-      if (isAbsolute(include)) {
-        return include;
-      }
-      return new RegExp(include);
-    }
-    return include;
-  }).concat(defaultInclude); // concat default Include
-
-  var root = findMonorepoRoot(appContext.appDirectory);
-  if (!root) {
-    return transformInclude;
-  }
-  var modernjsMonorepo = isModernjsMonorepo(root);
-  if (modernjsMonorepo) {
-    var paths = globby.sync(posix.join(root, 'features', '**', 'package.json'), {
-      ignore: ['**/node_modules/**/*']
-    }).map(function (pathname) {
-      return dirname(pathname) + sep;
-    });
-    return [].concat(_toConsumableArray(paths), _toConsumableArray(transformInclude));
-  }
-  return transformInclude;
-}
-export function createBuilderModuleScope(moduleScopes) {
-  if (moduleScopes) {
-    var builderModuleScope = [];
-    var DEFAULT_SCOPES = ['./src', './shared', /node_modules/];
-    if (Array.isArray(moduleScopes)) {
-      if (isPrimitiveScope(moduleScopes)) {
-        builderModuleScope = DEFAULT_SCOPES.concat(moduleScopes);
-      } else {
-        builderModuleScope = [DEFAULT_SCOPES].concat(_toConsumableArray(moduleScopes));
-      }
-    } else {
-      builderModuleScope = [DEFAULT_SCOPES, moduleScopes];
-    }
-    return builderModuleScope;
-  } else {
-    return undefined;
-  }
-  function isPrimitiveScope(items) {
-    return items.every(function (item) {
-      return typeof item === 'string' || Object.prototype.toString.call(item) === '[object RegExp]';
-    });
-  }
-}

package/dist/js/treeshaking/builder/createToolsConfig.js

@@ -1,85 +0,0 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { applyOptionsChain } from '@modern-js/utils';
-export function createToolsConfig(normalizedConfig) {
-  var _normalizedConfig$out = normalizedConfig.output,
-    disableCssExtract = _normalizedConfig$out.disableCssExtract,
-    enableTsLoader = _normalizedConfig$out.enableTsLoader;
-  var _normalizedConfig$too = normalizedConfig.tools,
-    autoprefixer = _normalizedConfig$too.autoprefixer,
-    babel = _normalizedConfig$too.babel,
-    minifyCss = _normalizedConfig$too.minifyCss,
-    terser = _normalizedConfig$too.terser,
-    webpack = _normalizedConfig$too.webpack,
-    webpackChain = _normalizedConfig$too.webpackChain,
-    tsLoader = _normalizedConfig$too.tsLoader,
-    styledComponents = _normalizedConfig$too.styledComponents,
-    sass = _normalizedConfig$too.sass,
-    postcss = _normalizedConfig$too.postcss,
-    less = _normalizedConfig$too.less,
-    htmlPlugin = _normalizedConfig$too.htmlPlugin,
-    lodash = _normalizedConfig$too.lodash;
-  var builderTsLoader = createBuilderTsLoader(tsLoader, enableTsLoader);
-  var builderTsChecker = createBuilderTsChecker(normalizedConfig.output);
-  return {
-    tsChecker: builderTsChecker,
-    styleLoader: disableCssExtract ? {} : undefined,
-    cssExtract: disableCssExtract ? false : undefined,
-    autoprefixer: autoprefixer,
-    babel: babel,
-    minifyCss: minifyCss,
-    terser: terser,
-    webpack: webpack,
-    webpackChain: webpackChain,
-    tsLoader: builderTsLoader,
-    styledComponents: styledComponents,
-    sass: sass,
-    postcss: postcss,
-    less: less,
-    // can't remove comment in html minify.
-    // some html template insert by using those comments.
-    htmlPlugin: [function (config) {
-      return _objectSpread(_objectSpread({}, config), {}, {
-        minify: _typeof(config.minify) === 'object' ? _objectSpread(_objectSpread({}, config.minify), {}, {
-          removeComments: false
-        }) : config.minify
-      });
-    }].concat(_toConsumableArray(Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [htmlPlugin] : []))
-  };
-}
-function createBuilderTsLoader(tsLoader, enableTsLoader) {
-  var useTsLoader = Boolean(enableTsLoader);
-  if (!useTsLoader) {
-    return undefined;
-  }
-  var defaultTsLoader = {
-    compilerOptions: {
-      target: 'es5',
-      module: 'ESNext'
-    },
-    transpileOnly: false,
-    allowTsInNodeModules: true
-  };
-  return function (_, utils) {
-    return applyOptionsChain(defaultTsLoader, tsLoader, utils);
-  };
-}
-export function createBuilderTsChecker(output) {
-  if (output.enableTsLoader) {
-    return false;
-  }
-  var defaultTsChecker = {
-    issue: {
-      include: [{
-        file: '**/src/**/*'
-      }],
-      exclude: [{
-        file: '**/*.(spec|test).ts'
-      }, {
-        file: '**/node_modules/**/*'
-      }]
-    }
-  };
-  return defaultTsChecker;
-}

package/dist/types/builder/createHtmlConfig.d.ts

@@ -1,6 +0,0 @@
-import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-import type { IAppContext, NormalizedConfig } from '@modern-js/core';
-export declare function createHtmlConfig(normalizedConfig: NormalizedConfig, appContext: IAppContext): BuilderConfig['html'];
-export declare function createBuilderAppIcon(configDir: NormalizedConfig['source']['configDir'], appContext: IAppContext): string | undefined;
-export declare function createBuilderCrossorigin(scriptExt: NormalizedConfig['output']['scriptExt']): "anonymous" | "use-credentials" | undefined;
-export declare function createBuilderFavicon(favicon: NormalizedConfig['output']['favicon'], configDir: NormalizedConfig['source']['configDir'], appContext: IAppContext): string | undefined;

package/dist/types/builder/createOutputConfig.d.ts

@@ -1,3 +0,0 @@
-import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-import type { IAppContext, NormalizedConfig } from '@modern-js/core';
-export declare function createOutputConfig(normalizedConfig: NormalizedConfig, appContext: IAppContext): BuilderConfig['output'];

package/dist/types/builder/createSourceConfig.d.ts

@@ -1,5 +0,0 @@
-import { BuilderConfig } from '@modern-js/builder-webpack-provider';
-import { IAppContext, NormalizedConfig } from '@modern-js/core';
-export declare function createSourceConfig(normalizedConfig: NormalizedConfig, appContext: IAppContext): BuilderConfig['source'];
-export declare function createBuilderInclude(include: NormalizedConfig['source']['include'], appContext: IAppContext): (string | RegExp)[];
-export declare function createBuilderModuleScope(moduleScopes: NormalizedConfig['source']['moduleScopes']): any[] | undefined;

package/dist/types/builder/createToolsConfig.d.ts

@@ -1,13 +0,0 @@
-import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-import type { NormalizedConfig } from '@modern-js/core';
-export declare function createToolsConfig(normalizedConfig: NormalizedConfig): BuilderConfig['tools'];
-export declare function createBuilderTsChecker(output: NormalizedConfig['output']): false | {
-  issue: {
-    include: {
-      file: string;
-    }[];
-    exclude: {
-      file: string;
-    }[];
-  };
-};