From 1ed2478c22730496256d41a66a6a883df940d098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 5 May 2023 21:34:34 +0200 Subject: [PATCH] Revert sanitization of package name I think this was a mistake from the beginning. The specs added after reverting the patch still pass without the change, and the commit message reads: "JS: Sanitize spaces in filenames", while there's no filename involved here whatsoever, just the package name. This commit reverts c5b1fe6c958b8dbfaeeaca5c96ffddca60a5076d and 2864404857f4918a323a4109cd38cbb8ae0285a4. --- .../file_updater/yarn_lockfile_updater.rb | 7 +- .../npm_and_yarn/file_updater_spec.rb | 20 --- .../npm6/invalid_name/package-lock.json | 75 -------- .../projects/npm6/invalid_name/package.json | 24 --- .../npm8/invalid_name/package-lock.json | 164 ------------------ .../projects/npm8/invalid_name/package.json | 22 --- 6 files changed, 1 insertion(+), 311 deletions(-) delete mode 100644 npm_and_yarn/spec/fixtures/projects/npm6/invalid_name/package-lock.json delete mode 100644 npm_and_yarn/spec/fixtures/projects/npm6/invalid_name/package.json delete mode 100644 npm_and_yarn/spec/fixtures/projects/npm8/invalid_name/package-lock.json delete mode 100644 npm_and_yarn/spec/fixtures/projects/npm8/invalid_name/package.json diff --git a/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/yarn_lockfile_updater.rb b/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/yarn_lockfile_updater.rb index 37d4d8a98fc..aee6883934c 100644 --- a/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/yarn_lockfile_updater.rb +++ b/npm_and_yarn/lib/dependabot/npm_and_yarn/file_updater/yarn_lockfile_updater.rb @@ -575,15 +575,10 @@ def yarnrc_content end def sanitized_package_json_content(content) - updated_content = - content. + content. gsub(/\{\{[^\}]*?\}\}/, "something"). # {{ nm }} syntax not allowed gsub(/(?= 0.6" - } - }, - "node_modules/fetch-factory": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/fetch-factory/-/fetch-factory-0.0.1.tgz", - "integrity": "sha1-4AdgWb2zHjFHx1s7jAQTO6jH4HE=", - "dependencies": { - "es6-promise": "^3.0.2", - "isomorphic-fetch": "^2.1.1", - "lodash": "^3.10.1" - } - }, - "node_modules/iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/isomorphic-fetch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", - "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", - "dependencies": { - "node-fetch": "^1.0.1", - "whatwg-fetch": ">=0.10.0" - } - }, - "node_modules/lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" - }, - "node_modules/node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "dependencies": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - }, - "node_modules/whatwg-fetch": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", - "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=" - } - }, - "dependencies": { - "encoding": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", - "requires": { - "iconv-lite": "~0.4.13" - } - }, - "es6-promise": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", - "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=" - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "dev": true - }, - "fetch-factory": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/fetch-factory/-/fetch-factory-0.0.1.tgz", - "integrity": "sha1-4AdgWb2zHjFHx1s7jAQTO6jH4HE=", - "requires": { - "es6-promise": "^3.0.2", - "isomorphic-fetch": "^2.1.1", - "lodash": "^3.10.1" - } - }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" - }, - "isomorphic-fetch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", - "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", - "requires": { - "node-fetch": "^1.0.1", - "whatwg-fetch": ">=0.10.0" - } - }, - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" - }, - "node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - }, - "whatwg-fetch": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", - "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=" - } - } -} diff --git a/npm_and_yarn/spec/fixtures/projects/npm8/invalid_name/package.json b/npm_and_yarn/spec/fixtures/projects/npm8/invalid_name/package.json deleted file mode 100644 index 39d532641bf..00000000000 --- a/npm_and_yarn/spec/fixtures/projects/npm8/invalid_name/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "Spaces are invalid", - "version": "1.0.0", - "description": "", - "main": "index.js", - "repository": { - "type": "git", - "url": "git+https://github.com/waltfy/PROTO_TEST.git" - }, - "author": "", - "license": "ISC", - "bugs": { - "url": "https://github.com/waltfy/PROTO_TEST/issues" - }, - "homepage": "https://github.com/waltfy/PROTO_TEST#readme", - "dependencies": { - "fetch-factory": "^0.0.1" - }, - "devDependencies": { - "etag": "^1.0.0" - } -}