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

package/dist/js/treeshaking/index.js

@@ -3,7 +3,7 @@ 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 { hooks } from "./hooks";
@@ -15,7 +15,7 @@ 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-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()],
     setup: function setup(api) {
@@ -29,20 +29,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 +47,6 @@ export default (function () {
                 }
               }, _callee);
             }));
-
             return function (_x) {
               return _ref2.apply(this, arguments);
             };
@@ -58,25 +54,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 +76,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 +103,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 +132,6 @@ export default (function () {
                 }
               }, _callee4);
             }));
-
             return function (_x3) {
               return _ref5.apply(this, arguments);
             };
@@ -158,14 +139,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 +152,6 @@ export default (function () {
                       return MWANewAction(_objectSpread(_objectSpread({}, options), {}, {
                         locale: locale
                       }));
-
                     case 6:
                     case "end":
                       return _context5.stop();
@@ -181,7 +159,6 @@ export default (function () {
                 }
               }, _callee5);
             }));
-
             return function (_x4) {
               return _ref6.apply(this, arguments);
             };
@@ -189,19 +166,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 +183,6 @@ export default (function () {
                 }
               }, _callee6);
             }));
-
             return function (_x5) {
               return _ref7.apply(this, arguments);
             };
@@ -224,16 +197,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 +216,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 +224,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();
-
                   case 13:
                   case "end":
                     return _context8.stop();
@@ -289,7 +253,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/utils/config.js

@@ -18,10 +18,8 @@ export var buildServerConfig = /*#__PURE__*/function () {
             appDirectory = _ref.appDirectory, distDirectory = _ref.distDirectory, configFile = _ref.configFile, options = _ref.options;
             _context2.next = 3;
             return getServerConfig(appDirectory, configFile);
-
           case 3:
             configFilePath = _context2.sent;
-
             getOutputFile = /*#__PURE__*/function () {
               var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(filepath) {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -29,7 +27,6 @@ export var buildServerConfig = /*#__PURE__*/function () {
                     switch (_context.prev = _context.next) {
                       case 0:
                         return _context.abrupt("return", path.resolve(distDirectory, "".concat(filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join('|')), ''), ".js")));
-
                       case 1:
                       case "end":
                         return _context.stop();
@@ -37,26 +34,21 @@ export var buildServerConfig = /*#__PURE__*/function () {
                   }
                 }, _callee);
               }));
-
               return function getOutputFile(_x2) {
                 return _ref3.apply(this, arguments);
               };
             }();
-
             if (!configFilePath) {
               _context2.next = 14;
               break;
             }
-
             configHelperFilePath = path.normalize(path.join(distDirectory, './config-helper.js'));
             helperCode = "\n      export const defineConfig = (config) => config;\n    ";
             _context2.next = 10;
             return fs.ensureDir(distDirectory);
-
           case 10:
             _context2.next = 12;
             return fs.writeFile(configHelperFilePath, helperCode);
-
           case 12:
             _context2.next = 14;
             return bundle(configFilePath, _objectSpread(_objectSpread({}, options), {}, {
@@ -74,7 +66,6 @@ export var buildServerConfig = /*#__PURE__*/function () {
                 }
               }]
             }));
-
           case 14:
           case "end":
             return _context2.stop();
@@ -82,38 +73,33 @@ export var buildServerConfig = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-
   return function buildServerConfig(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
+
 /**
  *
  * 处理循环引用的 replacer
  */
-
 export var safeReplacer = function safeReplacer() {
   var cache = [];
   var keyCache = [];
   return function (key, value) {
     if (_typeof(value) === 'object' && value !== null) {
       var index = cache.indexOf(value);
-
       if (index !== -1) {
         return "[Circular ".concat(keyCache[index], "]");
       }
-
       cache.push(value);
       keyCache.push(key || 'root');
     }
-
     return value;
   };
 };
 export var emitResolvedConfig = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(appDirectory, resolvedConfig) {
     var _resolvedConfig$outpu;
-
     var outputPath;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) {
@@ -125,7 +111,6 @@ export var emitResolvedConfig = /*#__PURE__*/function () {
               spaces: 2,
               replacer: safeReplacer()
             });
-
           case 3:
           case "end":
             return _context3.stop();
@@ -133,7 +118,6 @@ export var emitResolvedConfig = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-
   return function emitResolvedConfig(_x3, _x4) {
     return _ref4.apply(this, arguments);
   };

package/dist/js/treeshaking/utils/createServer.js

@@ -16,13 +16,10 @@ export var closeServer = /*#__PURE__*/function () {
               _context.next = 4;
               break;
             }
-
             _context.next = 3;
             return server.close();
-
           case 3:
             server = null;
-
           case 4:
           case "end":
             return _context.stop();
@@ -30,7 +27,6 @@ export var closeServer = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-
   return function closeServer() {
     return _ref.apply(this, arguments);
   };
@@ -46,19 +42,15 @@ export var createServer = /*#__PURE__*/function () {
               _context2.next = 3;
               break;
             }
-
             _context2.next = 3;
             return server.close();
-
           case 3:
             server = new Server(options);
             _context2.next = 6;
             return server.init();
-
           case 6:
             app = _context2.sent;
             return _context2.abrupt("return", app);
-
           case 8:
           case "end":
             return _context2.stop();
@@ -66,14 +58,12 @@ export var createServer = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-
   return function createServer(_x) {
     return _ref2.apply(this, arguments);
   };
 }();
 export var injectDataLoaderPlugin = function injectDataLoaderPlugin(internalPlugins) {
   var DataLoaderPlugin = require.resolve('@modern-js/plugin-data-loader/server');
-
   return _objectSpread(_objectSpread({}, internalPlugins), {}, {
     '@modern-js/plugin-data-loader': {
       path: DataLoaderPlugin,

package/dist/js/treeshaking/utils/getSpecifiedEntries.js

@@ -4,7 +4,6 @@ import { inquirer } from '@modern-js/utils';
 export var getSpecifiedEntries = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(entry, entrypoints) {
     var entryNames, _yield$inquirer$promp, selected;
-
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -12,20 +11,16 @@ export var getSpecifiedEntries = /*#__PURE__*/function () {
             entryNames = entrypoints.map(function (e) {
               return e.entryName;
             });
-
             if (entry) {
               _context.next = 3;
               break;
             }
-
             return _context.abrupt("return", entryNames);
-
           case 3:
             if (!(typeof entry === 'boolean')) {
               _context.next = 9;
               break;
             }
-
             _context.next = 6;
             return inquirer.prompt([{
               type: 'checkbox',
@@ -36,16 +31,13 @@ export var getSpecifiedEntries = /*#__PURE__*/function () {
                 if (answer.length < 1) {
                   return 'You must choose at least one topping.';
                 }
-
                 return true;
               }
             }]);
-
           case 6:
             _yield$inquirer$promp = _context.sent;
             selected = _yield$inquirer$promp.selected;
             return _context.abrupt("return", selected);
-
           case 9:
             entry.forEach(function (name) {
               if (!entryNames.includes(name)) {
@@ -53,7 +45,6 @@ export var getSpecifiedEntries = /*#__PURE__*/function () {
               }
             });
             return _context.abrupt("return", entry);
-
           case 11:
           case "end":
             return _context.stop();
@@ -61,7 +52,6 @@ export var getSpecifiedEntries = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-
   return function getSpecifiedEntries(_x, _x2) {
     return _ref.apply(this, arguments);
   };

package/dist/js/treeshaking/utils/printInstructions.js

@@ -4,23 +4,19 @@ import { prettyInstructions, logger } from '@modern-js/utils';
 export var printInstructions = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hookRunners, appContext, config) {
     var message, _yield$hookRunners$be, instructions;
-
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             message = prettyInstructions(appContext, config); // call beforePrintInstructions hook.
-
             _context.next = 3;
             return hookRunners.beforePrintInstructions({
               instructions: message
             });
-
           case 3:
             _yield$hookRunners$be = _context.sent;
             instructions = _yield$hookRunners$be.instructions;
             logger.info(instructions);
-
           case 6:
           case "end":
             return _context.stop();
@@ -28,7 +24,6 @@ export var printInstructions = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-
   return function printInstructions(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };

package/dist/js/treeshaking/utils/routes.js

@@ -2,7 +2,6 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import path from 'path';
 import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
-
 var generateRoutes = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(appContext) {
     var serverRoutes, distDirectory, output;
@@ -16,7 +15,6 @@ var generateRoutes = /*#__PURE__*/function () {
             }, null, 2);
             _context.next = 4;
             return fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
-
           case 4:
           case "end":
             return _context.stop();
@@ -24,10 +22,8 @@ var generateRoutes = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-
   return function generateRoutes(_x) {
     return _ref.apply(this, arguments);
   };
 }();
-
 export { generateRoutes };

package/dist/types/analyze/index.d.ts

@@ -1,5 +1,6 @@
 import type { CliPlugin, RuntimePlugin, ImportStatement } from '@modern-js/core';
 import type { RouteLegacy, Entrypoint, ServerRoute, HtmlPartials, NestedRoute, PageRoute } from '@modern-js/types';
+import type { AppHooks } from '../hooks';
 export declare const modifyEntryImports: import("@modern-js/plugin").AsyncWaterfall<{
   imports: ImportStatement[];
   entrypoint: Entrypoint;
@@ -37,7 +38,5 @@ export declare const beforeGenerateRoutes: import("@modern-js/plugin").AsyncWate
   code: string;
 }>;
 export declare const addDefineTypes: import("@modern-js/plugin").AsyncWaterfall<void>;
-
-declare const _default: () => CliPlugin;
-
+declare const _default: () => CliPlugin<AppHooks>;
 export default _default;

package/dist/types/analyze/nestedRoutes.d.ts

@@ -2,4 +2,4 @@ import type { NestedRoute } from '@modern-js/types';
 export declare const walk: (dirname: string, rootDir: string, alias: {
   name: string;
   basename: string;
-}) => Promise<NestedRoute | null>;
+}, entryName: string) => Promise<NestedRoute | null>;

package/dist/types/analyze/templates.d.ts

@@ -38,9 +38,11 @@ export declare const routesForServer: ({
 export declare const fileSystemRoutes: ({
   routes,
   ssrMode,
-  nestedRoutesEntry
+  nestedRoutesEntry,
+  entryName
 }: {
   routes: RouteLegacy[] | (NestedRoute | PageRoute)[];
   ssrMode: 'string' | 'stream' | false;
   nestedRoutesEntry?: string | undefined;
+  entryName: string;
 }) => string;

package/dist/types/builder/builderPlugins/compatModern.d.ts

@@ -9,6 +9,5 @@ export declare type PluginCompatModernOptions = FnParameter<Partial<Pick<Builder
 /**
  * Provides default configuration consistent with `@modern-js/webpack`
  */
-
 export declare const PluginCompatModern: (appContext: IAppContext, modernConfig: NormalizedConfig, options?: PluginCompatModernOptions) => BuilderPlugin<BuilderPluginAPI>;
 export {};

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

@@ -7,13 +7,9 @@ export declare type BuilderOptions = {
   appContext: IAppContext;
   compatPluginConfig?: PluginCompatModernOptions;
 };
-
-declare const _default: ({
-  target,
+export declare function createBuilderForEdenX({
   normalizedConfig,
   appContext,
   compatPluginConfig
-}: BuilderOptions) => Promise<BuilderInstance>;
-
-export default _default;
+}: BuilderOptions): Promise<BuilderInstance>;
 export declare function createBuilderOptions(target: BuilderTarget | BuilderTarget[], appContext: IAppContext): CreateBuilderOptions;

package/dist/types/builder/webpackPlugins/routerPlugin.d.ts

@@ -0,0 +1,10 @@
+import type { Compiler } from 'webpack';
+interface Options {
+  existNestedRoutes: boolean;
+}
+export default class RouterPlugin {
+  private existNestedRoutes;
+  constructor(options: Options);
+  apply(compiler: Compiler): void;
+}
+export {};

package/dist/types/commands/inspect.d.ts

@@ -1,6 +1,3 @@
 import type { PluginAPI } from '@modern-js/core';
 import type { InspectOptions } from '../utils/types';
-export declare const inspect: (api: PluginAPI, options: InspectOptions) => Promise<{
-  builderConfig: string;
-  bundlerConfigs: string[];
-}>;
+export declare const inspect: (api: PluginAPI, options: InspectOptions) => Promise<any>;

package/dist/types/index.d.ts

@@ -2,7 +2,5 @@ import { defineConfig, CliPlugin } from '@modern-js/core';
 import { hooks, AppHooks } from './hooks';
 export { defineConfig, hooks };
 export type { AppHooks, CliPlugin };
-
 declare const _default: () => CliPlugin<AppHooks>;
-
 export default _default;

package/dist/types/utils/config.d.ts

@@ -17,6 +17,5 @@ export declare const buildServerConfig: ({
  *
  * 处理循环引用的 replacer
  */
-
 export declare const safeReplacer: () => (key: string, value: unknown) => unknown;
 export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: NormalizedConfig) => Promise<void>;