diff --git a/.github/workflows/docker-publish-pre-check.yml b/.github/workflows/docker-publish-pre-check.yml index a42ece31d..68b15e93e 100644 --- a/.github/workflows/docker-publish-pre-check.yml +++ b/.github/workflows/docker-publish-pre-check.yml @@ -11,7 +11,7 @@ jobs: - name: Build run: docker build . env: - VERDACCIO_BUILD_REGISTRY: https://registry.verdaccio.org + VERDACCIO_BUILD_REGISTRY: https://registry.npmjs.org testVerdaccio: name: Test Verdaccio Publish diff --git a/.pnp.js b/.pnp.js index 6b245df26..6486c4a46 100755 --- a/.pnp.js +++ b/.pnp.js @@ -151,7 +151,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["ts-node", "virtual:7f7b3df50ee4b7b1719ad19fad11505dc2788f3227a7e5cc9ca19f71d8cb309c9d33b532ea2b2b60ab65abf6cc12153df4643c5e6e17d01ea0ae0492723bb4b4#npm:10.2.0"], ["typescript", "patch:typescript@npm%3A4.1.3#builtin::version=4.1.3&hash=a45b0e"], ["validator", "npm:13.6.0"], - ["verdaccio-audit", "npm:10.0.0"], + ["verdaccio-audit", "npm:10.0.1"], ["verdaccio-auth-memory", "npm:10.0.0"], ["verdaccio-htpasswd", "npm:10.0.0"], ["verdaccio-memory", "npm:10.0.0"] @@ -13197,6 +13197,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["node-fetch", [ + ["npm:2.6.0", { + "packageLocation": "./.yarn/cache/node-fetch-npm-2.6.0-29c7a53447-dd9f586a9f.zip/node_modules/node-fetch/", + "packageDependencies": [ + ["node-fetch", "npm:2.6.0"] + ], + "linkType": "HARD", + }], ["npm:2.6.1", { "packageLocation": "./.yarn/cache/node-fetch-npm-2.6.1-46c670dbc1-cbb171635e.zip/node_modules/node-fetch/", "packageDependencies": [ @@ -17065,7 +17072,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["ts-node", "virtual:7f7b3df50ee4b7b1719ad19fad11505dc2788f3227a7e5cc9ca19f71d8cb309c9d33b532ea2b2b60ab65abf6cc12153df4643c5e6e17d01ea0ae0492723bb4b4#npm:10.2.0"], ["typescript", "patch:typescript@npm%3A4.1.3#builtin::version=4.1.3&hash=a45b0e"], ["validator", "npm:13.6.0"], - ["verdaccio-audit", "npm:10.0.0"], + ["verdaccio-audit", "npm:10.0.1"], ["verdaccio-auth-memory", "npm:10.0.0"], ["verdaccio-htpasswd", "npm:10.0.0"], ["verdaccio-memory", "npm:10.0.0"] @@ -17074,12 +17081,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }] ]], ["verdaccio-audit", [ - ["npm:10.0.0", { - "packageLocation": "./.yarn/cache/verdaccio-audit-npm-10.0.0-449c810834-60969a3c26.zip/node_modules/verdaccio-audit/", + ["npm:10.0.1", { + "packageLocation": "./.yarn/cache/verdaccio-audit-npm-10.0.1-b900394416-1b3203c893.zip/node_modules/verdaccio-audit/", "packageDependencies": [ - ["verdaccio-audit", "npm:10.0.0"], + ["verdaccio-audit", "npm:10.0.1"], + ["body-parser", "npm:1.19.0"], ["express", "npm:4.17.1"], - ["request", "npm:2.88.2"] + ["https-proxy-agent", "npm:5.0.0"], + ["node-fetch", "npm:2.6.0"] ], "linkType": "HARD", }] diff --git a/.yarn/cache/node-fetch-npm-2.6.0-29c7a53447-dd9f586a9f.zip b/.yarn/cache/node-fetch-npm-2.6.0-29c7a53447-dd9f586a9f.zip new file mode 100644 index 000000000..e2966ad54 Binary files /dev/null and b/.yarn/cache/node-fetch-npm-2.6.0-29c7a53447-dd9f586a9f.zip differ diff --git a/.yarn/cache/verdaccio-audit-npm-10.0.0-449c810834-60969a3c26.zip b/.yarn/cache/verdaccio-audit-npm-10.0.0-449c810834-60969a3c26.zip deleted file mode 100644 index b3d60a120..000000000 Binary files a/.yarn/cache/verdaccio-audit-npm-10.0.0-449c810834-60969a3c26.zip and /dev/null differ diff --git a/.yarn/cache/verdaccio-audit-npm-10.0.1-b900394416-1b3203c893.zip b/.yarn/cache/verdaccio-audit-npm-10.0.1-b900394416-1b3203c893.zip new file mode 100644 index 000000000..7b0cff394 Binary files /dev/null and b/.yarn/cache/verdaccio-audit-npm-10.0.1-b900394416-1b3203c893.zip differ diff --git a/.yarnrc.yml b/.yarnrc.yml index 4184a116c..b7e08f705 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -8,7 +8,7 @@ httpRetry: 10 httpTimeout: 100000 -npmRegistryServer: "https://registry.verdaccio.org" +npmRegistryServer: "https://registry.npmjs.org" plugins: - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs diff --git a/Dockerfile b/Dockerfile index c487dff70..329a53d06 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM --platform=${BUILDPLATFORM:-linux/amd64} node:14.17.5-alpine as builder ENV NODE_ENV=production \ - VERDACCIO_BUILD_REGISTRY=https://registry.verdaccio.org \ + VERDACCIO_BUILD_REGISTRY=https://registry.npmjs.org \ HUSKY_SKIP_INSTALL=1 \ CI=true \ HUSKY_DEBUG=1 diff --git a/package.json b/package.json index 5902617fc..b7810b554 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "request": "2.88.0", "semver": "7.3.5", "validator": "13.6.0", - "verdaccio-audit": "10.0.0", + "verdaccio-audit": "10.0.1", "verdaccio-htpasswd": "10.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 9ba1081ee..0ed3e4ab8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7880,6 +7880,16 @@ fsevents@~2.1.2: languageName: node linkType: hard +"https-proxy-agent@npm:5.0.0, https-proxy-agent@npm:^5.0.0": + version: 5.0.0 + resolution: "https-proxy-agent@npm:5.0.0" + dependencies: + agent-base: 6 + debug: 4 + checksum: 18aa04ea08cc069fa0c83d03475d1bc43e13bfa43d5cffc0c3a07430f755e1ac914049570302775adac82aa5a779643ef2c6c270c057d7a8523a7f6f46b4866a + languageName: node + linkType: hard + "https-proxy-agent@npm:^4.0.0": version: 4.0.0 resolution: "https-proxy-agent@npm:4.0.0" @@ -7890,16 +7900,6 @@ fsevents@~2.1.2: languageName: node linkType: hard -"https-proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "https-proxy-agent@npm:5.0.0" - dependencies: - agent-base: 6 - debug: 4 - checksum: 18aa04ea08cc069fa0c83d03475d1bc43e13bfa43d5cffc0c3a07430f755e1ac914049570302775adac82aa5a779643ef2c6c270c057d7a8523a7f6f46b4866a - languageName: node - linkType: hard - "human-signals@npm:^1.1.1": version: 1.1.1 resolution: "human-signals@npm:1.1.1" @@ -10445,6 +10445,13 @@ fsevents@~2.1.2: languageName: node linkType: hard +"node-fetch@npm:2.6.0": + version: 2.6.0 + resolution: "node-fetch@npm:2.6.0" + checksum: dd9f586a9f7ddb7dd94d2aba9cb693d32f5001e9850098512fbc8a4cbdd56838afa08ed0a6725b9fce9b01ec12b713e622cbfc16d92762d8b937b238330a632a + languageName: node + linkType: hard + "node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1": version: 2.6.1 resolution: "node-fetch@npm:2.6.1" @@ -11984,7 +11991,7 @@ fsevents@~2.1.2: languageName: node linkType: hard -"request@npm:2.88.2, request@npm:^2.88.0, request@npm:^2.88.2": +"request@npm:^2.88.0, request@npm:^2.88.2": version: 2.88.2 resolution: "request@npm:2.88.2" dependencies: @@ -13893,13 +13900,15 @@ typescript@4.1.3: languageName: node linkType: hard -"verdaccio-audit@npm:10.0.0": - version: 10.0.0 - resolution: "verdaccio-audit@npm:10.0.0" +"verdaccio-audit@npm:10.0.1": + version: 10.0.1 + resolution: "verdaccio-audit@npm:10.0.1" dependencies: + body-parser: 1.19.0 express: 4.17.1 - request: 2.88.2 - checksum: 60969a3c26767b0f1ace2273469e6ec4afdc7b0b926465379dee6539feb363f4156febf650dc889ecf4c9fee37110ada5c541e7153bc628af71254e53661c768 + https-proxy-agent: 5.0.0 + node-fetch: 2.6.0 + checksum: 1b3203c893117c355fc6df879aaef97924925dd5965b8c0cf7ebe63e029c5796ad9d4ac0ed63fcc22903367511dd4aa0c5bf867da05043ab43b8a6cfe3a75655 languageName: node linkType: hard @@ -14054,7 +14063,7 @@ typescript@4.1.3: ts-node: 10.2.0 typescript: 4.1.3 validator: 13.6.0 - verdaccio-audit: 10.0.0 + verdaccio-audit: 10.0.1 verdaccio-auth-memory: 10.0.0 verdaccio-htpasswd: 10.0.0 verdaccio-memory: 10.0.0