Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enhancement/issue 1273 provide fully synced compilation to custom loader script and resource plugins #1274

Merged
merged 1 commit into from
Sep 6, 2024
Merged

enhancement/issue 1273 provide fully synced compilation to custom loader script and resource plugins #1274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/cli/src/lifecycles/compile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { checkResourceExists } from '../lib/resource-utils.js';
import { generateGraph } from './graph.js';
import { initContext } from './context.js';
import { readAndMergeConfig } from './config.js';
import fs from 'fs/promises';
import { readAndMergeConfig as initConfig } from './config.js';

const generateCompilation = () => {
return new Promise(async (resolve, reject) => {
Expand All @@ -20,7 +20,7 @@ const generateCompilation = () => {
};

console.info('Initializing project config');
compilation.config = await initConfig();
compilation.config = await readAndMergeConfig();

// determine whether to use default layout or user detected workspace
console.info('Initializing project workspace contexts');
Expand Down
17 changes: 7 additions & 10 deletions packages/cli/src/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
import { readAndMergeConfig as initConfig } from './lifecycles/config.js';
import { readAndMergeConfig } from './lifecycles/config.js';
import { initContext } from './lifecycles/context.js';
import { mergeResponse } from './lib/resource-utils.js';

const config = await initConfig();
const config = await readAndMergeConfig();
const context = await initContext({ config });

const resourcePlugins = config.plugins
.filter(plugin => plugin.type === 'resource')
.filter(plugin => plugin.name !== 'plugin-node-modules:resource' && plugin.name !== 'plugin-user-workspace')
.map(plugin => plugin.provider({
context: {
outputDir: new URL(`file://${process.cwd()}/public`),
projectDirectory: new URL(`file://${process.cwd()}/`),
scratchDir: new URL(`file://${process.cwd()}/.greenwood/`)
},
config: {
devServer: {}
},
context,
config,
graph: []
}));

Expand Down
Loading