@modern-js/app-tools 2.19.0 → 2.20.0

package/dist/esm/utils/restart.js

@@ -1,134 +1,5 @@
-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 _async_to_generator(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(void 0);
-    });
-  };
-}
-var __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 { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { cli } from "@modern-js/core";
 import { chalk, clearConsole, getFullArgv, logger, program } from "@modern-js/utils";
 export function restart(hooksRunner, filename) {
@@ -137,7 +8,7 @@ export function restart(hooksRunner, filename) {
 function _restart() {
   _restart = _async_to_generator(function(hooksRunner, filename) {
     var hasGetError, err;
-    return __generator(this, function(_state) {
+    return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           clearConsole();

package/dist/esm/utils/routes.js

@@ -1,140 +1,11 @@
-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 _async_to_generator(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(void 0);
-    });
-  };
-}
-var __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 { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { fs, ROUTE_SPEC_FILE } from "@modern-js/utils";
 var generateRoutes = function() {
   var _ref = _async_to_generator(function(appContext) {
     var serverRoutes, distDirectory, output;
-    return __generator(this, function(_state) {
+    return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           serverRoutes = appContext.serverRoutes, distDirectory = appContext.distDirectory;

package/dist/esm-node/analyze/getServerRoutes.js

@@ -76,12 +76,14 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
     const entryOptions = getEntryOptions(entryName, ssr, ssrByEntries, packageName);
     const isSSR = Boolean(entryOptions);
     const isWorker = Boolean(workerSSR);
+    const isStream = typeof entryOptions === "object" && entryOptions.mode === "stream";
     const { resHeaders } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
     let route = {
       urlPath: `/${entryName === MAIN_ENTRY_NAME ? "" : entryName}`,
       entryName,
       entryPath: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
       isSPA: true,
+      isStream,
       isSSR,
       responseHeaders: resHeaders,
       worker: isWorker ? `${SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -70,13 +70,14 @@ function applyAsyncChunkHtmlPlugin({ chain, modernConfig, CHAIN_ID, HtmlBundlerP
   }
 }
 function applyRouterPlugin(chain, options) {
-  var _normalizedConfig_runtime;
+  var _normalizedConfig_runtime, _normalizedConfig_deploy_worker;
   const { appContext, normalizedConfig } = options;
   const { entrypoints } = appContext;
   const existNestedRoutes = entrypoints.some((entrypoint) => entrypoint.nestedRoutesEntry);
   const routerConfig = normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_runtime = normalizedConfig.runtime) === null || _normalizedConfig_runtime === void 0 ? void 0 : _normalizedConfig_runtime.router;
   const routerManifest = Boolean(routerConfig === null || routerConfig === void 0 ? void 0 : routerConfig.manifest);
-  if (existNestedRoutes || routerManifest) {
+  const workerSSR = Boolean((_normalizedConfig_deploy_worker = normalizedConfig.deploy.worker) === null || _normalizedConfig_deploy_worker === void 0 ? void 0 : _normalizedConfig_deploy_worker.ssr);
+  if (existNestedRoutes || routerManifest || workerSSR) {
     chain.plugin("route-plugin").use(RouterPlugin);
   }
 }

package/dist/esm-node/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.js

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 export class HtmlAsyncChunkPlugin {
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, (compilation) => {

package/dist/esm-node/builder/shared/bundlerPlugins/HtmlBottomTemplate.js

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 export class BottomTemplatePlugin {
   apply(compiler) {
     compiler.hooks.compilation.tap(this.name, (compilation) => {

package/dist/esm-node/index.js

@@ -88,6 +88,17 @@ export default (options = {
         locale
       });
       return {
+        async beforeConfig() {
+          var _userConfig_output;
+          const userConfig = api.useConfigContext();
+          const appContext = api.useAppContext();
+          if ((_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir) {
+            api.setAppContext({
+              ...appContext,
+              internalDirectory: path.resolve(appContext.appDirectory, userConfig.output.tempDir)
+            });
+          }
+        },
         async commands({ program }) {
           await devCommand(program, api);
           await buildCommand(program, api);

package/dist/esm-node/schema/Schema.js

@@ -1,16 +1,4 @@
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { merge } from "@modern-js/utils/lodash";
 export class Schema extends Map {
   setSchema(key, object) {

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

@@ -9,6 +9,7 @@ export interface SharedOutputConfig extends BuilderSharedOutputConfig {
   ssg?: SSGConfig;
   splitRouteChunks?: boolean;
   disableNodePolyfill?: boolean;
+  tempDir?: string;
 }
 export interface OutputUserConfig extends BuilderOutputConfig, SharedOutputConfig {}
 export interface RsOutputUserConfig extends RsBuilderOutputConfig, SharedOutputConfig {}

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

@@ -1,5 +1,5 @@
-import { MetaOptions } from '@modern-js/utils';
-import { SSGConfig } from '../config';
+import type { MetaOptions } from '@modern-js/builder-shared';
+import type { SSGConfig } from '../config';
 type CrossOrigin = 'anonymous' | 'use-credentials';
 export type OutputLegacyUserConfig = {
   assetPrefix?: string;

package/lib/types.d.ts

@@ -53,8 +53,12 @@ declare module '*.svg' {
     React.SVGProps<SVGSVGElement>
   >;
 
-  const src: string;
-  export default src;
+  /**
+   * The default export type depends on the svgDefaultExport config,
+   * it can be a string or a ReactComponent
+   * */
+  const content: any;
+  export default content;
 }
 
 declare module '*.bmp?inline' {
@@ -99,12 +103,8 @@ declare module '*.svg?inline' {
     React.SVGProps<SVGSVGElement>
   >;
 
-  /**
-   * The default export type depends on the svgDefaultExport config,
-   * it can be a string or a ReactComponent
-   * */
-  const content: any;
-  export default content;
+  const src: string;
+  export default src;
 }
 
 declare module '*.bmp?url' {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.19.0",
+  "version": "2.20.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -67,29 +67,29 @@
   },
   "dependencies": {
     "@babel/parser": "^7.18.0",
-    "@babel/runtime": "^7.18.0",
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
     "rspack-plugin-virtual-module": "0.1.0",
-    "@modern-js/builder": "2.19.0",
-    "@modern-js/builder-plugin-esbuild": "2.19.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.19.0",
-    "@modern-js/builder-shared": "2.19.0",
-    "@modern-js/builder-webpack-provider": "2.19.0",
-    "@modern-js/core": "2.19.0",
-    "@modern-js/new-action": "2.19.0",
-    "@modern-js/node-bundle-require": "2.19.0",
-    "@modern-js/plugin": "2.19.0",
-    "@modern-js/plugin-data-loader": "2.19.0",
-    "@modern-js/plugin-i18n": "2.19.0",
-    "@modern-js/plugin-lint": "2.19.0",
-    "@modern-js/prod-server": "2.19.0",
-    "@modern-js/server": "2.19.0",
-    "@modern-js/types": "2.19.0",
-    "@modern-js/upgrade": "2.19.0",
-    "@modern-js/utils": "2.19.0"
+    "@swc/helpers": "0.5.1",
+    "@modern-js/builder": "2.20.0",
+    "@modern-js/builder-plugin-esbuild": "2.20.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.20.0",
+    "@modern-js/builder-shared": "2.20.0",
+    "@modern-js/builder-webpack-provider": "2.20.0",
+    "@modern-js/core": "2.20.0",
+    "@modern-js/new-action": "2.20.0",
+    "@modern-js/node-bundle-require": "2.20.0",
+    "@modern-js/plugin": "2.20.0",
+    "@modern-js/plugin-data-loader": "2.20.0",
+    "@modern-js/plugin-i18n": "2.20.0",
+    "@modern-js/plugin-lint": "2.20.0",
+    "@modern-js/prod-server": "2.20.0",
+    "@modern-js/server": "2.20.0",
+    "@modern-js/types": "2.20.0",
+    "@modern-js/upgrade": "2.20.0",
+    "@modern-js/utils": "2.20.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -98,14 +98,14 @@
     "jest": "^29",
     "typescript": "^4",
     "webpack": "^5.82.1",
-    "@modern-js/builder-plugin-swc": "2.19.0",
-    "@modern-js/builder-rspack-provider": "2.19.0",
-    "@modern-js/server-core": "2.19.0",
-    "@scripts/build": "2.19.0",
-    "@scripts/jest-config": "2.19.0"
+    "@modern-js/builder-plugin-swc": "2.20.0",
+    "@modern-js/builder-rspack-provider": "2.20.0",
+    "@modern-js/server-core": "2.20.0",
+    "@scripts/build": "2.20.0",
+    "@scripts/jest-config": "2.20.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.19.0"
+    "@modern-js/builder-rspack-provider": "^2.20.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {