Skip to content

Commit 73f182e

Browse files
authored
Merge pull request #1 from nodejs/main
rev mrge
2 parents f752ac0 + 1ea93c7 commit 73f182e

File tree

9 files changed

+1170
-407
lines changed

9 files changed

+1170
-407
lines changed

β€Ž.github/workflows/tools.ymlβ€Ž

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,6 @@ jobs:
121121
run: |
122122
make corepack-update
123123
echo "NEW_VERSION=$(node deps/corepack/dist/corepack.js --version)" >> $GITHUB_ENV
124-
- id: doc-kit
125-
subsystem: tools
126-
label: tools
127-
run: |
128-
./tools/dep_updaters/update-doc.sh > temp-output
129-
cat temp-output
130-
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
131-
rm temp-output
132124
- id: googletest
133125
subsystem: deps
134126
label: dependencies, test

β€ŽMakefileβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ ifeq ($(OSTYPE),os400)
384384
DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
385385
endif
386386

387-
DOC_KIT ?= tools/doc/node_modules/@nodejs/doc-kit/bin/cli.mjs
387+
DOC_KIT ?= tools/doc/node_modules/@node-core/doc-kit/bin/cli.mjs
388388

389389
node_use_openssl_and_icu = $(call available-node,"-p" \
390390
"process.versions.openssl != undefined && process.versions.icu != undefined")

β€Žlib/repl.jsβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,10 +1132,10 @@ class REPLServer extends Interface {
11321132
session.once('Runtime.executionContextCreated', ({ params }) => {
11331133
this[kContextId] = params.context.id;
11341134
});
1135-
context = vm.createContext();
1135+
context = vm.createContext(vm.constants.DONT_CONTEXTIFY);
11361136
session.post('Runtime.disable');
11371137
}, () => {
1138-
context = vm.createContext();
1138+
context = vm.createContext(vm.constants.DONT_CONTEXTIFY);
11391139
});
11401140
ArrayPrototypeForEach(ObjectGetOwnPropertyNames(globalThis), (name) => {
11411141
// Only set properties that do not already exist as a global builtin.

β€Žtest/parallel/test-debugger-run-after-quit-restart.jsβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const path = require('path');
4141
.then(() => {
4242
assert.match(cli.output, /Use `run` to start the app again/);
4343
})
44-
.then(() => cli.stepCommand('run'))
44+
.then(() => cli.command('run'))
4545
.then(() => cli.waitForInitialBreak())
4646
.then(() => cli.waitForPrompt())
4747
.then(() => {
@@ -71,7 +71,7 @@ const path = require('path');
7171
.then(() => {
7272
assert.match(cli.output, /Use `run` to start the app again/);
7373
})
74-
.then(() => cli.stepCommand('run'))
74+
.then(() => cli.command('run'))
7575
.then(() => cli.waitForInitialBreak())
7676
.then(() => cli.waitForPrompt())
7777
.then(() => {

β€Žtools/dep_updaters/update-doc.shβ€Ž

Lines changed: 0 additions & 26 deletions
This file was deleted.

β€Žtools/doc/get-latest-commit.mjsβ€Ž

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
Β (0)