@modern-js/app-tools 2.31.2 → 2.31.3-alpha.0

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

@@ -0,0 +1,152 @@
+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;
+        }
+        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

@@ -0,0 +1,187 @@
+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;
+        }
+        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

@@ -0,0 +1,153 @@
+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;
+        }
+        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 };

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

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

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

@@ -19,8 +19,12 @@ export declare const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
 export declare const NESTED_ROUTE: {
   LAYOUT_FILE: string;
   LAYOUT_LOADER_FILE: string;
+  LAYOUT_DATA_FILE: string;
+  LAYOUT_CLIENT_LOADER: string;
   PAGE_FILE: string;
   PAGE_LOADER_FILE: string;
+  PAGE_DATA_FILE: string;
+  PAGE_CLIENT_LOADER: string;
   LOADING_FILE: string;
   ERROR_FILE: string;
   LOADER_FILE: string;

package/package.json

@@ -15,33 +15,33 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.31.2",
+  "version": "2.31.3-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
     ".": {
+      "types": "./dist/types/index.d.ts",
       "node": {
         "jsnext:source": "./src/index.ts",
         "import": "./dist/esm/index.js",
         "require": "./dist/cjs/index.js"
       },
-      "types": "./dist/types/index.d.ts",
       "default": "./dist/cjs/index.js"
     },
     "./cli": {
-      "jsnext:source": "./src/index.ts",
       "types": "./dist/types/index.d.ts",
+      "jsnext:source": "./src/index.ts",
       "default": "./dist/cjs/index.js"
     },
     "./types": {
-      "jsnext:source": "./lib/types.d.ts",
       "types": "./lib/types.d.ts",
+      "jsnext:source": "./lib/types.d.ts",
       "default": "./lib/types.d.ts"
     },
     "./server": {
-      "jsnext:source": "./src/exports/server.ts",
       "types": "./dist/types/exports/server.d.ts",
+      "jsnext:source": "./src/exports/server.ts",
       "default": "./dist/cjs/exports/server.js"
     }
   },
@@ -74,23 +74,23 @@
     "rspack-plugin-virtual-module": "0.1.7",
     "@swc/helpers": "0.5.1",
     "@modern-js/builder": "2.31.2",
-    "@modern-js/builder-plugin-esbuild": "2.31.2",
-    "@modern-js/builder-plugin-node-polyfill": "2.31.2",
     "@modern-js/builder-shared": "2.31.2",
     "@modern-js/builder-webpack-provider": "2.31.2",
     "@modern-js/core": "2.31.2",
-    "@modern-js/new-action": "2.31.2",
     "@modern-js/node-bundle-require": "2.31.2",
-    "@modern-js/plugin": "2.31.2",
-    "@modern-js/plugin-data-loader": "2.31.2",
     "@modern-js/plugin-i18n": "2.31.2",
+    "@modern-js/plugin": "2.31.2",
     "@modern-js/plugin-lint": "2.31.2",
     "@modern-js/prod-server": "2.31.2",
     "@modern-js/server": "2.31.2",
-    "@modern-js/types": "2.31.2",
     "@modern-js/upgrade": "2.31.2",
+    "@modern-js/types": "2.31.2",
     "@modern-js/utils": "2.31.2",
-    "@modern-js/server-core": "2.31.2"
+    "@modern-js/server-core": "2.31.2",
+    "@modern-js/new-action": "2.31.2",
+    "@modern-js/builder-plugin-esbuild": "2.31.2",
+    "@modern-js/builder-plugin-node-polyfill": "2.31.2",
+    "@modern-js/plugin-data-loader": "2.31.2"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -99,10 +99,10 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/builder-plugin-swc": "2.31.2",
     "@modern-js/builder-rspack-provider": "2.31.2",
+    "@scripts/build": "2.31.1",
     "@scripts/jest-config": "2.31.1",
-    "@scripts/build": "2.31.1"
+    "@modern-js/builder-plugin-swc": "2.31.2"
   },
   "peerDependencies": {
     "@modern-js/builder-rspack-provider": "^2.31.2"