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

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

@@ -1,30 +1,152 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-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();
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return(g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g);
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
         }
-      }
-    }, _callee);
-  }));
-  return function printInstructions(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
-  };
-}();
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { prettyInstructions, logger } from "@modern-js/utils";
+var printInstructions = function() {
+    var _ref = _asyncToGenerator(function(hookRunners, appContext, config) {
+        var message, instructions;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    message = prettyInstructions(appContext, config);
+                    return [
+                        4,
+                        hookRunners.beforePrintInstructions({
+                            instructions: message
+                        })
+                    ];
+                case 1:
+                    instructions = _state.sent().instructions;
+                    logger.info(instructions);
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function printInstructions(hookRunners, appContext, config) {
+        return _ref.apply(this, arguments);
+    };
+}();
+export { printInstructions };

package/dist/js/treeshaking/utils/restart.js

@@ -1,45 +1,187 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import { cli } from '@modern-js/core';
-import { logger, program } from '@modern-js/utils';
-export function restart(_x) {
-  return _restart.apply(this, arguments);
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
 }
-function _restart() {
-  _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hooksRunner) {
-    var hasGetError;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            logger.info('Restart...\n');
-            hasGetError = false;
-            _context.next = 4;
-            return hooksRunner.beforeRestart();
-          case 4:
-            _context.prev = 4;
-            _context.next = 7;
-            return cli.init(cli.getPrevInitOptions());
-          case 7:
-            _context.next = 13;
-            break;
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](4);
-            console.error(_context.t0);
-            hasGetError = true;
-          case 13:
-            _context.prev = 13;
-            if (!hasGetError) {
-              program.parse(process.argv);
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
             }
-            return _context.finish(13);
-          case 16:
-          case "end":
-            return _context.stop();
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
         }
-      }
-    }, _callee, null, [[4, 9, 13, 16]]);
-  }));
-  return _restart.apply(this, arguments);
-}
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import { cli } from "@modern-js/core";
+import { chalk, clearConsole, logger, program } from "@modern-js/utils";
+function restart(hooksRunner, filename) {
+    return _restart.apply(this, arguments);
+}
+function _restart() {
+    _restart = _asyncToGenerator(function(hooksRunner, filename) {
+        var hasGetError, err;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    clearConsole();
+                    logger.info("Restart because ".concat(chalk.yellow(filename), " is changed...\n"));
+                    hasGetError = false;
+                    return [
+                        4,
+                        hooksRunner.beforeRestart()
+                    ];
+                case 1:
+                    _state.sent();
+                    _state.label = 2;
+                case 2:
+                    _state.trys.push([
+                        2,
+                        4,
+                        5,
+                        6
+                    ]);
+                    return [
+                        4,
+                        cli.init(cli.getPrevInitOptions())
+                    ];
+                case 3:
+                    _state.sent();
+                    return [
+                        3,
+                        6
+                    ];
+                case 4:
+                    err = _state.sent();
+                    console.error(err);
+                    hasGetError = true;
+                    return [
+                        3,
+                        6
+                    ];
+                case 5:
+                    if (!hasGetError) {
+                        program.parse(process.argv);
+                    }
+                    return [
+                        7
+                    ];
+                case 6:
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return _restart.apply(this, arguments);
+}
+export { restart };

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

@@ -1,29 +1,153 @@
-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;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            serverRoutes = appContext.serverRoutes, distDirectory = appContext.distDirectory;
-            output = JSON.stringify({
-              routes: serverRoutes
-            }, null, 2);
-            _context.next = 4;
-            return fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
-          case 4:
-          case "end":
-            return _context.stop();
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _asyncToGenerator(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+var __generator = this && this.__generator || function(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return(g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g);
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
         }
-      }
-    }, _callee);
-  }));
-  return function generateRoutes(_x) {
-    return _ref.apply(this, arguments);
-  };
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+};
+import path from "path";
+import { fs, ROUTE_SPEC_FILE } from "@modern-js/utils";
+var generateRoutes = function() {
+    var _ref = _asyncToGenerator(function(appContext) {
+        var serverRoutes, distDirectory, output;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    serverRoutes = appContext.serverRoutes, distDirectory = appContext.distDirectory;
+                    output = JSON.stringify({
+                        routes: serverRoutes
+                    }, null, 2);
+                    return [
+                        4,
+                        fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output)
+                    ];
+                case 1:
+                    _state.sent();
+                    return [
+                        2
+                    ];
+            }
+        });
+    });
+    return function generateRoutes(appContext) {
+        return _ref.apply(this, arguments);
+    };
 }();
-export { generateRoutes };
+export { generateRoutes };

package/dist/js/treeshaking/utils/types.js

@@ -0,0 +1 @@
+"use strict";

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

@@ -0,0 +1,8 @@
+import type { BuildOptions } from 'esbuild';
+export declare class Builder {
+  private buildRes;
+  build(options: BuildOptions): Promise<void>;
+  stop(): void;
+}
+export declare const loaderBuilder: Builder;
+export declare const serverLoaderBuilder: Builder;

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

@@ -1,4 +1,6 @@
 import type { CliPlugin } from '@modern-js/core';
 import { AppTools } from '../types';
+
 declare const _default: () => CliPlugin<AppTools>;
+
 export default _default;

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

@@ -39,11 +39,13 @@ export declare const fileSystemRoutes: ({
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory
+  internalDirectory,
+  internalDirAlias
 }: {
   routes: RouteLegacy[] | (NestedRoute | PageRoute)[];
   ssrMode: 'string' | 'stream' | false;
   nestedRoutesEntry?: string | undefined;
   entryName: string;
   internalDirectory: string;
+  internalDirAlias: string;
 }) => Promise<string>;

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

@@ -7,7 +7,8 @@ declare type FnParameter<T extends {
 }> = { [P in keyof T]: Parameter<T[P]> };
 export declare type PluginCompatModernOptions = FnParameter<Partial<Pick<BuilderPluginAPI, 'onAfterBuild' | 'onAfterCreateCompiler' | 'onAfterStartDevServer' | 'onBeforeBuild' | 'onBeforeCreateCompiler' | 'onBeforeStartDevServer' | 'onDevCompileDone' | 'onExit'>>>;
 /**
- * Provides default configuration consistent with `@modern-js/webpack`
+ * Provides default configuration consistent with modern.js v1
  */
+
 export declare const PluginCompatModern: (appContext: IAppContext, modernConfig: AppNormalizedConfig, options?: PluginCompatModernOptions) => BuilderPlugin<BuilderPluginAPI>;
 export {};

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

@@ -1,5 +1,5 @@
 import { BuilderInstance, BuilderTarget, CreateBuilderOptions } from '@modern-js/builder';
-import { BuilderConfig } from '@modern-js/builder-webpack-provider';
+import { BuilderConfig, BuilderWebpackProvider } from '@modern-js/builder-webpack-provider';
 import type { IAppContext } from '@modern-js/core';
 import type { AppNormalizedConfig } from '../types';
 import { PluginCompatModernOptions } from './builderPlugins/compatModern';
@@ -9,10 +9,10 @@ export declare type BuilderOptions = {
   appContext: IAppContext;
   compatPluginConfig?: PluginCompatModernOptions;
 };
-export declare function createBuilderForEdenX({
+export declare function createBuilderForModern({
   normalizedConfig,
   appContext,
   compatPluginConfig
-}: BuilderOptions): Promise<BuilderInstance>;
+}: BuilderOptions): Promise<BuilderInstance<BuilderWebpackProvider>>;
 export declare function createBuilderProviderConfig(normalizedConfig: AppNormalizedConfig, appContext: IAppContext): BuilderConfig;
 export declare function createBuilderOptions(target: BuilderTarget | BuilderTarget[], appContext: IAppContext): CreateBuilderOptions;

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

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