From 81009bc2459f87988930c4ea6957e1b95395e792 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Aug 2021 19:40:21 +0000 Subject: [PATCH] fix(deps): update netlify build packages (major) (#3139) * fix(deps): update netlify build packages * chore: use new `@netlify/config` interface Co-authored-by: Renovate Bot Co-authored-by: ehmicky --- npm-shrinkwrap.json | 59 ++++++++++++++++++++++++++++++------------ package.json | 4 +-- src/commands/deploy.js | 4 +-- 3 files changed, 46 insertions(+), 21 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index a9441812897..24b909dde02 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -10,8 +10,8 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@netlify/build": "^17.11.0", - "@netlify/config": "^14.4.3", + "@netlify/build": "^18.0.2", + "@netlify/config": "^15.0.1", "@netlify/framework-info": "^5.8.0", "@netlify/local-functions-proxy": "^1.1.0", "@netlify/plugin-edge-handlers": "^1.11.22", @@ -2311,13 +2311,13 @@ } }, "node_modules/@netlify/build": { - "version": "17.11.0", - "resolved": "https://registry.npmjs.org/@netlify/build/-/build-17.11.0.tgz", - "integrity": "sha512-c9f28mJJMspXP7H1oDH9Mlg1+UgSxJVktPronJPrzoiMQzvEz/AuWjgn37OMopzfTJumOfSxorWlj0YTZyj3Lw==", + "version": "18.0.2", + "resolved": "https://registry.npmjs.org/@netlify/build/-/build-18.0.2.tgz", + "integrity": "sha512-Ki3g6L+GXyWrebyhDJbmYGNoXmZtaa6Dt3c7NEINs2cWYx+pmCcfMdEwjRQEJrR17wzN2mSxIetHg+Y0Po2iEw==", "dependencies": { "@bugsnag/js": "^7.0.0", "@netlify/cache-utils": "^2.0.0", - "@netlify/config": "^14.0.0", + "@netlify/config": "^15.0.0", "@netlify/functions-utils": "^2.0.0", "@netlify/git-utils": "^2.0.0", "@netlify/plugin-edge-handlers": "^1.11.22", @@ -2898,9 +2898,9 @@ } }, "node_modules/@netlify/config": { - "version": "14.4.3", - "resolved": "https://registry.npmjs.org/@netlify/config/-/config-14.4.3.tgz", - "integrity": "sha512-lCuhs58xDIkDF34A1Xz4CTXvr9xgVHJn5Y5Xwmj1Tgp78eOSQFozgYLVXEwLqTTg3EFiniPoHy0oSPMmrhCZMw==", + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/@netlify/config/-/config-15.0.1.tgz", + "integrity": "sha512-SKtiXN+ObBqf8Y0nReE6d/iynSTjKaIDJMhbrFxJZe6F5fYb1h2CpWpMb9LNcqkquiYhWGhwLfs3DsN+IGd7xw==", "dependencies": { "@ungap/from-entries": "^0.2.1", "array-flat-polyfill": "^1.0.1", @@ -2920,6 +2920,7 @@ "make-dir": "^3.1.0", "map-obj": "^4.0.0", "netlify": "^8.0.0", + "netlify-headers-parser": "^1.0.0", "netlify-redirect-parser": "^8.2.0", "omit.js": "^2.0.2", "p-locate": "^4.1.0", @@ -15097,6 +15098,20 @@ "node": ">=10.18.0" } }, + "node_modules/netlify-headers-parser": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-1.0.0.tgz", + "integrity": "sha512-QaSmTxM7HU1EPdcM32Ej0ZYn2Cg/XVJ+ZBhw3ItMoPE2YdORPJg4UGDFRz88vzI/3tAgrDCYCaZGoFBxg5yZ4g==", + "dependencies": { + "is-plain-obj": "^3.0.0", + "map-obj": "^4.2.1", + "path-exists": "^4.0.0", + "toml": "^3.0.0" + }, + "engines": { + "node": ">=10.18.0" + } + }, "node_modules/netlify-redirect-parser": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.2.0.tgz", @@ -22890,13 +22905,13 @@ } }, "@netlify/build": { - "version": "17.11.0", - "resolved": "https://registry.npmjs.org/@netlify/build/-/build-17.11.0.tgz", - "integrity": "sha512-c9f28mJJMspXP7H1oDH9Mlg1+UgSxJVktPronJPrzoiMQzvEz/AuWjgn37OMopzfTJumOfSxorWlj0YTZyj3Lw==", + "version": "18.0.2", + "resolved": "https://registry.npmjs.org/@netlify/build/-/build-18.0.2.tgz", + "integrity": "sha512-Ki3g6L+GXyWrebyhDJbmYGNoXmZtaa6Dt3c7NEINs2cWYx+pmCcfMdEwjRQEJrR17wzN2mSxIetHg+Y0Po2iEw==", "requires": { "@bugsnag/js": "^7.0.0", "@netlify/cache-utils": "^2.0.0", - "@netlify/config": "^14.0.0", + "@netlify/config": "^15.0.0", "@netlify/functions-utils": "^2.0.0", "@netlify/git-utils": "^2.0.0", "@netlify/plugin-edge-handlers": "^1.11.22", @@ -23357,9 +23372,9 @@ } }, "@netlify/config": { - "version": "14.4.3", - "resolved": "https://registry.npmjs.org/@netlify/config/-/config-14.4.3.tgz", - "integrity": "sha512-lCuhs58xDIkDF34A1Xz4CTXvr9xgVHJn5Y5Xwmj1Tgp78eOSQFozgYLVXEwLqTTg3EFiniPoHy0oSPMmrhCZMw==", + "version": "15.0.1", + "resolved": "https://registry.npmjs.org/@netlify/config/-/config-15.0.1.tgz", + "integrity": "sha512-SKtiXN+ObBqf8Y0nReE6d/iynSTjKaIDJMhbrFxJZe6F5fYb1h2CpWpMb9LNcqkquiYhWGhwLfs3DsN+IGd7xw==", "requires": { "@ungap/from-entries": "^0.2.1", "array-flat-polyfill": "^1.0.1", @@ -23379,6 +23394,7 @@ "make-dir": "^3.1.0", "map-obj": "^4.0.0", "netlify": "^8.0.0", + "netlify-headers-parser": "^1.0.0", "netlify-redirect-parser": "^8.2.0", "omit.js": "^2.0.2", "p-locate": "^4.1.0", @@ -32665,6 +32681,17 @@ } } }, + "netlify-headers-parser": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/netlify-headers-parser/-/netlify-headers-parser-1.0.0.tgz", + "integrity": "sha512-QaSmTxM7HU1EPdcM32Ej0ZYn2Cg/XVJ+ZBhw3ItMoPE2YdORPJg4UGDFRz88vzI/3tAgrDCYCaZGoFBxg5yZ4g==", + "requires": { + "is-plain-obj": "^3.0.0", + "map-obj": "^4.2.1", + "path-exists": "^4.0.0", + "toml": "^3.0.0" + } + }, "netlify-redirect-parser": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-8.2.0.tgz", diff --git a/package.json b/package.json index c9105f97588..c7732109a5e 100644 --- a/package.json +++ b/package.json @@ -77,8 +77,8 @@ "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,scripts,site,tests,.github}/**/*.{js,md,yml,json,html}\" \"*.{js,yml,json,html}\" \".*.{js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\"" }, "dependencies": { - "@netlify/build": "^17.11.0", - "@netlify/config": "^14.4.3", + "@netlify/build": "^18.0.2", + "@netlify/config": "^15.0.1", "@netlify/framework-info": "^5.8.0", "@netlify/local-functions-proxy": "^1.1.0", "@netlify/plugin-edge-handlers": "^1.11.22", diff --git a/src/commands/deploy.js b/src/commands/deploy.js index 3b8a038d0ae..64e3db5e3c5 100644 --- a/src/commands/deploy.js +++ b/src/commands/deploy.js @@ -482,9 +482,7 @@ class DeployCommand extends Command { exit, }) - if (configMutations.length !== 0) { - await restoreConfig({ buildDir: deployFolder, configPath, redirectsPath }) - } + await restoreConfig(configMutations, { buildDir: deployFolder, configPath, redirectsPath }) printResults({ flags, results, deployToProduction, exit })