From 0a19a25b442305079966001a54c31dd1f2bac67c Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Mon, 11 Sep 2023 15:40:35 +0300 Subject: [PATCH 1/7] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 65382f4767c4c..9d0bafe691816 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ }, "__engines_upgrades__": "Dockerfiles @ github.com/joomla-projects/docker-images need also upgrade", "engines": { - "node": ">=16", - "npm": ">=8.5.5" + "node": ">=18", + "npm": ">=9.8.1" }, "scripts": { "build:js": "node build/build.js --compile-js", From ad854e36d481dd7ee75af08f1245b57c9662b882 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Mon, 11 Sep 2023 15:43:19 +0300 Subject: [PATCH 2/7] Update .drone.yml --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 6bc5e16245d6c..8e30c996faaa6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,7 +39,7 @@ steps: - ./libraries/vendor/bin/phan - name: npm - image: node:16-bullseye-slim + image: node:18-bullseye-slim depends_on: [ phpcs ] volumes: - name: npm-cache From f1d7ceba4153ad337e555e2b52443b17d2cbd005 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Mon, 11 Sep 2023 15:44:18 +0300 Subject: [PATCH 3/7] Update package-lock.json --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3771d03732270..f28e54c52b382 100644 --- a/package-lock.json +++ b/package-lock.json @@ -84,8 +84,8 @@ "terser": "^5.16.5" }, "engines": { - "node": ">=16", - "npm": ">=8.5.5" + "node": ">=18", + "npm": ">=9.8.1" } }, "node_modules/@ampproject/remapping": { From 8f00b40e7d2c8120f8adfac55a6702a31f0e1f27 Mon Sep 17 00:00:00 2001 From: Allon Moritz Date: Mon, 11 Sep 2023 16:01:41 +0200 Subject: [PATCH 4/7] changing signature --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 501b4dd0eee12..72d23ab75ba75 100644 --- a/.drone.yml +++ b/.drone.yml @@ -462,6 +462,6 @@ trigger: --- kind: signature -hmac: 06ecea6156e9c3f4cbb17d5e5e876a8c2b256e0e98412ce6351c914b2adbda97 +hmac: c80f54f77ce8c648018d3946dc20d86bf3491484662a0e5defd8d9453f33cd92 ... From 530ab57a30a971cf8f9d2f7762618edc65e365b6 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Mon, 11 Sep 2023 18:26:10 +0300 Subject: [PATCH 5/7] Update package-lock.json --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 7de4f6f7a07d4..7a400ae927282 100644 --- a/package-lock.json +++ b/package-lock.json @@ -87,7 +87,7 @@ }, "engines": { "node": ">=18", - "npm": ">=9.8.1" + "npm": ">=9.6.7" } }, "node_modules/@aashutoshrathi/word-wrap": { From ff33796f628f4b8dee969891a6e5e6949c58b9f9 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Mon, 11 Sep 2023 18:26:25 +0300 Subject: [PATCH 6/7] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf9d6032e1bdb..595303de43a4a 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "engines": { "node": ">=18", - "npm": ">=9.8.1" + "npm": ">=9.6.7" }, "scripts": { "build:js": "node build/build.js --compile-js", From 3d4a2bbd7e3f1f4ced848d5dd50caed3969b3565 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Mon, 11 Sep 2023 19:12:10 +0300 Subject: [PATCH 7/7] Reset the indantation to 2 spaces --- build/bump.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/bump.php b/build/bump.php index 2c0ac2997b98e..46a16c13149bf 100644 --- a/build/bump.php +++ b/build/bump.php @@ -251,7 +251,9 @@ function usage($command) if (file_exists($rootPath . $packageJsonFile)) { $package = json_decode(file_get_contents($rootPath . $packageJsonFile)); $package->version = $version['release']; - file_put_contents($rootPath . $packageJsonFile, json_encode($package, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); + + // @todo use a native formatter whenever https://github.com/php/php-src/issues/8864 is resolved + file_put_contents($rootPath . $packageJsonFile, str_replace(' ', ' ', json_encode($package, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES))); } // Updates the version in readme files.