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

package/dist/js/treeshaking/index.js

@@ -2,22 +2,24 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 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";
 var upgradeModel = Import.lazy('@modern-js/upgrade', require);
 export default (function () {
   return {
     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: function setup(api) {
       var locale = getLocaleLanguage();
       i18n.changeLanguage({
@@ -29,20 +31,17 @@ export default (function () {
           program.command('dev').usage('[options]').description(i18n.t(localeKeys.command.dev.describe)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('-e --entry [entry...]', i18n.t(localeKeys.command.dev.entry)).option('--analyze', i18n.t(localeKeys.command.shared.analyze)).option('--api-only', i18n.t(localeKeys.command.dev.apiOnly)).action( /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
               var _yield$import, dev;
-
               return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) {
                   switch (_context.prev = _context.next) {
                     case 0:
                       _context.next = 2;
                       return import("./commands/dev");
-
                     case 2:
                       _yield$import = _context.sent;
                       dev = _yield$import.dev;
                       _context.next = 6;
                       return dev(api, options);
-
                     case 6:
                     case "end":
                       return _context.stop();
@@ -50,7 +49,6 @@ export default (function () {
                 }
               }, _callee);
             }));
-
             return function (_x) {
               return _ref2.apply(this, arguments);
             };
@@ -58,25 +56,21 @@ export default (function () {
           program.command('build').usage('[options]').description(i18n.t(localeKeys.command.build.describe)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).option('--analyze', i18n.t(localeKeys.command.shared.analyze)).action( /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
               var _yield$import2, build;
-
               return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
                     case 0:
                       _context2.next = 2;
                       return import("./commands/build");
-
                     case 2:
                       _yield$import2 = _context2.sent;
                       build = _yield$import2.build;
                       _context2.next = 6;
                       return build(api, options);
-
                     case 6:
                       // force exit after build.
                       // eslint-disable-next-line no-process-exit
                       process.exit(0);
-
                     case 7:
                     case "end":
                       return _context2.stop();
@@ -84,27 +78,23 @@ export default (function () {
                 }
               }, _callee2);
             }));
-
             return function (_x2) {
               return _ref3.apply(this, arguments);
             };
           }());
           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( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
             var _yield$import3, start;
-
             return _regeneratorRuntime().wrap(function _callee3$(_context3) {
               while (1) {
                 switch (_context3.prev = _context3.next) {
                   case 0:
                     _context3.next = 2;
                     return import("./commands/start");
-
                   case 2:
                     _yield$import3 = _context3.sent;
                     start = _yield$import3.start;
                     _context3.next = 6;
                     return start(api);
-
                   case 6:
                   case "end":
                     return _context3.stop();
@@ -115,34 +105,28 @@ export default (function () {
           program.command('deploy').usage('[options]').option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).description(i18n.t(localeKeys.command.deploy.describe)).action( /*#__PURE__*/function () {
             var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(options) {
               var _yield$import4, build, _yield$import5, deploy;
-
               return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                 while (1) {
                   switch (_context4.prev = _context4.next) {
                     case 0:
                       _context4.next = 2;
                       return import("./commands/build");
-
                     case 2:
                       _yield$import4 = _context4.sent;
                       build = _yield$import4.build;
                       _context4.next = 6;
                       return build(api);
-
                     case 6:
                       _context4.next = 8;
                       return import("./commands/deploy");
-
                     case 8:
                       _yield$import5 = _context4.sent;
                       deploy = _yield$import5.deploy;
                       _context4.next = 12;
                       return deploy(api, options);
-
                     case 12:
                       // eslint-disable-next-line no-process-exit
                       process.exit(0);
-
                     case 13:
                     case "end":
                       return _context4.stop();
@@ -150,7 +134,6 @@ export default (function () {
                 }
               }, _callee4);
             }));
-
             return function (_x3) {
               return _ref5.apply(this, arguments);
             };
@@ -158,14 +141,12 @@ export default (function () {
           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( /*#__PURE__*/function () {
             var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(options) {
               var _yield$import6, MWANewAction;
-
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                 while (1) {
                   switch (_context5.prev = _context5.next) {
                     case 0:
                       _context5.next = 2;
                       return import('@modern-js/new-action');
-
                     case 2:
                       _yield$import6 = _context5.sent;
                       MWANewAction = _yield$import6.MWANewAction;
@@ -173,7 +154,6 @@ export default (function () {
                       return MWANewAction(_objectSpread(_objectSpread({}, options), {}, {
                         locale: locale
                       }));
-
                     case 6:
                     case "end":
                       return _context5.stop();
@@ -181,7 +161,6 @@ export default (function () {
                 }
               }, _callee5);
             }));
-
             return function (_x4) {
               return _ref6.apply(this, arguments);
             };
@@ -189,19 +168,16 @@ export default (function () {
           program.command('inspect').description('inspect internal webpack config').option("--env <env>", i18n.t(localeKeys.command.inspect.env), 'development').option('--output <output>', i18n.t(localeKeys.command.inspect.output), '/').option('--verbose', i18n.t(localeKeys.command.inspect.verbose)).option('-c --config <config>', i18n.t(localeKeys.command.shared.config)).action( /*#__PURE__*/function () {
             var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(options) {
               var _yield$import7, inspect;
-
               return _regeneratorRuntime().wrap(function _callee6$(_context6) {
                 while (1) {
                   switch (_context6.prev = _context6.next) {
                     case 0:
                       _context6.next = 2;
                       return import("./commands/inspect");
-
                     case 2:
                       _yield$import7 = _context6.sent;
                       inspect = _yield$import7.inspect;
                       inspect(api, options);
-
                     case 5:
                     case "end":
                       return _context6.stop();
@@ -209,7 +185,6 @@ export default (function () {
                 }
               }, _callee6);
             }));
-
             return function (_x5) {
               return _ref7.apply(this, arguments);
             };
@@ -224,16 +199,13 @@ export default (function () {
                 switch (_context7.prev = _context7.next) {
                   case 0:
                     command = getCommand();
-
                     if (!(command === 'dev' || command === 'build')) {
                       _context7.next = 5;
                       break;
                     }
-
                     appContext = api.useAppContext();
                     _context7.next = 5;
                     return emptyDir(appContext.distDirectory);
-
                   case 5:
                   case "end":
                     return _context7.stop();
@@ -246,7 +218,6 @@ export default (function () {
         fileChange: function fileChange(e) {
           return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
             var filename, eventType, appContext, appDirectory, srcDirectory, absolutePath, _yield$import8, closeServer;
-
             return _regeneratorRuntime().wrap(function _callee8$(_context8) {
               while (1) {
                 switch (_context8.prev = _context8.next) {
@@ -255,25 +226,20 @@ export default (function () {
                     appContext = api.useAppContext();
                     appDirectory = appContext.appDirectory, srcDirectory = appContext.srcDirectory;
                     absolutePath = path.resolve(appDirectory, filename);
-
                     if (!(!absolutePath.includes(srcDirectory) && (eventType === 'change' || eventType === 'unlink'))) {
                       _context8.next = 13;
                       break;
                     }
-
                     _context8.next = 7;
                     return import("./utils/createServer");
-
                   case 7:
                     _yield$import8 = _context8.sent;
                     closeServer = _yield$import8.closeServer;
                     _context8.next = 11;
                     return closeServer();
-
                   case 11:
                     _context8.next = 13;
-                    return cli.restart();
-
+                    return restart(api.useHookRunners());
                   case 13:
                   case "end":
                     return _context8.stop();
@@ -289,7 +255,6 @@ export default (function () {
                 switch (_context9.prev = _context9.next) {
                   case 0:
                     cleanRequireCache([require.resolve("./analyze")]);
-
                   case 1:
                   case "end":
                     return _context9.stop();

package/dist/js/treeshaking/initialize/index.js

@@ -0,0 +1,121 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+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 (function () {
+  return {
+    name: '@modern-js/plugin-initialize',
+    setup: function setup(api) {
+      var config = function config() {
+        var appContext = api.useAppContext();
+        var userConfig = api.useConfigContext();
+        return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext);
+      };
+      var validateSchema = function validateSchema() {
+        var userConfig = api.useConfigContext();
+        var schemas = checkIsLegacyConfig(userConfig) ? legacySchema : schema;
+        return schemas.generate();
+      };
+      return {
+        config: config,
+        validateSchema: validateSchema,
+        resolvedConfig: function resolvedConfig(_ref) {
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+            var _resolved$output$dist, _normalizedConfig$ser;
+            var resolved, appContext, userConfig, port, normalizedConfig;
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    resolved = _ref.resolved;
+                    appContext = api.useAppContext();
+                    userConfig = api.useConfigContext();
+                    _context.next = 5;
+                    return getDevServerPort(appContext, resolved);
+                  case 5:
+                    port = _context.sent;
+                    appContext = _objectSpread(_objectSpread({}, appContext), {}, {
+                      port: 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);
+                    normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;
+                    return _context.abrupt("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 || {}
+                      }
+                    });
+                  case 10:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }))();
+        }
+      };
+    }
+  };
+});
+function getDevServerPort(_x, _x2) {
+  return _getDevServerPort.apply(this, arguments);
+}
+function _getDevServerPort() {
+  _getDevServerPort = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appContext, resolved) {
+    var command, _appContext$port;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            command = getCommand();
+            if (!(isDev() && command === 'dev')) {
+              _context2.next = 10;
+              break;
+            }
+            if (!(((_appContext$port = appContext.port) !== null && _appContext$port !== void 0 ? _appContext$port : 0) > 0)) {
+              _context2.next = 6;
+              break;
+            }
+            _context2.t0 = appContext.port;
+            _context2.next = 9;
+            break;
+          case 6:
+            _context2.next = 8;
+            return getPort(resolved.server.port || 8080);
+          case 8:
+            _context2.t0 = _context2.sent;
+          case 9:
+            return _context2.abrupt("return", _context2.t0);
+          case 10:
+            return _context2.abrupt("return", resolved.server.port);
+          case 11:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _getDevServerPort.apply(this, arguments);
+}

package/dist/js/treeshaking/schema/Schema.js

@@ -0,0 +1,75 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import _wrapNativeSuper from "@babel/runtime/helpers/esm/wrapNativeSuper";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { merge } from '@modern-js/utils/lodash';
+export var Schema = /*#__PURE__*/function (_Map) {
+  _inherits(Schema, _Map);
+  var _super = _createSuper(Schema);
+  function Schema() {
+    var _this;
+    var baseSchema = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    _classCallCheck(this, Schema);
+    _this = _super.call(this);
+    _defineProperty(_assertThisInitialized(_this), "schema", void 0);
+    _this.schema = baseSchema;
+    return _this;
+  }
+  _createClass(Schema, [{
+    key: "setSchema",
+    value: function setSchema(key, object) {
+      var _this2 = this;
+      Object.entries(object).forEach(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+          k = _ref2[0],
+          v = _ref2[1];
+        var target = "".concat(key, ".").concat(k);
+        _this2.set(target, v);
+      });
+      return this;
+    }
+  }, {
+    key: "set",
+    value: function set(key, value) {
+      if (this.has(key)) {
+        merge(this.schema[key], value);
+      } else {
+        this.schema[key] = value;
+      }
+      return this;
+    }
+  }, {
+    key: "has",
+    value: function has(key) {
+      return key in this.schema;
+    }
+  }, {
+    key: "get",
+    value: function get(key) {
+      return this.schema[key];
+    }
+  }, {
+    key: "delete",
+    value: function _delete(key) {
+      return delete this.schema[key];
+    }
+  }, {
+    key: "generate",
+    value: function generate() {
+      return Object.entries(this.schema).map(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+          target = _ref4[0],
+          schema = _ref4[1];
+        return {
+          target: target,
+          schema: schema
+        };
+      });
+    }
+  }]);
+  return Schema;
+}( /*#__PURE__*/_wrapNativeSuper(Map));

package/dist/js/treeshaking/schema/index.js

@@ -0,0 +1,138 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { ENTRY_NAME_PATTERN } from '@modern-js/utils/constants';
+import { Schema } from "./Schema";
+var source = {
+  entries: {
+    type: 'object',
+    patternProperties: _defineProperty({}, 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'
+  }
+};
+var bff = {
+  prefix: {
+    type: 'string'
+  },
+  proxy: {
+    type: 'object',
+    additionalProperties: {
+      type: 'string'
+    }
+  }
+};
+var output = {
+  ssg: {
+    "typeof": ['boolean', 'object', 'function']
+  },
+  enableModernMode: {
+    type: 'boolean'
+  },
+  disableNodePolyfill: {
+    type: 'boolean'
+  }
+};
+var dev = {
+  proxy: {
+    type: ['boolean', 'object']
+  }
+};
+var 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'
+  }
+};
+var tools = {
+  tailwindcss: {
+    type: 'object'
+  },
+  jest: {
+    "typeof": ['object', 'function']
+  },
+  esbuild: {
+    "typeof": ['object']
+  }
+};
+var deploy = {
+  microFrontend: {
+    type: ['boolean', 'object']
+  }
+};
+var 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 };