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

Workaround babel override mistake #8391

Merged
merged 2 commits into from
Nov 7, 2023
Merged

Workaround babel override mistake #8391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
584ec62
fix(solo): use alternative endo init
mhofman Sep 25, 2023
877c1a1
fix(internal): severe override taming for bundle-source
mhofman Sep 27, 2023
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
9 changes: 8 additions & 1 deletion packages/internal/src/node/createBundles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* global process */
// Use modules not prefixed with `node:` since some deploy scripts may
// still be running in esm emulation
import path from 'path';
Expand Down Expand Up @@ -29,7 +30,13 @@ export const createBundlesFromAbsolute = async sourceBundles => {

for (const args of cacheToArgs.values()) {
console.log(BUNDLE_SOURCE_PROGRAM, ...args);
const { status } = spawnSync(prog, args, { stdio: 'inherit' });
const env = /** @type {NodeJS.ProcessEnv} */ (
/** @type {unknown} */ ({
__proto__: process.env,
mhofman marked this conversation as resolved.
Show resolved Hide resolved
LOCKDOWN_OVERRIDE_TAMING: 'severe',
})
);
const { status } = spawnSync(prog, args, { stdio: 'inherit', env });
status === 0 ||
Fail`${q(BUNDLE_SOURCE_PROGRAM)} failed with status ${q(status)}`;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/solo/src/entrypoint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'esm';

// we need to enable Math.random as a workaround for 'brace-expansion' module
// (dep chain: temp->glob->minimatch->brace-expansion)
import '@endo/init';
import '@endo/init/legacy.js';

import process from 'process';
import path from 'path';
Expand Down
2 changes: 1 addition & 1 deletion packages/solo/src/pipe-entrypoint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* global process */
// @ts-check
import '@endo/init/pre-bundle-source.js';
import '@endo/init';
import '@endo/init/unsafe-fast.js';

import { parse, stringify } from '@endo/marshal';
import { makePromiseKit } from '@endo/promise-kit';
Expand Down
Loading