ISTWCMS-6636: another try at php 81 fixes

build_ohana.sh

@@ -36,7 +36,6 @@ cd ohana
 
 echo "**************************************************************************************"
 echo "Installing correct npm version ..."
-cp ../php8fix-package_run1.json ./package.json
 file=".nvmrc"
 version=$(cat "$file")
 export NVM_DIR=$HOME/.nvm;
@@ -73,8 +72,11 @@ echo "Running npm install ..."
 if [[ $os_option == 1 ]]; then
   export CPPFLAGS="-DPNG_ARM_NEON_OPT=0"
 fi
+cp ../php8fix-package_run1.json ./package.json
 npm install
 npx browserslist@latest --update-db
+cp ../php8fix-package.json ./package.json
+npm install
 echo "**************************************************************************************"
 echo "Done running npm install."
 
@@ -95,9 +97,6 @@ echo "**************************************************************************
 echo "Running npm run build ..."
 export NODE_OPTIONS='--no-experimental-fetch'
 npm run build
-cp ../php8fix-package.json ./package.json
-npm install
-npm run build
 echo "**************************************************************************************"
 echo "Done running npm run build."
 

php8fix-package_run1.json

@@ -41,8 +41,8 @@
   "devDependencies": {
     "@babel/core": "7.23.3",
     "@babel/preset-env": "7.23.2",
-    "@pattern-lab/core": "5.17.0",
-    "@pattern-lab/engine-twig-php": "5.17.0",
+    "@pattern-lab/core": "6.0.1",
+    "@pattern-lab/engine-twig-php": "6.0.1",
     "@pattern-lab/plugin-tab": "6.0.0",
     "@pattern-lab/uikit-workshop": "6.0.3",
     "browser-sync": "2.29.3",