From 8d461fd93e79d3337bc0b7ed53dfbe3390a2fa7a Mon Sep 17 00:00:00 2001 From: ehmicky Date: Thu, 23 Apr 2020 17:34:13 +0200 Subject: [PATCH] Upgrade Netlify Build --- package-lock.json | 43 +++++++++++++---------------------------- package.json | 4 ++-- src/tests/build.test.js | 7 ++++++- 3 files changed, 21 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a88b9b95ab..6c4d50b9fde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -503,12 +503,12 @@ } }, "@netlify/build": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/@netlify/build/-/build-0.3.6.tgz", - "integrity": "sha512-dWkm2Zeq5QfFTRImLkagzgTkUsOajxBlT7l2kWTETKw7EPONsfrU2CH2jW2jOOL4WQ7jCPc+sPjaHAJoUaWxhw==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@netlify/build/-/build-0.4.0.tgz", + "integrity": "sha512-sRvlnWcqEZD7UHIZQ4dWVfowTtPpkg7pFcu5v4rdmfRNRkQ//+H7ev6YDF0e61ZxxS4FNRZc2I/JaDE3rztc0A==", "requires": { "@netlify/cache-utils": "^0.4.1", - "@netlify/config": "^0.10.1", + "@netlify/config": "^0.11.0", "@netlify/functions-utils": "^0.2.4", "@netlify/git-utils": "^0.2.2", "@netlify/run-utils": "^0.1.1", @@ -522,7 +522,6 @@ "filter-obj": "^2.0.1", "global-cache-dir": "^1.0.1", "got": "^9.6.0", - "group-by": "^0.0.1", "indent-string": "^4.0.0", "is-ci": "^2.0.0", "is-plain-obj": "^2.1.0", @@ -673,9 +672,9 @@ } }, "@netlify/config": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/@netlify/config/-/config-0.10.1.tgz", - "integrity": "sha512-Mga1JkycTSCPauaO1EWfnUaC3WoC8K7TRBuxBR3kdwmPDvNUt56SFzmvmAWMiGvh+U5KsGdBXIBWfBvjLV5LVg==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@netlify/config/-/config-0.11.0.tgz", + "integrity": "sha512-gIGkDXndKPCgntHKyXetnpy29u0V1NzAx3xXNhLTHmVkMrDXcgOIf79JWZbK2onh8tWcFA8xDl8JJpPg5JsCUw==", "requires": { "array-flat-polyfill": "^1.0.1", "chalk": "^3.0.0", @@ -687,12 +686,12 @@ "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", + "tomlify-j0.4": "^3.0.0", "yargs": "^15.3.0" }, "dependencies": { @@ -4257,11 +4256,6 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, - "component-props": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/component-props/-/component-props-1.1.1.tgz", - "integrity": "sha1-+bffm5kntubZfJvScqqGdnDzSUQ=" - }, "compress-commons": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz", @@ -7739,14 +7733,6 @@ } } }, - "group-by": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/group-by/-/group-by-0.0.1.tgz", - "integrity": "sha1-hXYgV19nFHhvjYa7Gf0T4YjdaKQ=", - "requires": { - "to-function": "*" - } - }, "growl": { "version": "1.10.5", "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", @@ -14108,14 +14094,6 @@ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", "dev": true }, - "to-function": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/to-function/-/to-function-2.0.6.tgz", - "integrity": "sha1-fVbNnDuS+o29eyLoPVGSTedA68U=", - "requires": { - "component-props": "*" - } - }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", @@ -14169,6 +14147,11 @@ "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz", "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==" }, + "tomlify-j0.4": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tomlify-j0.4/-/tomlify-j0.4-3.0.0.tgz", + "integrity": "sha512-2Ulkc8T7mXJ2l0W476YC/A209PR38Nw8PuaCNtk9uI3t1zzFdGQeWYGQvmj2PZkVvRC/Yoi4xQKMRnWc/N29tQ==" + }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", diff --git a/package.json b/package.json index 80b6de587b3..2a5613d5209 100644 --- a/package.json +++ b/package.json @@ -61,8 +61,8 @@ "postinstall": "node ./scripts/postinstall.js" }, "dependencies": { - "@netlify/build": "^0.3.6", - "@netlify/config": "^0.10.1", + "@netlify/build": "^0.4.0", + "@netlify/config": "^0.11.0", "@netlify/zip-it-and-ship-it": "^0.4.0-14", "@oclif/command": "^1.5.18", "@oclif/config": "^1.13.2", diff --git a/src/tests/build.test.js b/src/tests/build.test.js index 0d1f2d4f944..6b9b646b7f1 100644 --- a/src/tests/build.test.js +++ b/src/tests/build.test.js @@ -15,8 +15,13 @@ const runBuildCommand = async function(t, fixtureSubDir, { exitCode: expectedExi env: { FORCE_COLOR: '1' }, all: true }) - t.is(exitCode, expectedExitCode) + + if (exitCode !== expectedExitCode) { + console.error(all) + } + t.true(all.includes(output)) + t.is(exitCode, expectedExitCode) } test('build command - succeeds', async t => {