-
Notifications
You must be signed in to change notification settings - Fork 3.3k
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.
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
fix: windows #22234
fix: windows #22234
Changes from 9 commits
6479eda
26ce935
5a5296b
88a7438
e7ebf63
30cffe7
0456b00
a39cbc6
19d6f1b
06d252f
eb09ea3
94f46e4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,9 +32,6 @@ import { | |
} from '../sources/migration' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just to clarify for reviewers: every file change below this line is reverted from #22118 and you don't need to review it to review this PR. |
||
import { makeCoreData } from '../data' | ||
import { LegacyPluginsIpc } from '../data/LegacyPluginsIpc' | ||
import { hasTypeScriptInstalled } from '../util' | ||
|
||
const tsNode = require.resolve('@packages/server/lib/plugins/child/register_ts_node') | ||
|
||
export function getConfigWithDefaults (legacyConfig: any) { | ||
const newConfig = _.cloneDeep(legacyConfig) | ||
|
@@ -91,23 +88,6 @@ export async function processConfigViaLegacyPlugins (projectRoot: string, legacy | |
const configProcessArgs = ['--projectRoot', projectRoot, '--file', cwd] | ||
const CHILD_PROCESS_FILE_PATH = require.resolve('@packages/server/lib/plugins/child/require_async_child') | ||
|
||
// use ts-node if they've got typescript installed | ||
// this matches the 9.x behavior, which is what we want for | ||
// processing legacy pluginsFile (we never supported `"type": "module") in 9.x. | ||
if (hasTypeScriptInstalled(projectRoot)) { | ||
const tsNodeLoader = `--require ${tsNode}` | ||
|
||
if (!childOptions.env) { | ||
childOptions.env = {} | ||
} | ||
|
||
if (childOptions.env.NODE_OPTIONS) { | ||
childOptions.env.NODE_OPTIONS += ` ${tsNodeLoader}` | ||
} else { | ||
childOptions.env.NODE_OPTIONS = tsNodeLoader | ||
} | ||
} | ||
|
||
const childProcess = fork(CHILD_PROCESS_FILE_PATH, configProcessArgs, childOptions) | ||
const ipc = new LegacyPluginsIpc(childProcess) | ||
|
||
|
This file was deleted.
This file was deleted.
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A little unsettling that we don't know why this is required, but glad to have windows CI back to green.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed. 😕