@modern-js/app-tools 2.17.1 → 2.18.1

package/dist/esm/index.js

@@ -30,7 +30,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -477,7 +477,7 @@ export default function() {
     setup: function(api) {
       var locale = getLocaleLanguage();
       i18n.changeLanguage({
-        locale
+        locale: locale
       });
       return {
         commands: function commands(param) {

package/dist/esm/initialize/index.js

@@ -30,7 +30,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -211,8 +211,8 @@ export default function(param) {
         return schemas.generate();
       };
       return {
-        config,
-        validateSchema,
+        config: config,
+        validateSchema: validateSchema,
         resolvedConfig: function resolvedConfig(param2) {
           var resolved = param2.resolved;
           return _async_to_generator(function() {
@@ -229,14 +229,14 @@ export default function(param) {
                 case 1:
                   port = _state.sent();
                   appContext = _object_spread_props(_object_spread({}, appContext), {
-                    port,
+                    port: port,
                     distDirectory: ensureAbsolutePath(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
                   });
                   api.setAppContext(appContext);
                   normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;
                   resolved._raw = userConfig;
                   resolved.server = _object_spread_props(_object_spread({}, normalizedConfig.server || {}), {
-                    port
+                    port: port
                   });
                   resolved.autoLoadPlugins = (_normalizedConfig_autoLoadPlugins = normalizedConfig.autoLoadPlugins) !== null && _normalizedConfig_autoLoadPlugins !== void 0 ? _normalizedConfig_autoLoadPlugins : false;
                   stabilizeConfig(resolved, normalizedConfig, [
@@ -261,7 +261,7 @@ export default function(param) {
                   return [
                     2,
                     {
-                      resolved
+                      resolved: resolved
                     }
                   ];
               }
@@ -285,11 +285,11 @@ function _getServerPort() {
   _getServerPort = _async_to_generator(function(config) {
     var prodPort;
     return __generator(this, function(_state) {
-      prodPort = config.server.port || 8080;
+      prodPort = Number(process.env.PORT) || config.server.port || 8080;
       if (isDev() && isDevCommand()) {
         return [
           2,
-          getPort(config.dev.port || prodPort)
+          getPort(Number(process.env.PORT) || config.dev.port || prodPort)
         ];
       }
       return [

package/dist/esm/schema/Schema.js

@@ -58,7 +58,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -273,8 +273,8 @@ export var Schema = /* @__PURE__ */ function(Map1) {
         return Object.entries(this.schema).map(function(param) {
           var _param = _sliced_to_array(param, 2), target = _param[0], schema = _param[1];
           return {
-            target,
-            schema
+            target: target,
+            schema: schema
           };
         });
       }

package/dist/esm/schema/index.js

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -11,7 +11,7 @@ function _define_property(obj, key, value) {
   }
   return obj;
 }
-import { ENTRY_NAME_PATTERN } from "@modern-js/utils/constants";
+import { ENTRY_NAME_PATTERN } from "@modern-js/utils";
 import { Schema } from "./Schema";
 var source = {
   entries: {

package/dist/esm/schema/legacy.js

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -11,7 +11,7 @@ function _define_property(obj, key, value) {
   }
   return obj;
 }
-import { ENTRY_NAME_PATTERN } from "@modern-js/utils/constants";
+import { ENTRY_NAME_PATTERN } from "@modern-js/utils";
 import { Schema } from "./Schema";
 var source = {
   entries: {

package/dist/esm/utils/config.js

@@ -30,7 +30,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -235,7 +235,7 @@ export var buildServerConfig = function() {
           return [
             4,
             bundle(configFilePath, _object_spread_props(_object_spread({}, options), {
-              getOutputFile,
+              getOutputFile: getOutputFile,
               esbuildPlugins: [
                 {
                   name: "native-build-config",

package/dist/esm/utils/createServer.js

@@ -30,7 +30,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/utils/getServerInternalPlugins.js

@@ -30,7 +30,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -203,7 +203,7 @@ function _getServerInternalPlugins() {
             return Object.assign(result, plugin);
           }, {});
           api.setAppContext(_object_spread_props(_object_spread({}, api.useAppContext()), {
-            serverInternalPlugins
+            serverInternalPlugins: serverInternalPlugins
           }));
           return [
             2,

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

@@ -11,8 +11,8 @@ export const NESTED_ROUTES_DIR = "routes";
 export const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
 export const LOADER_EXPORT_NAME = "loader";
 export const TEMP_LOADERS_DIR = "__loaders__";
-export const ENTRY_POINT_FILE_NAME = "index.js";
-export const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
+export const ENTRY_POINT_FILE_NAME = "index.jsx";
+export const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
 export const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
 export const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
 export const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";

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

@@ -1,6 +1,5 @@
 import path from "path";
-import { fs } from "@modern-js/utils";
-import { ROUTE_MANIFEST_FILE } from "@modern-js/utils/constants";
+import { fs, ROUTE_MANIFEST_FILE } from "@modern-js/utils";
 import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
 const PLUGIN_NAME = "ModernjsRoutePlugin";
 export class RouterPlugin {

package/dist/esm-node/initialize/index.js

@@ -82,9 +82,9 @@ function stabilizeConfig(resolve, config, keys) {
   });
 }
 async function getServerPort(config) {
-  const prodPort = config.server.port || 8080;
+  const prodPort = Number(process.env.PORT) || config.server.port || 8080;
   if (isDev() && isDevCommand()) {
-    return getPort(config.dev.port || prodPort);
+    return getPort(Number(process.env.PORT) || config.dev.port || prodPort);
   }
   return prodPort;
 }

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

@@ -1,4 +1,4 @@
-import { ENTRY_NAME_PATTERN } from "@modern-js/utils/constants";
+import { ENTRY_NAME_PATTERN } from "@modern-js/utils";
 import { Schema } from "./Schema";
 const source = {
   entries: {

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

@@ -1,4 +1,4 @@
-import { ENTRY_NAME_PATTERN } from "@modern-js/utils/constants";
+import { ENTRY_NAME_PATTERN } from "@modern-js/utils";
 import { Schema } from "./Schema";
 const source = {
   entries: {

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

@@ -6,8 +6,8 @@ export declare const NESTED_ROUTES_DIR = "routes";
 export declare const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
 export declare const LOADER_EXPORT_NAME = "loader";
 export declare const TEMP_LOADERS_DIR = "__loaders__";
-export declare const ENTRY_POINT_FILE_NAME = "index.js";
-export declare const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
+export declare const ENTRY_POINT_FILE_NAME = "index.jsx";
+export declare const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
 export declare const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: RegExp;
 export declare const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
 export declare const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";

package/package.json

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