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

package/dist/js/treeshaking/utils/getServerInternalPlugins.js

@@ -0,0 +1,210 @@
+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);
+        });
+    };
+}
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _objectSpreadProps(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+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
+        };
+    }
+};
+function getServerInternalPlugins(api) {
+    return _getServerInternalPlugins.apply(this, arguments);
+}
+function _getServerInternalPlugins() {
+    _getServerInternalPlugins = _asyncToGenerator(function(api) {
+        var hookRunners, ref, serverPlugins, serverInternalPlugins;
+        return __generator(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    hookRunners = api.useHookRunners();
+                    return [
+                        4,
+                        hookRunners.collectServerPlugins({
+                            plugins: []
+                        })
+                    ];
+                case 1:
+                    ref = _state.sent(), serverPlugins = ref.plugins;
+                    serverInternalPlugins = serverPlugins.reduce(function(result, plugin) {
+                        return Object.assign(result, plugin);
+                    }, {});
+                    api.setAppContext(_objectSpreadProps(_objectSpread({}, api.useAppContext()), {
+                        serverInternalPlugins: serverInternalPlugins
+                    }));
+                    return [
+                        2,
+                        serverInternalPlugins
+                    ];
+            }
+        });
+    });
+    return _getServerInternalPlugins.apply(this, arguments);
+}
+export { getServerInternalPlugins };

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

@@ -15,4 +15,13 @@ export declare const FILE_SYSTEM_ROUTES_INDEX = "index";
 export declare const FILE_SYSTEM_ROUTES_IGNORED_REGEX: RegExp;
 export declare const HTML_PARTIALS_FOLDER = "html";
 export declare const HTML_PARTIALS_EXTENSIONS: string[];
-export declare const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
+export declare const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
+export declare const NESTED_ROUTE: {
+  LAYOUT_FILE: string;
+  LAYOUT_LOADER_FILE: string;
+  PAGE_FILE: string;
+  PAGE_LOADER_FILE: string;
+  LOADING_FILE: string;
+  ERROR_FILE: string;
+  LOADER_FILE: string;
+};

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

@@ -14,7 +14,8 @@ export declare const getDefaultImports: ({
   internalDirAlias: string;
   internalDirectory: string;
 }) => ImportStatement[];
-export declare const isRouteComponentFile: (filePath: string) => boolean;
+export declare const isPageComponentFile: (filePath: string) => boolean;
+export declare const isNestedRouteComponent: (nestedRouteEntries: string[], absoluteFilePath: string) => boolean;
 export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;
 export declare const parseModule: ({
   source,

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

@@ -1,3 +1,3 @@
 export * from './dev';
 export * from './build';
-export * from './start';
+export * from './serve';

package/dist/types/index.d.ts

@@ -3,6 +3,7 @@ import { CliPlugin, PluginAPI } from '@modern-js/core';
 import { AppTools } from './types';
 export * from './defineConfig';
 export * from './types';
+export type { RuntimeUserConfig } from './types/config';
 export declare const devCommand: (program: Command, api: PluginAPI<AppTools>) => Promise<void>;
 export declare const buildCommand: (program: Command, api: PluginAPI<AppTools>) => Promise<void>;
 

package/dist/types/locale/en.d.ts

@@ -12,7 +12,7 @@ export declare const EN_LOCALE: {
     build: {
       describe: string;
     };
-    start: {
+    serve: {
       describe: string;
     };
     deploy: {

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

@@ -14,7 +14,7 @@ declare const localeKeys: {
     build: {
       describe: string;
     };
-    start: {
+    serve: {
       describe: string;
     };
     deploy: {
@@ -47,7 +47,7 @@ declare const localeKeys: {
     build: {
       describe: string;
     };
-    start: {
+    serve: {
       describe: string;
     };
     deploy: {

package/dist/types/locale/zh.d.ts

@@ -12,7 +12,7 @@ export declare const ZH_LOCALE: {
     build: {
       describe: string;
     };
-    start: {
+    serve: {
       describe: string;
     };
     deploy: {

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

@@ -1,5 +1,6 @@
 import type { UserConfig } from '@modern-js/core';
 import type { ServerUserConfig, ServerNormalizedConfig, BffUserConfig, BffNormalizedConfig } from '@modern-js/server-core';
+import type { BuilderPlugin } from '@modern-js/builder-webpack-provider';
 import type { AppToolsHooks } from '../hooks';
 import type { OutputNormalizedConfig, OutputUserConfig } from './output';
 import type { SourceNormalizedConfig, SourceUserConfig } from './source';
@@ -32,6 +33,7 @@ export interface AppToolsUserConfig {
   runtimeByEntries?: RuntimeByEntriesUserConfig;
   performance?: PerformanceUserConfig;
   experiments?: ExperimentsUserConfig;
+  builderPlugins?: BuilderPlugin[];
   /**
    * The configuration of `bff` is provided by `bff` plugin.
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
@@ -54,6 +56,7 @@ export declare type AppToolsNormalizedConfig = {
   tools: ToolsNormalizedConfig;
   performance: PerformanceNormalizedConfig;
   experiments: ExperimentsNormalizedConfig;
+  builderPlugins: BuilderPlugin[];
   cliOptions?: Record<string, any>;
   _raw: UserConfig<{
     hooks: AppToolsHooks;

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

@@ -2,8 +2,8 @@ import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
 export declare type BuilderSourceConfig = Required<BuilderConfig>['source'];
 export declare type Entry = string | {
   entry: string;
-  enableFileSystemRoutes?: boolean;
   disableMount?: boolean;
+  customBootstrap?: string;
 };
 export declare type Entries = Record<string, Entry>;
 export interface SourceUserConfig extends BuilderSourceConfig {
@@ -11,6 +11,7 @@ export interface SourceUserConfig extends BuilderSourceConfig {
   enableAsyncEntry?: boolean;
   disableDefaultEntries?: boolean;
   entriesDir?: string;
+  disableEntryDirs?: string[];
   configDir?: string;
   /**
    * The configuration of `source.designSystem` is provided by `tailwindcss` plugin.

package/dist/types/types/hooks.d.ts

@@ -54,6 +54,9 @@ export declare type AppToolsHooks = {
     code: string;
   }>;
   addDefineTypes: AsyncWaterfall<void>;
+  collectServerPlugins: AsyncWaterfall<{
+    plugins: Array<Record<string, string>>;
+  }>;
   beforeDev: AsyncWorkflow<void, unknown>;
   afterDev: AsyncWorkflow<void, unknown>;
   beforeCreateCompiler: AsyncWorkflow<{

package/dist/types/types/legacyConfig/source.d.ts

@@ -3,7 +3,6 @@ export declare type SourceLegacyUserConfig = {
   alias?: AliasOption;
   entries?: Record<string, string | {
     entry: string;
-    enableFileSystemRoutes?: boolean;
     disableMount?: boolean;
   }>;
   preEntry?: string | string[];

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

@@ -1 +1,2 @@
-export declare const getCommand: () => string;
+export declare const getCommand: () => string;
+export declare const isDevCommand: () => boolean;

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

@@ -0,0 +1,2 @@
+import { AppTools, PluginAPI } from '../types';
+export declare function getServerInternalPlugins(api: PluginAPI<AppTools>): Promise<Record<string, string>>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -38,6 +38,9 @@
       "default": "./dist/js/node/exports/server.js"
     }
   },
+  "engines": {
+    "node": ">=14.17.6"
+  },
   "typesVersions": {
     "*": {
       ".": [
@@ -62,23 +65,23 @@
     "@babel/types": "^7.18.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
-    "@modern-js/builder": "2.0.0-beta.4",
-    "@modern-js/builder-plugin-esbuild": "2.0.0-beta.4",
-    "@modern-js/builder-plugin-node-polyfill": "2.0.0-beta.4",
-    "@modern-js/builder-shared": "2.0.0-beta.4",
-    "@modern-js/builder-webpack-provider": "2.0.0-beta.4",
-    "@modern-js/core": "2.0.0-beta.4",
-    "@modern-js/new-action": "2.0.0-beta.4",
-    "@modern-js/node-bundle-require": "2.0.0-beta.4",
-    "@modern-js/plugin": "2.0.0-beta.4",
-    "@modern-js/plugin-data-loader": "2.0.0-beta.4",
-    "@modern-js/plugin-i18n": "2.0.0-beta.4",
-    "@modern-js/plugin-lint": "2.0.0-beta.4",
-    "@modern-js/prod-server": "2.0.0-beta.4",
-    "@modern-js/server": "2.0.0-beta.4",
-    "@modern-js/types": "2.0.0-beta.4",
-    "@modern-js/upgrade": "2.0.0-beta.4",
-    "@modern-js/utils": "2.0.0-beta.4"
+    "@modern-js/builder": "2.0.0-beta.7",
+    "@modern-js/builder-plugin-esbuild": "2.0.0-beta.7",
+    "@modern-js/builder-plugin-node-polyfill": "2.0.0-beta.7",
+    "@modern-js/builder-shared": "2.0.0-beta.7",
+    "@modern-js/builder-webpack-provider": "2.0.0-beta.7",
+    "@modern-js/core": "2.0.0-beta.7",
+    "@modern-js/new-action": "2.0.0-beta.7",
+    "@modern-js/node-bundle-require": "2.0.0-beta.7",
+    "@modern-js/plugin": "2.0.0-beta.7",
+    "@modern-js/plugin-data-loader": "2.0.0-beta.7",
+    "@modern-js/plugin-i18n": "2.0.0-beta.7",
+    "@modern-js/plugin-lint": "2.0.0-beta.7",
+    "@modern-js/prod-server": "2.0.0-beta.7",
+    "@modern-js/server": "2.0.0-beta.7",
+    "@modern-js/types": "2.0.0-beta.7",
+    "@modern-js/upgrade": "2.0.0-beta.7",
+    "@modern-js/utils": "2.0.0-beta.7"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -87,10 +90,10 @@
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "@modern-js/builder-plugin-swc": "2.0.0-beta.4",
-    "@modern-js/server-core": "2.0.0-beta.4",
-    "@scripts/build": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4"
+    "@modern-js/builder-plugin-swc": "2.0.0-beta.7",
+    "@modern-js/server-core": "2.0.0-beta.7",
+    "@scripts/jest-config": "2.0.0-beta.7",
+    "@scripts/build": "2.0.0-beta.7"
   },
   "sideEffects": false,
   "publishConfig": {