@modern-js/app-tools 2.0.0-beta.0 → 2.0.0-beta.2

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

@@ -0,0 +1,117 @@
+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'];
+  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 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;
+  }
+}
+export 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;
+        }
+        return new RegExp(include);
+      }
+      return include;
+    }).concat(defaultInclude); // concat default Include
+
+    const root = findMonorepoRoot(appContext.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);
+      return [...paths, ...transformInclude];
+    }
+    return transformInclude;
+  }
+  function createBuilderModuleScope(config) {
+    const {
+      moduleScopes
+    } = config.source;
+    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]');
+    }
+  }
+}
+export function initToolsConfig(config) {
+  const defaultTsChecker = {
+    issue: {
+      include: [{
+        file: '**/src/**/*'
+      }],
+      exclude: [{
+        file: '**/*.(spec|test).ts'
+      }, {
+        file: '**/node_modules/**/*'
+      }]
+    }
+  };
+  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);
+  });
+  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] : [])];
+}

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

@@ -0,0 +1,40 @@
+import { createToolsConfig } from "./createToolsConfig";
+import { createSourceConfig } from "./createSourceConfig";
+import { createOutputConfig } from "./createOutputConfig";
+import { createHtmlConfig } from "./createHtmlConfig";
+export function transformNormalizedConfig(config) {
+  const html = createHtmlConfig(config);
+  const output = createOutputConfig(config);
+  const source = createSourceConfig(config);
+  const tools = createToolsConfig(config);
+  const {
+    bff,
+    dev,
+    deploy,
+    runtime,
+    runtimeByEntries,
+    server,
+    cliOptions,
+    plugins,
+    testing
+  } = config;
+  return {
+    source,
+    html,
+    output,
+    tools,
+    bff,
+    dev,
+    deploy,
+    runtime,
+    runtimeByEntries,
+    server,
+    cliOptions,
+    testing,
+    plugins: plugins,
+    security: {},
+    _raw: {},
+    experiments: {},
+    performance: {}
+  };
+}

package/dist/js/modern/defineConfig.js

@@ -0,0 +1,12 @@
+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; }
+export const defineConfig = config => config;
+
+/**
+ * @deprecated
+ * Using defineConfig first.
+ */
+export const defineLegacyConfig = config => _objectSpread(_objectSpread({}, config), {}, {
+  legacy: true
+});

package/dist/js/modern/hooks.js

@@ -1,21 +1,25 @@
-import { createAsyncWaterfall, createAsyncWorkflow } from '@modern-js/plugin';
-export const beforeDev = createAsyncWorkflow();
-export const afterDev = createAsyncWorkflow();
-export const beforeCreateCompiler = createAsyncWorkflow();
-export const afterCreateCompiler = createAsyncWorkflow();
-export const beforePrintInstructions = createAsyncWaterfall();
-export const beforeBuild = createAsyncWorkflow();
-export const afterBuild = createAsyncWorkflow();
-export const beforeDeploy = createAsyncWorkflow();
-export const afterDeploy = createAsyncWorkflow();
+import { createAsyncWaterfall, createAsyncWorkflow, createParallelWorkflow } from '@modern-js/plugin';
 export const hooks = {
-  beforeDev,
-  afterDev,
-  beforeCreateCompiler,
-  afterCreateCompiler,
-  beforePrintInstructions,
-  beforeBuild,
-  afterBuild,
-  beforeDeploy,
-  afterDeploy
+  modifyEntryExport: createAsyncWaterfall(),
+  modifyEntryImports: createAsyncWaterfall(),
+  modifyEntryRuntimePlugins: createAsyncWaterfall(),
+  modifyEntryRenderFunction: createAsyncWaterfall(),
+  modifyAsyncEntry: createAsyncWaterfall(),
+  modifyFileSystemRoutes: createAsyncWaterfall(),
+  modifyServerRoutes: createAsyncWaterfall(),
+  htmlPartials: createAsyncWaterfall(),
+  beforeGenerateRoutes: createAsyncWaterfall(),
+  addDefineTypes: createAsyncWaterfall(),
+  beforeDev: createAsyncWorkflow(),
+  afterDev: createAsyncWorkflow(),
+  beforeCreateCompiler: createAsyncWorkflow(),
+  afterCreateCompiler: createAsyncWorkflow(),
+  beforePrintInstructions: createAsyncWaterfall(),
+  beforeBuild: createAsyncWorkflow(),
+  afterBuild: createAsyncWorkflow(),
+  beforeDeploy: createAsyncWorkflow(),
+  afterDeploy: createAsyncWorkflow(),
+  watchFiles: createParallelWorkflow(),
+  fileChange: createAsyncWorkflow(),
+  beforeRestart: createAsyncWorkflow()
 };

package/dist/js/modern/index.js

@@ -1,25 +1,24 @@
 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 from 'path';
-import { defineConfig, cli } from '@modern-js/core';
-import LintPlugin from '@modern-js/plugin-jarvis';
+import LintPlugin from '@modern-js/plugin-lint';
 import { cleanRequireCache, emptyDir, Import } from '@modern-js/utils';
 import AnalyzePlugin from "./analyze";
+import InitializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
 import { getCommand } from "./utils/commands";
-export { defineConfig, hooks };
+import { restart } from "./utils/restart";
+export * from "./defineConfig";
+export * from "./types";
 const upgradeModel = Import.lazy('@modern-js/upgrade', require);
 export default (() => ({
   name: '@modern-js/app-tools',
-  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-router-legacy', '@modern-js/plugin-polyfill'],
+  post: ['@modern-js/plugin-initialize', '@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-document', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-router-legacy', '@modern-js/plugin-polyfill'],
   registerHook: hooks,
-  usePlugins: [AnalyzePlugin(), LintPlugin()],
+  usePlugins: [InitializePlugin(), AnalyzePlugin(), LintPlugin()],
   setup: api => {
     const locale = getLocaleLanguage();
     i18n.changeLanguage({
@@ -39,9 +38,9 @@ export default (() => ({
           const {
             build
           } = await import("./commands/build");
-          await build(api, options); // force exit after build.
+          await build(api, options);
+          // force exit after build.
           // eslint-disable-next-line no-process-exit
-
           process.exit(0);
         });
         program.command('start').usage('[options]').description(i18n.t(localeKeys.command.start.describe)).option('--api-only', i18n.t(localeKeys.command.dev.apiOnly)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).action(async () => {
@@ -58,8 +57,8 @@ export default (() => ({
           const {
             deploy
           } = await import("./commands/deploy");
-          await deploy(api, options); // eslint-disable-next-line no-process-exit
-
+          await deploy(api, options);
+          // eslint-disable-next-line no-process-exit
           process.exit(0);
         });
         program.command('new').usage('[options]').description(i18n.t(localeKeys.command.new.describe)).option('-d, --debug', i18n.t(localeKeys.command.new.debug), false).option('-c, --config <config>', i18n.t(localeKeys.command.new.config)).option('--dist-tag <tag>', i18n.t(localeKeys.command.new.distTag)).option('--registry', i18n.t(localeKeys.command.new.registry)).action(async options => {
@@ -78,16 +77,13 @@ export default (() => ({
         });
         upgradeModel.defineCommand(program.command('upgrade'));
       },
-
       async prepare() {
         const command = getCommand();
-
         if (command === 'dev' || command === 'build') {
           const appContext = api.useAppContext();
           await emptyDir(appContext.distDirectory);
         }
       },
-
       // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
       async fileChange(e) {
         const {
@@ -100,20 +96,17 @@ export default (() => ({
           srcDirectory
         } = appContext;
         const absolutePath = path.resolve(appDirectory, filename);
-
         if (!absolutePath.includes(srcDirectory) && (eventType === 'change' || eventType === 'unlink')) {
           const {
             closeServer
           } = await import("./utils/createServer");
           await closeServer();
-          await cli.restart();
+          await restart(api.useHookRunners());
         }
       },
-
       async beforeRestart() {
         cleanRequireCache([require.resolve("./analyze")]);
       }
-
     };
   }
 }));

package/dist/js/modern/initialize/index.js

@@ -0,0 +1,72 @@
+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 { ensureAbsolutePath, getPort, isDev } from '@modern-js/utils';
+import { legacySchema, schema } from "../schema";
+import { getCommand } from "../utils/commands";
+import { transformNormalizedConfig } from "../config/initial/transformNormalizedConfig";
+import { checkIsLegacyConfig, createDefaultConfig, createLegacyDefaultConfig } from "../config";
+export default (() => ({
+  name: '@modern-js/plugin-initialize',
+  setup(api) {
+    const config = () => {
+      const appContext = api.useAppContext();
+      const userConfig = api.useConfigContext();
+      return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext);
+    };
+    const validateSchema = () => {
+      const userConfig = api.useConfigContext();
+      const schemas = checkIsLegacyConfig(userConfig) ? legacySchema : schema;
+      return schemas.generate();
+    };
+    return {
+      config,
+      validateSchema,
+      async resolvedConfig({
+        resolved
+      }) {
+        var _resolved$output$dist, _normalizedConfig$ser;
+        let appContext = api.useAppContext();
+        const userConfig = api.useConfigContext();
+        const port = await getDevServerPort(appContext, resolved);
+        appContext = _objectSpread(_objectSpread({}, appContext), {}, {
+          port,
+          distDirectory: ensureAbsolutePath(appContext.distDirectory, ((_resolved$output$dist = resolved.output.distPath) === null || _resolved$output$dist === void 0 ? void 0 : _resolved$output$dist.root) || 'dist')
+        });
+        api.setAppContext(appContext);
+        const normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;
+        return {
+          resolved: {
+            // FIXME: the userConfig mayby legacy userConfig
+            _raw: userConfig,
+            source: normalizedConfig.source || {},
+            server: _objectSpread(_objectSpread({}, normalizedConfig.server || {}), {}, {
+              port: port || ((_normalizedConfig$ser = normalizedConfig.server) === null || _normalizedConfig$ser === void 0 ? void 0 : _normalizedConfig$ser.port)
+            }),
+            bff: normalizedConfig.bff || {},
+            dev: normalizedConfig.dev || {},
+            html: normalizedConfig.html || {},
+            output: normalizedConfig.output || {},
+            security: normalizedConfig.security || {},
+            tools: normalizedConfig.tools || {},
+            testing: normalizedConfig.testing || {},
+            plugins: normalizedConfig.plugins || [],
+            runtime: normalizedConfig.runtime || {},
+            runtimeByEntries: normalizedConfig.runtimeByEntries || {},
+            deploy: normalizedConfig.deploy || {},
+            performance: normalizedConfig.performance || {},
+            experiments: normalizedConfig.experiments || {}
+          }
+        };
+      }
+    };
+  }
+}));
+async function getDevServerPort(appContext, resolved) {
+  const command = getCommand();
+  if (isDev() && command === 'dev') {
+    var _appContext$port;
+    return ((_appContext$port = appContext.port) !== null && _appContext$port !== void 0 ? _appContext$port : 0) > 0 ? appContext.port : await getPort(resolved.server.port || 8080);
+  }
+  return resolved.server.port;
+}

package/dist/js/modern/schema/Schema.js

@@ -0,0 +1,39 @@
+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 { merge } from '@modern-js/utils/lodash';
+export class Schema extends Map {
+  constructor(baseSchema = {}) {
+    super();
+    _defineProperty(this, "schema", void 0);
+    this.schema = baseSchema;
+  }
+  setSchema(key, object) {
+    Object.entries(object).forEach(([k, v]) => {
+      const target = `${key}.${k}`;
+      this.set(target, v);
+    });
+    return this;
+  }
+  set(key, value) {
+    if (this.has(key)) {
+      merge(this.schema[key], value);
+    } else {
+      this.schema[key] = value;
+    }
+    return this;
+  }
+  has(key) {
+    return key in this.schema;
+  }
+  get(key) {
+    return this.schema[key];
+  }
+  delete(key) {
+    return delete this.schema[key];
+  }
+  generate() {
+    return Object.entries(this.schema).map(([target, schema]) => ({
+      target,
+      schema
+    }));
+  }
+}

package/dist/js/modern/schema/index.js

@@ -0,0 +1,139 @@
+import { ENTRY_NAME_PATTERN } from '@modern-js/utils/constants';
+import { Schema } from "./Schema";
+const source = {
+  entries: {
+    type: 'object',
+    patternProperties: {
+      [ENTRY_NAME_PATTERN]: {
+        if: {
+          type: 'object'
+        },
+        then: {
+          required: ['entry'],
+          properties: {
+            entry: {
+              type: ['string', 'array']
+            },
+            disableMount: {
+              type: 'boolean'
+            },
+            enableFileSystemRoutes: {
+              type: 'boolean'
+            }
+          },
+          additionalProperties: false
+        },
+        else: {
+          type: ['string', 'array']
+        }
+      }
+    }
+  },
+  enableAsyncEntry: {
+    type: 'boolean'
+  },
+  disableDefaultEntries: {
+    type: 'boolean'
+  },
+  entriesDir: {
+    type: 'string'
+  },
+  configDir: {
+    type: 'string'
+  },
+  designSystem: {
+    type: 'object'
+  }
+};
+const bff = {
+  prefix: {
+    type: 'string'
+  },
+  proxy: {
+    type: 'object',
+    additionalProperties: {
+      type: 'string'
+    }
+  }
+};
+const output = {
+  ssg: {
+    typeof: ['boolean', 'object', 'function']
+  },
+  enableModernMode: {
+    type: 'boolean'
+  },
+  disableNodePolyfill: {
+    type: 'boolean'
+  }
+};
+const dev = {
+  proxy: {
+    type: ['boolean', 'object']
+  }
+};
+const server = {
+  routes: {
+    type: 'object'
+  },
+  publicRoutes: {
+    type: 'object'
+  },
+  ssr: {
+    type: ['boolean', 'object']
+  },
+  ssrByEntries: {
+    type: 'object'
+  },
+  baseUrl: {
+    anyOf: [{
+      type: 'string'
+    }, {
+      type: 'array',
+      items: {
+        type: 'string'
+      }
+    }]
+  },
+  port: {
+    type: 'number'
+  },
+  logger: {
+    type: ['boolean', 'object']
+  },
+  metrics: {
+    type: ['boolean', 'object']
+  },
+  enableMicroFrontendDebug: {
+    type: 'boolean'
+  },
+  watchOptions: {
+    type: 'object'
+  },
+  compiler: {
+    type: 'string'
+  },
+  disableFrameworkExt: {
+    type: 'boolean'
+  }
+};
+const tools = {
+  tailwindcss: {
+    type: 'object'
+  },
+  jest: {
+    typeof: ['object', 'function']
+  },
+  esbuild: {
+    typeof: ['object']
+  }
+};
+const deploy = {
+  microFrontend: {
+    type: ['boolean', 'object']
+  }
+};
+const schema = new Schema();
+schema.setSchema('bff', bff).setSchema('dev', dev).setSchema('server', server).setSchema('source', source).setSchema('output', output).setSchema('tools', tools).setSchema('deploy', deploy);
+export { default as legacySchema } from "./legacy";
+export { schema };