Skip to content

Commit 227c5d7

Browse files
committed
build: remove the reset of corepack
Refs: - nodejs/TSC#1697 (comment) - #57617
1 parent 214e3d4 commit 227c5d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+5
-25577
lines changed

.gitattributes

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ test/fixtures/* -text
22
vcbuild.bat text eol=crlf
33
deps/npm/bin/npm text eol=lf
44
deps/npm/bin/npx text eol=lf
5-
deps/corepack/shims/corepack text eol=lf
65
tools/msvs/find_python.cmd text eol=crlf
76
doc/**/*.md text eol=lf

.github/workflows/tools.yml

-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ on:
2020
- brotli
2121
- c-ares
2222
- cjs-module-lexer
23-
- corepack
2423
- doc
2524
- googletest
2625
- gyp-next
@@ -112,12 +111,6 @@ jobs:
112111
cat temp-output
113112
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
114113
rm temp-output
115-
- id: corepack
116-
subsystem: deps
117-
label: dependencies
118-
run: |
119-
make corepack-update
120-
echo "NEW_VERSION=$(node deps/corepack/dist/corepack.js --version)" >> $GITHUB_ENV
121114
- id: doc
122115
subsystem: tools
123116
label: tools

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ _UpgradeReport_Files/
6464
*.wixobj
6565
/tools/msvs/genfiles/
6666
/npm.wxs
67-
/corepack.wxs
6867
/tools/msvs/msi/**/Release/
6968
/tools/msvs/msi/**/obj/
7069
/tools/msvs/msi/**/x64/

LICENSE

-11
Original file line numberDiff line numberDiff line change
@@ -986,17 +986,6 @@ The externally maintained libraries used by Node.js are:
986986
USE OR OTHER DEALINGS IN THE SOFTWARE.
987987
"""
988988

989-
- corepack, located at deps/corepack, is licensed as follows:
990-
"""
991-
**Copyright © Corepack contributors**
992-
993-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
994-
995-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
996-
997-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
998-
"""
999-
1000989
- undici, located at deps/undici, is licensed as follows:
1001990
"""
1002991
MIT License

Makefile

-12
Original file line numberDiff line numberDiff line change
@@ -1190,18 +1190,6 @@ endif
11901190
.PHONY: pkg
11911191
pkg: $(PKG) ## Build the macOS installer for releases.
11921192

1193-
.PHONY: corepack-update
1194-
corepack-update: ## Update Corepack to the latest version.
1195-
mkdir -p /tmp/node-corepack
1196-
curl -qLo /tmp/node-corepack/package.tgz "$$($(call available-node,$(NPM) view corepack dist.tarball))"
1197-
1198-
rm -rf deps/corepack && mkdir deps/corepack
1199-
cd deps/corepack && tar xf /tmp/node-corepack/package.tgz --strip-components=1
1200-
chmod +x deps/corepack/shims/*
1201-
1202-
$(call available-node,'-p' \
1203-
'require(`./deps/corepack/package.json`).version')
1204-
12051193
.PHONY: pkg-upload
12061194
# Note: this is strictly for release builds on release machines only.
12071195
pkg-upload: pkg

SECURITY.md

-7
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,6 @@ the community they pose.
236236
that artifact is large enough to impact performance or
237237
cause the runtime to run out of resources.
238238

239-
#### Vulnerabilities affecting software downloaded by Corepack
240-
241-
* Corepack defaults to downloading the latest version of the software requested
242-
by the user, or a specific version requested by the user. For this reason,
243-
Node.js releases won't be affected by such vulnerabilities. Users are
244-
responsible for keeping the software they use through Corepack up-to-date.
245-
246239
## Assessing experimental features reports
247240

248241
Experimental features are eligible to reports as any other stable feature of

benchmark/misc/startup-cli-version.js

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const availableCli = [
1414
'tools/eslint/node_modules/eslint/bin/eslint.js',
1515
'deps/npm/bin/npx-cli.js',
1616
'deps/npm/bin/npm-cli.js',
17-
'deps/corepack/dist/corepack.js',
1817
].filter((cli) => existsSync(path.resolve(__dirname, '../../', cli)));
1918
const bench = common.createBenchmark(main, {
2019
cli: availableCli,

configure.py

-7
Original file line numberDiff line numberDiff line change
@@ -813,12 +813,6 @@
813813
default=None,
814814
help='do not install the bundled npm (package manager)')
815815

816-
parser.add_argument('--with-corepack',
817-
action='store_true',
818-
dest='with_corepack',
819-
default=None,
820-
help='do install the bundled Corepack (experimental, will be removed without notice)')
821-
822816
parser.add_argument('--control-flow-guard',
823817
action='store_true',
824818
dest='enable_cfg',
@@ -1448,7 +1442,6 @@ def configure_node(o):
14481442
o['variables']['OS'] = 'android'
14491443
o['variables']['node_prefix'] = options.prefix
14501444
o['variables']['node_install_npm'] = b(not options.without_npm)
1451-
o['variables']['node_install_corepack'] = b(options.with_corepack)
14521445
o['variables']['control_flow_guard'] = b(options.enable_cfg)
14531446
o['variables']['node_use_amaro'] = b(not options.without_amaro)
14541447
o['variables']['debug_node'] = b(options.debug_node)

0 commit comments

Comments
 (0)