@modern-js/app-tools 1.4.7-canary.0 → 1.4.7-canary.1

package/dist/js/modern/commands/build.js

@@ -12,8 +12,7 @@ import { generateRoutes } from "../utils/routes";
 import { buildServerConfig, emitResolvedConfig } from "../utils/config";
 // These sizes are pretty large. We'll warn for bundles exceeding them.
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024; // eslint-disable-next-line max-statements
-
+const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
 export const build = async (api, options) => {
   const resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
@@ -98,7 +97,11 @@ export const build = async (api, options) => {
   } = appContext;
   const previousFileSizes = await measureFileSizesBeforeBuild(distDirectory);
   await emptyDir(distDirectory);
-  await buildServerConfig(appDirectory, serverConfigFile);
+  await buildServerConfig({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile
+  });
   const buildConfigs = [];
   buildConfigs.push({
     type: 'legacy',

package/dist/js/modern/commands/dev.js

@@ -29,9 +29,14 @@ export const dev = async (api, options) => {
   }));
   appContext.checkedEntries = checkedEntries;
   fs.emptyDirSync(distDirectory);
-  await buildServerConfig(appDirectory, serverConfigFile, {
-    esbuildOptions: {
-      watch: true
+  await buildServerConfig({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile,
+    options: {
+      esbuildOptions: {
+        watch: true
+      }
     }
   });
   await hookRunners.beforeDev();

package/dist/js/modern/utils/config.js

@@ -6,16 +6,40 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import * as path from 'path';
 import { bundle } from '@modern-js/node-bundle-require';
-import { CONFIG_CACHE_DIR, CONFIG_FILE_EXTENSIONS, fs, getServerConfig, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
+import { CONFIG_FILE_EXTENSIONS, fs, getServerConfig, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
 export const defineServerConfig = config => config;
-export const buildServerConfig = async (appDirectory, configFile, options) => {
+export const buildServerConfig = async ({
+  appDirectory,
+  distDirectory,
+  configFile,
+  options
+}) => {
+  const helperCode = `
+    export const defineConfig = (config) => config;
+  `;
   const configFilePath = await getServerConfig(appDirectory, configFile);
 
-  const getOutputFile = filepath => path.resolve(CONFIG_CACHE_DIR, `${filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
+  const getOutputFile = filepath => path.resolve(distDirectory, `${filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
 
   if (configFilePath) {
+    const configHelperFilePath = path.join(distDirectory, './config-helper.js');
+    await fs.writeFile(configHelperFilePath, helperCode);
     await bundle(configFilePath, _objectSpread(_objectSpread({}, options), {}, {
-      getOutputFile
+      getOutputFile,
+      esbuildPlugins: [{
+        name: 'native-build-config',
+
+        setup(ctx) {
+          ctx.onResolve({
+            filter: /app-tools\/server/
+          }, () => {
+            return {
+              path: configHelperFilePath
+            };
+          });
+        }
+
+      }]
     }));
   }
 };

package/dist/js/node/commands/build.js

@@ -25,7 +25,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 // These sizes are pretty large. We'll warn for bundles exceeding them.
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024; // eslint-disable-next-line max-statements
+const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
 
 const build = async (api, options) => {
   const resolvedConfig = api.useResolvedConfigContext();
@@ -115,7 +115,11 @@ const build = async (api, options) => {
   } = appContext;
   const previousFileSizes = await (0, _utils.measureFileSizesBeforeBuild)(distDirectory);
   await (0, _utils.emptyDir)(distDirectory);
-  await (0, _config.buildServerConfig)(appDirectory, serverConfigFile);
+  await (0, _config.buildServerConfig)({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile
+  });
   const buildConfigs = [];
   buildConfigs.push({
     type: 'legacy',

package/dist/js/node/commands/dev.js

@@ -49,9 +49,14 @@ const dev = async (api, options) => {
 
   _utils.fs.emptyDirSync(distDirectory);
 
-  await (0, _config.buildServerConfig)(appDirectory, serverConfigFile, {
-    esbuildOptions: {
-      watch: true
+  await (0, _config.buildServerConfig)({
+    appDirectory,
+    distDirectory,
+    configFile: serverConfigFile,
+    options: {
+      esbuildOptions: {
+        watch: true
+      }
     }
   });
   await hookRunners.beforeDev();

package/dist/js/node/utils/config.js

@@ -25,14 +25,38 @@ const defineServerConfig = config => config;
 
 exports.defineServerConfig = defineServerConfig;
 
-const buildServerConfig = async (appDirectory, configFile, options) => {
+const buildServerConfig = async ({
+  appDirectory,
+  distDirectory,
+  configFile,
+  options
+}) => {
+  const helperCode = `
+    export const defineConfig = (config) => config;
+  `;
   const configFilePath = await (0, _utils.getServerConfig)(appDirectory, configFile);
 
-  const getOutputFile = filepath => path.resolve(_utils.CONFIG_CACHE_DIR, `${filepath.replace(new RegExp(_utils.CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
+  const getOutputFile = filepath => path.resolve(distDirectory, `${filepath.replace(new RegExp(_utils.CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
 
   if (configFilePath) {
+    const configHelperFilePath = path.join(distDirectory, './config-helper.js');
+    await _utils.fs.writeFile(configHelperFilePath, helperCode);
     await (0, _nodeBundleRequire.bundle)(configFilePath, _objectSpread(_objectSpread({}, options), {}, {
-      getOutputFile
+      getOutputFile,
+      esbuildPlugins: [{
+        name: 'native-build-config',
+
+        setup(ctx) {
+          ctx.onResolve({
+            filter: /app-tools\/server/
+          }, () => {
+            return {
+              path: configHelperFilePath
+            };
+          });
+        }
+
+      }]
     }));
   }
 };

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

@@ -2,7 +2,17 @@ import { bundle } from '@modern-js/node-bundle-require';
 import type { NormalizedConfig } from '@modern-js/core';
 import type { ServerConfig } from '@modern-js/server-core';
 export declare const defineServerConfig: (config: ServerConfig) => ServerConfig;
-export declare const buildServerConfig: (appDirectory: string, configFile: string, options?: Parameters<typeof bundle>[1]) => Promise<void>;
+export declare const buildServerConfig: ({
+  appDirectory,
+  distDirectory,
+  configFile,
+  options
+}: {
+  appDirectory: string;
+  distDirectory: string;
+  configFile: string;
+  options?: Parameters<typeof bundle>[1];
+}) => Promise<void>;
 /**
  *
  * 处理循环引用的 replacer

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.7-canary.0",
+  "version": "1.4.7-canary.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",