From 39ee53aa9ee329bd8fac4618a17b5fa8bd2454db Mon Sep 17 00:00:00 2001 From: Ralf Pannemans Date: Thu, 20 Jun 2024 17:08:30 +0200 Subject: [PATCH] Testdata must not use NodeJs 16 anymore (#713) --- integration/caching_test.go | 4 ++-- .../testdata/dev_dependencies_during_build/package.json | 2 +- integration/testdata/empty_node_modules/package.json | 2 +- integration/testdata/locked_app/package-lock.json | 2 +- integration/testdata/locked_app/package.json | 2 +- integration/testdata/no_vendored_dependencies/package.json | 2 +- integration/testdata/npm-cache/package-lock.json | 2 +- integration/testdata/npm-cache/package.json | 2 +- integration/testdata/npmrc/package.json | 2 +- .../testdata/pre_post_scripts_vendored/package-lock.json | 2 +- integration/testdata/pre_post_scripts_vendored/package.json | 2 +- integration/testdata/project_path_app/server/package.json | 2 +- integration/testdata/simple_app/package.json | 2 +- integration/testdata/unmet_dep/package.json | 2 +- integration/testdata/vendored/package-lock.json | 2 +- integration/testdata/vendored/package.json | 2 +- integration/testdata/with_nvmrc/.nvmrc | 2 +- integration/testdata/with_nvmrc/package-lock.json | 2 +- integration/testdata/with_nvmrc/package.json | 2 +- integration/testdata/with_nvmrc_and_no_engine/.nvmrc | 2 +- integration/versioning_test.go | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/integration/caching_test.go b/integration/caching_test.go index 8e61d9a5..a5b8da5b 100644 --- a/integration/caching_test.go +++ b/integration/caching_test.go @@ -223,7 +223,7 @@ func testCaching(t *testing.T, context spec.G, it spec.S) { WithExtensions( settings.Extensions.UbiNodejsExtension.Online, ). - WithEnv(map[string]string{"BP_NODE_VERSION": "~16"}). + WithEnv(map[string]string{"BP_NODE_VERSION": "~18"}). WithBuildpacks( settings.Buildpacks.NodeEngine.Online, settings.Buildpacks.NPMInstall.Online, @@ -255,7 +255,7 @@ func testCaching(t *testing.T, context spec.G, it spec.S) { WithExtensions( settings.Extensions.UbiNodejsExtension.Online, ). - WithEnv(map[string]string{"BP_NODE_VERSION": "~18"}). + WithEnv(map[string]string{"BP_NODE_VERSION": "~20"}). WithBuildpacks( settings.Buildpacks.NodeEngine.Online, settings.Buildpacks.NPMInstall.Online, diff --git a/integration/testdata/dev_dependencies_during_build/package.json b/integration/testdata/dev_dependencies_during_build/package.json index 234dd871..256fdc1a 100644 --- a/integration/testdata/dev_dependencies_during_build/package.json +++ b/integration/testdata/dev_dependencies_during_build/package.json @@ -15,7 +15,7 @@ "url": "" }, "engines": { - "node": "~16" + "node": "~18" }, "devDependencies": { "chalk": "^5.0.0" diff --git a/integration/testdata/empty_node_modules/package.json b/integration/testdata/empty_node_modules/package.json index 732850e7..b5a0f9e5 100644 --- a/integration/testdata/empty_node_modules/package.json +++ b/integration/testdata/empty_node_modules/package.json @@ -11,5 +11,5 @@ "logfmt": "~1.1.2", "express": "~4.0.0" }, - "engines" : { "node" : "~>16" } + "engines" : { "node" : "~>18" } } diff --git a/integration/testdata/locked_app/package-lock.json b/integration/testdata/locked_app/package-lock.json index 0e654839..d34b4da8 100644 --- a/integration/testdata/locked_app/package-lock.json +++ b/integration/testdata/locked_app/package-lock.json @@ -11,7 +11,7 @@ "leftpad": "~0.0.1" }, "engines": { - "node": "~16" + "node": "~18" } }, "node_modules/leftpad": { diff --git a/integration/testdata/locked_app/package.json b/integration/testdata/locked_app/package.json index 7af4f9a8..577fa87c 100644 --- a/integration/testdata/locked_app/package.json +++ b/integration/testdata/locked_app/package.json @@ -15,6 +15,6 @@ "url": "" }, "engines": { - "node": "~16" + "node": "~18" } } diff --git a/integration/testdata/no_vendored_dependencies/package.json b/integration/testdata/no_vendored_dependencies/package.json index 98e703aa..45277c7f 100644 --- a/integration/testdata/no_vendored_dependencies/package.json +++ b/integration/testdata/no_vendored_dependencies/package.json @@ -12,5 +12,5 @@ "express": "~4.0.0", "chalk-cli": "~3.0.0" }, - "engines" : { "node" : "~>16" } + "engines" : { "node" : "~>18" } } diff --git a/integration/testdata/npm-cache/package-lock.json b/integration/testdata/npm-cache/package-lock.json index 6b19ee02..d95ec6c1 100644 --- a/integration/testdata/npm-cache/package-lock.json +++ b/integration/testdata/npm-cache/package-lock.json @@ -13,7 +13,7 @@ "re2": "1.x.x" }, "engines": { - "node": "~16" + "node": "~18" } }, "node_modules/@gar/promisify": { diff --git a/integration/testdata/npm-cache/package.json b/integration/testdata/npm-cache/package.json index b39a9cf6..8e646d4a 100644 --- a/integration/testdata/npm-cache/package.json +++ b/integration/testdata/npm-cache/package.json @@ -17,6 +17,6 @@ "url": "" }, "engines": { - "node": "~16" + "node": "~18" } } diff --git a/integration/testdata/npmrc/package.json b/integration/testdata/npmrc/package.json index d6381372..e5722550 100644 --- a/integration/testdata/npmrc/package.json +++ b/integration/testdata/npmrc/package.json @@ -15,6 +15,6 @@ "url": "" }, "engines": { - "node": "~16" + "node": "~18" } } diff --git a/integration/testdata/pre_post_scripts_vendored/package-lock.json b/integration/testdata/pre_post_scripts_vendored/package-lock.json index 2953a1d1..c719798d 100644 --- a/integration/testdata/pre_post_scripts_vendored/package-lock.json +++ b/integration/testdata/pre_post_scripts_vendored/package-lock.json @@ -13,7 +13,7 @@ "sqlite3": "~5.0.1" }, "engines": { - "node": "~16" + "node": "~18" } }, "node_modules/@gar/promisify": { diff --git a/integration/testdata/pre_post_scripts_vendored/package.json b/integration/testdata/pre_post_scripts_vendored/package.json index 27ab354f..0472b3a1 100644 --- a/integration/testdata/pre_post_scripts_vendored/package.json +++ b/integration/testdata/pre_post_scripts_vendored/package.json @@ -18,6 +18,6 @@ "url": "" }, "engines": { - "node": "~16" + "node": "~18" } } diff --git a/integration/testdata/project_path_app/server/package.json b/integration/testdata/project_path_app/server/package.json index 7af4f9a8..577fa87c 100644 --- a/integration/testdata/project_path_app/server/package.json +++ b/integration/testdata/project_path_app/server/package.json @@ -15,6 +15,6 @@ "url": "" }, "engines": { - "node": "~16" + "node": "~18" } } diff --git a/integration/testdata/simple_app/package.json b/integration/testdata/simple_app/package.json index 14e64d2f..42cdc31b 100644 --- a/integration/testdata/simple_app/package.json +++ b/integration/testdata/simple_app/package.json @@ -18,6 +18,6 @@ "url": "" }, "engines": { - "node": "~16" + "node": "~18" } } diff --git a/integration/testdata/unmet_dep/package.json b/integration/testdata/unmet_dep/package.json index b9be650a..f1287a6c 100644 --- a/integration/testdata/unmet_dep/package.json +++ b/integration/testdata/unmet_dep/package.json @@ -13,7 +13,7 @@ "logfmt": "^1.3.2" }, "engines": { - "node": "~>16" + "node": "~>18" }, "repository": { "type": "git", diff --git a/integration/testdata/vendored/package-lock.json b/integration/testdata/vendored/package-lock.json index 6b19ee02..d95ec6c1 100644 --- a/integration/testdata/vendored/package-lock.json +++ b/integration/testdata/vendored/package-lock.json @@ -13,7 +13,7 @@ "re2": "1.x.x" }, "engines": { - "node": "~16" + "node": "~18" } }, "node_modules/@gar/promisify": { diff --git a/integration/testdata/vendored/package.json b/integration/testdata/vendored/package.json index b39a9cf6..8e646d4a 100644 --- a/integration/testdata/vendored/package.json +++ b/integration/testdata/vendored/package.json @@ -17,6 +17,6 @@ "url": "" }, "engines": { - "node": "~16" + "node": "~18" } } diff --git a/integration/testdata/with_nvmrc/.nvmrc b/integration/testdata/with_nvmrc/.nvmrc index 3c032078..209e3ef4 100644 --- a/integration/testdata/with_nvmrc/.nvmrc +++ b/integration/testdata/with_nvmrc/.nvmrc @@ -1 +1 @@ -18 +20 diff --git a/integration/testdata/with_nvmrc/package-lock.json b/integration/testdata/with_nvmrc/package-lock.json index 1c5cb17f..684f82f8 100644 --- a/integration/testdata/with_nvmrc/package-lock.json +++ b/integration/testdata/with_nvmrc/package-lock.json @@ -13,7 +13,7 @@ "logfmt": "~1.1.2" }, "engines": { - "node": "~16" + "node": "~18" } }, "node_modules/accepts": { diff --git a/integration/testdata/with_nvmrc/package.json b/integration/testdata/with_nvmrc/package.json index c5357a05..3ed45b44 100644 --- a/integration/testdata/with_nvmrc/package.json +++ b/integration/testdata/with_nvmrc/package.json @@ -16,6 +16,6 @@ "url": "http://github.com/cloudfoundry/nodejs-buildpack.git" }, "engines": { - "node": "~16" + "node": "~18" } } diff --git a/integration/testdata/with_nvmrc_and_no_engine/.nvmrc b/integration/testdata/with_nvmrc_and_no_engine/.nvmrc index 3c032078..209e3ef4 100644 --- a/integration/testdata/with_nvmrc_and_no_engine/.nvmrc +++ b/integration/testdata/with_nvmrc_and_no_engine/.nvmrc @@ -1 +1 @@ -18 +20 diff --git a/integration/versioning_test.go b/integration/versioning_test.go index 6bec5eb0..ccc0b85a 100644 --- a/integration/versioning_test.go +++ b/integration/versioning_test.go @@ -31,7 +31,7 @@ func testVersioning(t *testing.T, context spec.G, it spec.S) { }) context("when using a nvmrc file", func() { - const nvmrcVersion = `18.\d+\.\d+` + const nvmrcVersion = `20.\d+\.\d+` var ( image occam.Image