Skip to content

Commit

Permalink
deps: remove corepack
Browse files Browse the repository at this point in the history
Fixes: #51888
  • Loading branch information
darcyclarke committed Mar 6, 2024
1 parent 384fd17 commit 38b97a8
Show file tree
Hide file tree
Showing 76 changed files with 30 additions and 26,175 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ test/fixtures/* -text
vcbuild.bat text eol=crlf
deps/npm/bin/npm text eol=lf
deps/npm/bin/npx text eol=lf
deps/corepack/shims/corepack text eol=lf
tools/msvs/find_python.cmd text eol=crlf
7 changes: 0 additions & 7 deletions .github/workflows/tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ on:
- brotli
- c-ares
- cjs-module-lexer
- corepack
- doc
- eslint
- github_reporter
Expand Down Expand Up @@ -112,12 +111,6 @@ jobs:
cat temp-output
tail -n1 temp-output | grep "NEW_VERSION=" >> "$GITHUB_ENV" || true
rm temp-output
- id: corepack
subsystem: deps
label: dependencies
run: |
make corepack-update
echo "NEW_VERSION=$(node deps/corepack/dist/corepack.js --version)" >> $GITHUB_ENV
- id: doc
subsystem: tools
label: tools
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ _UpgradeReport_Files/
*.wixobj
/tools/msvs/genfiles/
/npm.wxs
/corepack.wxs
/tools/msvs/msi/**/Release/
/tools/msvs/msi/**/obj/
/tools/msvs/msi/**/x64/
Expand Down
11 changes: 0 additions & 11 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -726,17 +726,6 @@ The externally maintained libraries used by Node.js are:
USE OR OTHER DEALINGS IN THE SOFTWARE.
"""

- corepack, located at deps/corepack, is licensed as follows:
"""
**Copyright © Corepack contributors**

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:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

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.
"""

- undici, located at deps/undici, is licensed as follows:
"""
MIT License
Expand Down
11 changes: 0 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1143,17 +1143,6 @@ endif
# Builds the macOS installer for releases.
pkg: $(PKG)

.PHONY: corepack-update
corepack-update:
mkdir -p /tmp/node-corepack
curl -qLo /tmp/node-corepack/package.tgz "$$(npm view corepack dist.tarball)"

rm -rf deps/corepack && mkdir deps/corepack
cd deps/corepack && tar xf /tmp/node-corepack/package.tgz --strip-components=1
chmod +x deps/corepack/shims/*

node deps/corepack/dist/corepack.js --version

.PHONY: pkg-upload
# Note: this is strictly for release builds on release machines only.
pkg-upload: pkg
Expand Down
7 changes: 0 additions & 7 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,6 @@ the community they pose.
that artifact is large enough to impact performance or
cause the runtime to run out of resources.

#### Vulnerabilities affecting software downloaded by Corepack

* Corepack defaults to downloading the latest version of the software requested
by the user, or a specific version requested by the user. For this reason,
Node.js releases won't be affected by such vulnerabilities, users are
responsible to keep the software they use through Corepack up-to-date.

## Assessing experimental features reports

Experimental features are eligible to reports as any other stable feature of
Expand Down
1 change: 0 additions & 1 deletion benchmark/misc/startup-cli-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const bench = common.createBenchmark(main, {
'tools/node_modules/eslint/bin/eslint.js',
'deps/npm/bin/npx-cli.js',
'deps/npm/bin/npm-cli.js',
'deps/corepack/dist/corepack.js',
],
count: [30],
});
Expand Down
7 changes: 0 additions & 7 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -668,12 +668,6 @@
default=None,
help='do not install the bundled npm (package manager)')

parser.add_argument('--without-corepack',
action='store_true',
dest='without_corepack',
default=None,
help='do not install the bundled Corepack')

# Dummy option for backwards compatibility
parser.add_argument('--without-report',
action='store_true',
Expand Down Expand Up @@ -1254,7 +1248,6 @@ def configure_node(o):
o['variables']['OS'] = 'android'
o['variables']['node_prefix'] = options.prefix
o['variables']['node_install_npm'] = b(not options.without_npm)
o['variables']['node_install_corepack'] = b(not options.without_corepack)
o['variables']['debug_node'] = b(options.debug_node)
o['default_configuration'] = 'Debug' if options.debug else 'Release'
o['variables']['error_on_warn'] = b(options.error_on_warn)
Expand Down
Loading

0 comments on commit 38b97a8

Please sign in to comment.