From 616807990013386b14bd4438ee0d15af3858e4a3 Mon Sep 17 00:00:00 2001 From: David Canos Date: Wed, 20 Dec 2023 08:24:56 +0100 Subject: [PATCH 1/7] Avoid null object in Proxy Handler fn --- projects/angular-redux2/store/src/services/reducer.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/angular-redux2/store/src/services/reducer.service.ts b/projects/angular-redux2/store/src/services/reducer.service.ts index 6b951b0..6bbb145 100644 --- a/projects/angular-redux2/store/src/services/reducer.service.ts +++ b/projects/angular-redux2/store/src/services/reducer.service.ts @@ -292,7 +292,7 @@ export class ReducerService { if (prop === '_target') return target; if (prop === '_isProxy') return true; - if (typeof target[prop] === 'object' && !target[prop]._isProxy) { + if (target[prop] && typeof target[prop] === 'object' && !target[prop]._isProxy) { const currentStack = receiver._stack || []; (this as any)._stack = [ ...currentStack, prop ]; From 85eec51f4cea4ae5f759b9d04ab65f8235c8925f Mon Sep 17 00:00:00 2001 From: David Canos Date: Wed, 20 Dec 2023 16:13:25 +0100 Subject: [PATCH 2/7] update local info in angular.json --- angular.json | 3 ++- package-lock.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/angular.json b/angular.json index a4e8d21..07c3e87 100644 --- a/angular.json +++ b/angular.json @@ -42,6 +42,7 @@ "cli": { "schematicCollections": [ "@angular-eslint/schematics" - ] + ], + "analytics": false } } diff --git a/package-lock.json b/package-lock.json index 3dbd7fc..bf479a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@angular-redux2/store", - "version": "5.0.0", + "version": "5.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@angular-redux2/store", - "version": "5.0.0", + "version": "5.0.2", "license": "Mozilla Public License Version 2.0", "dependencies": { "@angular/common": "^15.2.0", From 95e5da03376a80b78276bdf267d87c3920a353a0 Mon Sep 17 00:00:00 2001 From: David Canos Date: Wed, 20 Dec 2023 16:13:32 +0100 Subject: [PATCH 3/7] Gitlab descriptor --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..823c38f --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,17 @@ +stages: + - build + +build: + stage: build + artifacts: + paths: + - /dist/* + script: + - echo "CI_PIPELINE_ID $CI_PIPELINE_ID" + - yarn cache clean + - yarn + - ./node_modules/.bin/ng build + only: + - develop + - master + - main \ No newline at end of file From 4400d2ec5a55a3a427a6d59c591de46985f82945 Mon Sep 17 00:00:00 2001 From: David Canos Date: Fri, 5 Dec 2025 08:48:47 +0100 Subject: [PATCH 4/7] change dist folder --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 823c38f..9878985 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ build: stage: build artifacts: paths: - - /dist/* + - /dist/angular-redux2/store/* script: - echo "CI_PIPELINE_ID $CI_PIPELINE_ID" - yarn cache clean From ea9269ebd5ebc5f09d23e5f010acc8bf6cf0b3ec Mon Sep 17 00:00:00 2001 From: David Canos Date: Fri, 5 Dec 2025 08:49:18 +0100 Subject: [PATCH 5/7] add tags to build gitlab-ci --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9878985..c0191fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,8 @@ stages: build: stage: build + tags: + - angular artifacts: paths: - /dist/angular-redux2/store/* From a3a3bf1050b02904fbd5266179d31645d9818dab Mon Sep 17 00:00:00 2001 From: David Canos Date: Fri, 5 Dec 2025 08:50:26 +0100 Subject: [PATCH 6/7] Select node version --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0191fa..0935539 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,11 @@ build: stage: build tags: - angular + before_script: + - echo "Running script to use node 22 ($CI_PIPELINE_ID)" + - export NVM_DIR="$HOME/.nvm" + - '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' + - nvm use 22 artifacts: paths: - /dist/angular-redux2/store/* From e2866eb860c68f4e1d98539187c6a5b6935fa37e Mon Sep 17 00:00:00 2001 From: David Canos Date: Fri, 5 Dec 2025 13:48:01 +0100 Subject: [PATCH 7/7] restore artifacts.path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0935539..a804a64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ build: - nvm use 22 artifacts: paths: - - /dist/angular-redux2/store/* + - /dist/* script: - echo "CI_PIPELINE_ID $CI_PIPELINE_ID" - yarn cache clean