From ecf882d99c6007031ca1e2fb0fd7993306415378 Mon Sep 17 00:00:00 2001
From: mtyszczak <mateusz.tyszczak@gmail.com>
Date: Thu, 20 Feb 2025 11:07:06 +0100
Subject: [PATCH 1/4] Remove tail from npm pack package script
---
scripts/bash/npm-helpers/npm_pack_package.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/bash/npm-helpers/npm_pack_package.sh b/scripts/bash/npm-helpers/npm_pack_package.sh
index 04f1c4a..33f4b17 100755
--- a/scripts/bash/npm-helpers/npm_pack_package.sh
+++ b/scripts/bash/npm-helpers/npm_pack_package.sh
@@ -15,7 +15,7 @@ pushd "${SOURCE_DIR}" # move to the project directory (where package.json file i
"${SCRIPTPATH}/npm_generate_version.sh" "${SOURCE_DIR}" "${REGISTRY_URL}" "${SCOPE}" "${PROJECT_NAME}" "${COMMIT_REF_PROTECTED}" "${COMMIT_TAG}"
-pnpm pack --pack-destination "${OUTPUT_DIR}" --json | tail -n +5 > "${OUTPUT_DIR}/built_package_info.json"
+pnpm pack --pack-destination "${OUTPUT_DIR}" --json > "${OUTPUT_DIR}/built_package_info.json"
BUILT_PACKAGE_NAME=$(jq -r .filename "${OUTPUT_DIR}/built_package_info.json")
{
echo PACKAGE_SOURCE_DIR="${SOURCE_DIR}"
--
GitLab
From 853360e2f94f125d44a8b2706bb3789a2e8f6d19 Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Thu, 20 Feb 2025 20:29:54 +0100
Subject: [PATCH 2/4] Added common Hive TS DevContainer specification
---
pnpm-config/.devcontainer/devcontainer.json | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 pnpm-config/.devcontainer/devcontainer.json
diff --git a/pnpm-config/.devcontainer/devcontainer.json b/pnpm-config/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..e38ca1e
--- /dev/null
+++ b/pnpm-config/.devcontainer/devcontainer.json
@@ -0,0 +1,10 @@
+{
+ "name": "Hive NodeJS & Typescript",
+ "image": "registry.gitlab.syncad.com/hive/common-ci-configuration/emsdk:4.0.1-2@sha256:d0c5fbd811ef2447fdf411ee1e2a111c50ad0ec610cf3d6bf2d186530bc883ad",
+ "containerUser": "emscripten",
+ "customizations": {
+ "vscode": {
+ "extensions": []
+ }
+ }
+}
\ No newline at end of file
--
GitLab
From 27fe7a38bf2bc3cfe151ef4e49d26bc87c59747d Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Thu, 20 Feb 2025 22:06:35 +0100
Subject: [PATCH 3/4] Added filtering out non-json output produced by pnpm
--json option, what leads further processing to fail.
---
scripts/bash/npm-helpers/npm_pack_package.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/bash/npm-helpers/npm_pack_package.sh b/scripts/bash/npm-helpers/npm_pack_package.sh
index 33f4b17..8fb5147 100755
--- a/scripts/bash/npm-helpers/npm_pack_package.sh
+++ b/scripts/bash/npm-helpers/npm_pack_package.sh
@@ -15,7 +15,8 @@ pushd "${SOURCE_DIR}" # move to the project directory (where package.json file i
"${SCRIPTPATH}/npm_generate_version.sh" "${SOURCE_DIR}" "${REGISTRY_URL}" "${SCOPE}" "${PROJECT_NAME}" "${COMMIT_REF_PROTECTED}" "${COMMIT_TAG}"
-pnpm pack --pack-destination "${OUTPUT_DIR}" --json > "${OUTPUT_DIR}/built_package_info.json"
+# warning pnpm prints additional (non json) lines referencing prepack actions done while packing. They start from `>` and must be filtered out before processing by jq
+pnpm pack --pack-destination "${OUTPUT_DIR}" --json | grep -v '^>.*$' > "${OUTPUT_DIR}/built_package_info.json"
BUILT_PACKAGE_NAME=$(jq -r .filename "${OUTPUT_DIR}/built_package_info.json")
{
echo PACKAGE_SOURCE_DIR="${SOURCE_DIR}"
--
GitLab
From f35738aa95a39e0fd94b6328fd8671960921b652 Mon Sep 17 00:00:00 2001
From: mtyszczak <mateusz.tyszczak@gmail.com>
Date: Thu, 20 Feb 2025 12:16:32 +0100
Subject: [PATCH 4/4] Update emscripten image tag
---
templates/npm_projects.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/npm_projects.gitlab-ci.yml b/templates/npm_projects.gitlab-ci.yml
index ac05cca..2ac1d77 100644
--- a/templates/npm_projects.gitlab-ci.yml
+++ b/templates/npm_projects.gitlab-ci.yml
@@ -3,7 +3,7 @@ include:
variables:
# uses registry.gitlab.syncad.com/hive/common-ci-configuration/emsdk:4.0.1-2
- EMSCRIPTEN_IMAGE_TAG: "4.0.1-2@sha256:20c7e44736ce12c9ddb29e1c5c73dd9f0e73704669889212e611069eecb7c5a8"
+ EMSCRIPTEN_IMAGE_TAG: "4.0.1-2@sha256:d0c5fbd811ef2447fdf411ee1e2a111c50ad0ec610cf3d6bf2d186530bc883ad"
EMSCRIPTEN_IMAGE: "registry.gitlab.syncad.com/hive/common-ci-configuration/emsdk:$EMSCRIPTEN_IMAGE_TAG"
.node_based_job_base:
--
GitLab