From c3e7fc56c58d5762e3519a0c52d199377932887d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= <dkmaster@dkmon.com>
Date: Wed, 10 Jul 2024 04:50:36 +0200
Subject: [PATCH] Updated to yarn 4.x

---
 .gitignore              |  3 ++-
 .vscode/extensions.json |  7 +++++++
 .vscode/launch.json     | 22 ++++++++++++++++++++++
 .vscode/settings.json   | 16 ++++++++++++----
 angular.json            | 10 ++++++----
 package.json            |  7 ++++---
 6 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 .vscode/extensions.json
 create mode 100644 .vscode/launch.json

diff --git a/.gitignore b/.gitignore
index 276eeb1..8f41f07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
 # dependencies
 /node_modules
 yarn.lock
+.yarn
+.pnp.*
 
 # IDEs and editors
 /.idea
@@ -44,4 +46,3 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
-.vscode
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..daaa5ee
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "arcanis.vscode-zipfs",
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode"
+  ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..8f73400
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome",
+            "url": "http://172.27.0.1:8000", // For auth first, later go to :9000
+            "webRoot": "${workspaceFolder}"
+        },
+        {
+            "type": "firefox",
+            "request": "launch",
+            "name": "Launch Firefox",
+            "url": "http://172.27.0.1:8000",  // For auth first, later go to :9000
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 14dd45a..42cec32 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,14 @@
 {
-    "python.linting.enabled": true,
-    "python.pythonPath": "/usr/bin/python3",
-    "prettier.singleQuote": true,
-    "typescript.preferences.quoteStyle": "single"
+  "python.linting.enabled": true,
+  "python.pythonPath": "/usr/bin/python3",
+  "prettier.singleQuote": true,
+  "typescript.preferences.quoteStyle": "single",
+  "search.exclude": {
+    "**/.yarn": true,
+    "**/.pnp.*": true
+  },
+  "eslint.nodePath": ".yarn/sdks",
+  "prettier.prettierPath": ".yarn/sdks/prettier/index.js",
+  "typescript.tsdk": ".yarn/sdks/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true
 }
diff --git a/angular.json b/angular.json
index c4d8904..e49df02 100644
--- a/angular.json
+++ b/angular.json
@@ -26,10 +26,11 @@
               "src/favicon.ico"
             ],
             "styles": [
-              "src/styles.scss"
+              "src/styles.scss",
+              "vendor/cookieconsent/cookieconsent.min.css"
             ],
             "scripts": [
-              "node_modules/cookieconsent/build/cookieconsent.min.js"
+              "vendor/cookieconsent/cookieconsent.min.js"
             ],
             "extractLicenses": false,
             "sourceMap": true,
@@ -85,10 +86,11 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.spec.json",
             "scripts": [
-              "node_modules/cookieconsent/build/cookieconsent.min.js"
+              "vendor/cookieconsent/cookieconsent.min.js"
             ],
             "styles": [
-              "src/styles.scss"
+              "src/styles.scss",
+              "vendor/cookieconsent/cookieconsent.min.css"
             ],
             "assets": [
               "src/static",
diff --git a/package.json b/package.json
index c224740..3d7f5ae 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve --host 0.0.0.0 --port 9000 --proxy-config proxy.conf.json",
-    "build": "ng build --configuration production --subresource-integrity --output-hashing=none --aot --delete-output-path --deploy-url /uds/res/modern/ --base-href /uds/page",
+    "build": "ng build --configuration production --subresource-integrity --output-hashing=none --aot --delete-output-path --deploy-url /uds/res/modern/ --base-href /uds/page && yarn postbuild",
     "postbuild": "python3 toUDS.py",
     "test": "ng test",
     "lint": "ng lint",
@@ -27,7 +27,6 @@
     "@angular/platform-browser": "^18.0.3",
     "@angular/platform-browser-dynamic": "^18.0.3",
     "@angular/router": "^18.0.3",
-    "cookieconsent": "^3.1.1",
     "core-js": "^3.21.1",
     "rxjs": "^7.5.4",
     "tslib": "^2.3.1",
@@ -45,6 +44,7 @@
     "@angular/cli": "^18.0.4",
     "@angular/compiler-cli": "^18.0.3",
     "@angular/language-service": "^18.0.3",
+    "@types/cookieconsent": "^3",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.6",
     "@types/node": "^12.11.1",
@@ -70,5 +70,6 @@
     "protractor": "^7.0.0",
     "ts-node": "~8.4.1",
     "typescript": "~5.4.5"
-  }
+  },
+  "packageManager": "yarn@4.3.1"
 }