Skip to content

Commit

Permalink
fix: remove serverConfigV2 build
Browse files Browse the repository at this point in the history
  • Loading branch information
GiveMe-A-Name committed Jun 13, 2024
1 parent 90f74f2 commit 720d748
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 80 deletions.
16 changes: 2 additions & 14 deletions packages/solutions/app-tools/src/commands/build.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { PluginAPI, ResolvedConfigContext } from '@modern-js/core';
import { getMeta, logger } from '@modern-js/utils';
import { logger } from '@modern-js/utils';
import { generateRoutes } from '../utils/routes';
import { buildServerConfig, buildServerConfigV2 } from '../utils/config';
import { buildServerConfig } from '../utils/config';
import type { BuildOptions } from '../utils/types';
import type { AppTools } from '../types';
import { registerCompiler } from '../utils/register';
import { loadServerPlugins } from '../utils/loadPlugins';

export const build = async (
api: PluginAPI<AppTools<'shared'>>,
Expand All @@ -28,11 +27,6 @@ export const build = async (

const { apiOnly } = appContext;

await loadServerPlugins(api, appContext.appDirectory);

const meta = getMeta(appContext.metaName);
const serverConfigFileV2 = `${meta}.server`;

if (apiOnly) {
const { appDirectory, distDirectory, serverConfigFile } = appContext;
await hookRunners.beforeBuild({
Expand Down Expand Up @@ -67,12 +61,6 @@ export const build = async (
configFile: serverConfigFile,
});

await buildServerConfigV2({
appDirectory,
distDirectory,
configFile: serverConfigFileV2,
});

logger.info('Starting production build...');
if (!appContext.builder) {
throw new Error(
Expand Down
66 changes: 0 additions & 66 deletions packages/solutions/app-tools/src/utils/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,72 +72,6 @@ export const buildServerConfig = async ({
}
};

export const buildServerConfigV2 = async ({
appDirectory,
distDirectory,
configFile,
options,
watch,
}: {
appDirectory: string;
distDirectory: string;
configFile: string;
options?: Parameters<typeof bundle>[1];
watch?: boolean;
}) => {
const configFilePath = await getServerConfig(
appDirectory,
`server/${configFile}`,
);

const getOutputFile = async (filepath: string) =>
path.resolve(
distDirectory,
`${filepath.replace(
new RegExp(CONFIG_FILE_EXTENSIONS.join('|')),
'',
)}.js`,
);

if (configFilePath) {
const configHelperFilePath = path.normalize(
path.join(distDirectory, './config-helper.js'),
);
const helperCode = `
export const defineConfig = (config) => config;
`;

await fs.ensureDir(distDirectory);
await fs.writeFile(configHelperFilePath, helperCode);
await bundle(configFilePath, {
...options,
watch,
getOutputFile,
esbuildPlugins: [
{
name: 'native-build-config',
setup(ctx) {
ctx.onResolve(
{
filter: /app-tools\/server/,
},
() => {
return {
path: configHelperFilePath,
};
},
);
},
},
],
});

const fileBasename = path.basename(configFilePath);
return getOutputFile(fileBasename);
}
return undefined;
};

/**
*
* 处理循环引用的 replacer
Expand Down

0 comments on commit 720d748

Please sign in to comment.