From 0e69882d8403e65240f5cd0c5275f8bf91bc0bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Thu, 14 Mar 2024 15:36:46 +0000 Subject: [PATCH 1/5] chore: add debug logging --- packages/build/tests/deploy_config/tests.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/build/tests/deploy_config/tests.js b/packages/build/tests/deploy_config/tests.js index 243370f9a8..263145ee78 100644 --- a/packages/build/tests/deploy_config/tests.js +++ b/packages/build/tests/deploy_config/tests.js @@ -45,7 +45,7 @@ test('Loads configuration data that has been generated by the build command', as test('In a monorepo setup, loads package-specific configuration data', async (t) => { const fixture = await new Fixture('./fixtures/monorepo').withCopyRoot({ git: false }) - const { success, netlifyConfig } = await fixture + const { success, output, netlifyConfig } = await fixture .withFlags({ cwd: fixture.repositoryRoot, featureFlags: { netlify_build_deploy_configuration_api: true }, @@ -53,6 +53,8 @@ test('In a monorepo setup, loads package-specific configuration data', async (t) }) .runBuildProgrammatic() + console.log(output) + t.true(success) t.deepEqual(netlifyConfig.images, { remote_images: ['domain1.netlify', 'domain2.netlify'], From caba3edb78ccb4e4914675fb16e821c354cc21b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Thu, 14 Mar 2024 15:56:24 +0000 Subject: [PATCH 2/5] chore: add debug logging --- packages/build/tests/deploy_config/tests.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/build/tests/deploy_config/tests.js b/packages/build/tests/deploy_config/tests.js index 263145ee78..98b75bba69 100644 --- a/packages/build/tests/deploy_config/tests.js +++ b/packages/build/tests/deploy_config/tests.js @@ -44,6 +44,7 @@ test('Loads configuration data that has been generated by the build command', as }) test('In a monorepo setup, loads package-specific configuration data', async (t) => { + console.log('-> Starting test') const fixture = await new Fixture('./fixtures/monorepo').withCopyRoot({ git: false }) const { success, output, netlifyConfig } = await fixture .withFlags({ @@ -53,7 +54,7 @@ test('In a monorepo setup, loads package-specific configuration data', async (t) }) .runBuildProgrammatic() - console.log(output) + console.log('-> Output:', output) t.true(success) t.deepEqual(netlifyConfig.images, { From eabae05a7f080d8412abbcb28ef0bec2b2d4302e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Thu, 14 Mar 2024 16:06:30 +0000 Subject: [PATCH 3/5] chore: add debug logging --- packages/build/tests/deploy_config/tests.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/build/tests/deploy_config/tests.js b/packages/build/tests/deploy_config/tests.js index 98b75bba69..e87210c913 100644 --- a/packages/build/tests/deploy_config/tests.js +++ b/packages/build/tests/deploy_config/tests.js @@ -44,8 +44,7 @@ test('Loads configuration data that has been generated by the build command', as }) test('In a monorepo setup, loads package-specific configuration data', async (t) => { - console.log('-> Starting test') - const fixture = await new Fixture('./fixtures/monorepo').withCopyRoot({ git: false }) + const fixture = new Fixture('./fixtures/monorepo').withCopyRoot({ git: false }) const { success, output, netlifyConfig } = await fixture .withFlags({ cwd: fixture.repositoryRoot, From de05ada03290a7373afe6036bf82fbecfd36222f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Thu, 14 Mar 2024 16:17:19 +0000 Subject: [PATCH 4/5] chore: add debug logging --- packages/build/tests/deploy_config/tests.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/build/tests/deploy_config/tests.js b/packages/build/tests/deploy_config/tests.js index e87210c913..9f5fbecb90 100644 --- a/packages/build/tests/deploy_config/tests.js +++ b/packages/build/tests/deploy_config/tests.js @@ -44,14 +44,14 @@ test('Loads configuration data that has been generated by the build command', as }) test('In a monorepo setup, loads package-specific configuration data', async (t) => { - const fixture = new Fixture('./fixtures/monorepo').withCopyRoot({ git: false }) + const fixture = await new Fixture('./fixtures/monorepo').withCopyRoot({ git: false }) const { success, output, netlifyConfig } = await fixture .withFlags({ cwd: fixture.repositoryRoot, featureFlags: { netlify_build_deploy_configuration_api: true }, packagePath: 'apps/app-1', }) - .runBuildProgrammatic() + .runWithBuildAndIntrospect() console.log('-> Output:', output) From 24f78d8f4f213225cce0ab9bf597cc8b47d0dc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20Bou=C3=A7as?= Date: Thu, 14 Mar 2024 16:27:34 +0000 Subject: [PATCH 5/5] fix: fix test --- packages/build/tests/deploy_config/tests.js | 34 +++++++++++---------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/build/tests/deploy_config/tests.js b/packages/build/tests/deploy_config/tests.js index 9f5fbecb90..1fbd4cf920 100644 --- a/packages/build/tests/deploy_config/tests.js +++ b/packages/build/tests/deploy_config/tests.js @@ -1,8 +1,9 @@ import { promises as fs } from 'fs' -import { platform } from 'process' +import { platform, version as nodeVersion } from 'process' import { Fixture } from '@netlify/testing' import test from 'ava' +import semver from 'semver' import tmp from 'tmp-promise' test('Does not mutate read-only properties', async (t) => { @@ -43,23 +44,24 @@ test('Loads configuration data that has been generated by the build command', as } }) -test('In a monorepo setup, loads package-specific configuration data', async (t) => { - const fixture = await new Fixture('./fixtures/monorepo').withCopyRoot({ git: false }) - const { success, output, netlifyConfig } = await fixture - .withFlags({ - cwd: fixture.repositoryRoot, - featureFlags: { netlify_build_deploy_configuration_api: true }, - packagePath: 'apps/app-1', - }) - .runWithBuildAndIntrospect() - - console.log('-> Output:', output) +// pnpm is not available in Node 14. +if (semver.gte(nodeVersion, '16.9.0')) { + test('In a monorepo setup, loads package-specific configuration data', async (t) => { + const fixture = await new Fixture('./fixtures/monorepo').withCopyRoot({ git: false }) + const { success, netlifyConfig } = await fixture + .withFlags({ + cwd: fixture.repositoryRoot, + featureFlags: { netlify_build_deploy_configuration_api: true }, + packagePath: 'apps/app-1', + }) + .runWithBuildAndIntrospect() - t.true(success) - t.deepEqual(netlifyConfig.images, { - remote_images: ['domain1.netlify', 'domain2.netlify'], + t.true(success) + t.deepEqual(netlifyConfig.images, { + remote_images: ['domain1.netlify', 'domain2.netlify'], + }) }) -}) +} test('Configuration data is exposed to build plugins in the `onBuild` event', async (t) => { const { netlifyConfig, success } = await new Fixture('./fixtures/with_build_plugin')