From 72c6669d38087df256e212e2264d761f8a7b23d1 Mon Sep 17 00:00:00 2001 From: Raees Iqbal Date: Wed, 6 May 2020 12:40:46 -0700 Subject: [PATCH 1/2] Upgrade @netlify/config --- package-lock.json | 93 +++++++++++++++++++++++++++++++++++++++++++++-- package.json | 2 +- 2 files changed, 90 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 632bb1cba4e..173644da8d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -699,9 +699,9 @@ } }, "@netlify/config": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/@netlify/config/-/config-0.11.2.tgz", - "integrity": "sha512-F9J3K84g6KMQyUgn/0DjcrB4feupkYNIalCoepRJHkDj55H3K10oCp4J7itKGkPBIH6vVtt5tLNE35RVho7+sw==", + "version": "0.11.5", + "resolved": "https://registry.npmjs.org/@netlify/config/-/config-0.11.5.tgz", + "integrity": "sha512-6OxKIeg9LqXvAm48YbWWZi8R6vGEPrBbNmRNqznP9Cxgdo0MR0Hzn5jalUkMXJtiJpzqsABDGuOU0ysEeFW9/Q==", "requires": { "array-flat-polyfill": "^1.0.1", "chalk": "^3.0.0", @@ -713,7 +713,7 @@ "indent-string": "^4.0.0", "is-plain-obj": "^2.1.0", "js-yaml": "^3.13.1", - "netlify": "^4.1.1", + "netlify": "^4.1.3", "p-filter": "^2.1.0", "p-locate": "^4.1.0", "path-exists": "^4.0.0", @@ -722,6 +722,29 @@ "yargs": "^15.3.0" }, "dependencies": { + "@netlify/zip-it-and-ship-it": { + "version": "0.4.0-17", + "resolved": "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-0.4.0-17.tgz", + "integrity": "sha512-T7u9N7p1RUG4qj/68R8b91rbJsuVg0ebcbiz0PA9o/kFv2GmlrPYZthUg4vG25Z5TD1UtHzkwyV+arf8llsguw==", + "requires": { + "archiver": "^3.0.0", + "common-path-prefix": "^2.0.0", + "cp-file": "^7.0.0", + "elf-tools": "^1.1.1", + "end-of-stream": "^1.4.4", + "glob": "^7.1.6", + "make-dir": "^3.0.2", + "p-map": "^3.0.0", + "path-exists": "^4.0.0", + "pkg-dir": "^4.2.0", + "precinct": "^6.2.0", + "require-package-name": "^2.0.1", + "resolve": "^2.0.0-next.1", + "unixify": "^1.0.0", + "util.promisify": "^1.0.1", + "yargs": "^15.3.1" + } + }, "ansi-styles": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", @@ -766,10 +789,72 @@ "path-exists": "^4.0.0" } }, + "netlify": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/netlify/-/netlify-4.1.3.tgz", + "integrity": "sha512-aqPU5Jc07UPZdXOO/81aY200m8r1a30yFtK+iOWNybZWdoE5MXm8QRRX8zbJoncWcZ74J/IZxfm7Vn/C92yGHw==", + "requires": { + "@netlify/open-api": "^0.13.2", + "@netlify/zip-it-and-ship-it": "^0.4.0-17", + "backoff": "^2.5.0", + "clean-deep": "^3.3.0", + "filter-obj": "^2.0.1", + "flush-write-stream": "^2.0.0", + "folder-walker": "^3.2.0", + "from2-array": "0.0.4", + "hasha": "^3.0.0", + "lodash.camelcase": "^4.3.0", + "lodash.flatten": "^4.4.0", + "lodash.get": "^4.4.2", + "lodash.set": "^4.3.2", + "micro-api-client": "^3.3.0", + "node-fetch": "^2.2.0", + "p-map": "^3.0.0", + "p-wait-for": "^3.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "qs": "^6.9.3", + "rimraf": "^3.0.2", + "tempy": "^0.3.0", + "through2-filter": "^3.0.0", + "through2-map": "^3.0.0" + } + }, "p-finally": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==" + }, + "p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "requires": { + "p-finally": "^1.0.0" + }, + "dependencies": { + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + } + } + }, + "p-wait-for": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-wait-for/-/p-wait-for-3.1.0.tgz", + "integrity": "sha512-0Uy19uhxbssHelu9ynDMcON6BmMk6pH8551CvxROhiz3Vx+yC4RqxjyIDk2V4ll0g9177RKT++PK4zcV58uJ7A==", + "requires": { + "p-timeout": "^3.0.0" + } + }, + "resolve": { + "version": "2.0.0-next.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.1.tgz", + "integrity": "sha512-ZGTmuLZAW++TDjgslfUMRZcv7kXHv8z0zwxvuRWOPjnqc56HVsn1lVaqsWOZeQ8MwiilPVJLrcPVKG909QsAfA==", + "requires": { + "path-parse": "^1.0.6" + } } } }, diff --git a/package.json b/package.json index ea69ac5f644..19ff0e53afe 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ }, "dependencies": { "@netlify/build": "^0.4.15", - "@netlify/config": "^0.11.2", + "@netlify/config": "^0.11.5", "@netlify/zip-it-and-ship-it": "^0.4.0-16", "@oclif/command": "^1.5.18", "@oclif/config": "^1.13.2", From e1a2c74bd955f97f8dce7ade09d25e7bc76523ef Mon Sep 17 00:00:00 2001 From: Raees Iqbal Date: Wed, 6 May 2020 12:41:27 -0700 Subject: [PATCH 2/2] Upgrade netlify-redirect-parser --- package-lock.json | 84 +++-------------------------------------------- package.json | 2 +- 2 files changed, 6 insertions(+), 80 deletions(-) diff --git a/package-lock.json b/package-lock.json index 173644da8d1..0a035af732e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10934,86 +10934,12 @@ } }, "netlify-redirect-parser": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-2.4.0.tgz", - "integrity": "sha512-QmYMQzfJRhN/gXFzITT0+fnNSBjADDzodbn6mPHFAyJ6J8kfePJ0o0mhSB70QVzq/uVR2Y9hJVAfkxbwZHfuoA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-2.5.0.tgz", + "integrity": "sha512-pF8BiOr3Pa4kQLLiOu53I0d30EIUDM0DYqYvCQmKD96cMX2qLh/QsxT0Zh18IrL5a0IWQ236/o76lTe0yEEw6w==", "requires": { - "@netlify/config": "^0.9.1" - }, - "dependencies": { - "@netlify/config": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/@netlify/config/-/config-0.9.2.tgz", - "integrity": "sha512-Dyi08k4vArgtKm8F1ytifpEIELOr+0sdIDeEXMTZBsGN0zyyMoE+784xsXv8PTK6qobaCEUUL4bnLgEkUeYS5g==", - "requires": { - "array-flat-polyfill": "^1.0.1", - "chalk": "^3.0.0", - "deepmerge": "^4.2.2", - "execa": "^3.4.0", - "fast-safe-stringify": "^2.0.7", - "filter-obj": "^2.0.1", - "find-up": "^4.1.0", - "indent-string": "^4.0.0", - "is-plain-obj": "^2.1.0", - "js-yaml": "^3.13.1", - "map-obj": "^4.1.0", - "netlify": "^4.0.5", - "p-filter": "^2.1.0", - "p-locate": "^4.1.0", - "path-exists": "^4.0.0", - "toml": "^3.0.0", - "yargs": "^15.3.0" - } - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "execa": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz", - "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==", - "requires": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "p-finally": "^2.0.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "p-finally": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", - "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==" - } + "@netlify/config": "^0.11.5", + "lodash.isplainobject": "^4.0.6" } }, "netlify-redirector": { diff --git a/package.json b/package.json index 19ff0e53afe..b9dd2cd47c2 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "make-dir": "^3.0.0", "minimist": "^1.2.5", "netlify": "^4.1.2", - "netlify-redirect-parser": "^2.4.0", + "netlify-redirect-parser": "^2.5.0", "netlify-redirector": "^0.2.0", "node-fetch": "^2.6.0", "npm-packlist": "^1.4.4",