Skip to content

Commit 84db8ea

Browse files
provide fully synced compilation to custom loader script and resource plugins (#1274)
1 parent 16c2a99 commit 84db8ea

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

packages/cli/src/lifecycles/compile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { checkResourceExists } from '../lib/resource-utils.js';
22
import { generateGraph } from './graph.js';
33
import { initContext } from './context.js';
4+
import { readAndMergeConfig } from './config.js';
45
import fs from 'fs/promises';
5-
import { readAndMergeConfig as initConfig } from './config.js';
66

77
const generateCompilation = () => {
88
return new Promise(async (resolve, reject) => {
@@ -20,7 +20,7 @@ const generateCompilation = () => {
2020
};
2121

2222
console.info('Initializing project config');
23-
compilation.config = await initConfig();
23+
compilation.config = await readAndMergeConfig();
2424

2525
// determine whether to use default layout or user detected workspace
2626
console.info('Initializing project workspace contexts');

packages/cli/src/loader.js

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
import { readAndMergeConfig as initConfig } from './lifecycles/config.js';
1+
import { readAndMergeConfig } from './lifecycles/config.js';
2+
import { initContext } from './lifecycles/context.js';
23
import { mergeResponse } from './lib/resource-utils.js';
34

4-
const config = await initConfig();
5+
const config = await readAndMergeConfig();
6+
const context = await initContext({ config });
7+
58
const resourcePlugins = config.plugins
69
.filter(plugin => plugin.type === 'resource')
710
.filter(plugin => plugin.name !== 'plugin-node-modules:resource' && plugin.name !== 'plugin-user-workspace')
811
.map(plugin => plugin.provider({
9-
context: {
10-
outputDir: new URL(`file://${process.cwd()}/public`),
11-
projectDirectory: new URL(`file://${process.cwd()}/`),
12-
scratchDir: new URL(`file://${process.cwd()}/.greenwood/`)
13-
},
14-
config: {
15-
devServer: {}
16-
},
12+
context,
13+
config,
1714
graph: []
1815
}));
1916

0 commit comments

Comments
 (0)