From f2ce76214f17c33f3877e6d4ee2f25d2fe957fa0 Mon Sep 17 00:00:00 2001
From: "a.wink" <a.wink@kellerkinder.de>
Date: Mon, 8 Jan 2024 14:26:21 +0100
Subject: [PATCH 1/2] chore: [noticket] Add NPM_CONFIG_ENGINE_STRICT for new
 npm10 for default devenv - Increase version

---
 devenv.nix               | 3 ++-
 examples/sw5/devenv.yaml | 2 +-
 examples/sw6/devenv.yaml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/devenv.nix b/devenv.nix
index 02c5bcd..355243f 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -2,7 +2,7 @@
 let
   cfg = config.kellerkinder;
 
-  currentVersion = "v1.0.2";
+  currentVersion = "v1.0.3";
 
   listEntries = path:
     map (name: path + "/${name}") (builtins.attrNames (builtins.readDir path));
@@ -205,6 +205,7 @@ in {
         SHOPWARE_CACHE_ID = "dev";
 
         NODE_OPTIONS = "--openssl-legacy-provider --max-old-space-size=2000";
+        NPM_CONFIG_ENGINE_STRICT = "false"; # hotfix for npm10
       })
       (lib.mkIf (config.services.elasticsearch.enable || config.services.opensearch.enable) {
         SHOPWARE_ES_ENABLED = "1";
diff --git a/examples/sw5/devenv.yaml b/examples/sw5/devenv.yaml
index 15ccdfb..b783377 100644
--- a/examples/sw5/devenv.yaml
+++ b/examples/sw5/devenv.yaml
@@ -5,7 +5,7 @@ inputs:
   nixpkgs:
     url: github:NixOS/nixpkgs/nixos-unstable
   kellerkinder:
-    url: github:kellerkinderDE/devenv-shopware?ref=v1.0.2
+    url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3
     flake: false
   phps:
     url: github:fossar/nix-phps
diff --git a/examples/sw6/devenv.yaml b/examples/sw6/devenv.yaml
index 15ccdfb..b783377 100644
--- a/examples/sw6/devenv.yaml
+++ b/examples/sw6/devenv.yaml
@@ -5,7 +5,7 @@ inputs:
   nixpkgs:
     url: github:NixOS/nixpkgs/nixos-unstable
   kellerkinder:
-    url: github:kellerkinderDE/devenv-shopware?ref=v1.0.2
+    url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3
     flake: false
   phps:
     url: github:fossar/nix-phps

From ba41ccc9f28ea01fc453f353b5100cf46bf3f009 Mon Sep 17 00:00:00 2001
From: "a.wink" <a.wink@kellerkinder.de>
Date: Mon, 8 Jan 2024 14:32:41 +0100
Subject: [PATCH 2/2] chore: [noticket] Adjust test file to path instead of url

---
 .github/workflows/test_examples.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test_examples.yml b/.github/workflows/test_examples.yml
index 136dd7b..178a842 100644
--- a/.github/workflows/test_examples.yml
+++ b/.github/workflows/test_examples.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - id: set-matrix
-        run: echo "matrix=$(ls examples/ | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
+        run: echo "matrix=$(ls ${GITHUB_WORKSPACE}/examples/ | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
   test_examples:
     needs: list-examples
     runs-on: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
       - name: Test ${{ matrix.manifest }} example
         run: |
           cd ${GITHUB_WORKSPACE}/examples/${{ matrix.manifest }}
-          sed -i "s,kellerkinderDE/devenv-shopware?ref=v1.0.2,${GITHUB_REPOSITORY}?ref=${GITHUB_REF_NAME}," devenv.yaml
+          sed -i "s,url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3,url: path:${GITHUB_WORKSPACE}," devenv.yaml
           echo running on ${GITHUB_REPOSITORY} with ref ${GITHUB_REF_NAME}
           direnv allow && direnv reload
           devenv ci -vvv