From ed5727cdc2887edbf659d1b4cf0c997ef4c371e8 Mon Sep 17 00:00:00 2001
From: Garth <244253+xgp@users.noreply.github.com>
Date: Mon, 18 Mar 2024 13:33:10 +0100
Subject: [PATCH] switch to yarn

Signed-off-by: Garth <244253+xgp@users.noreply.github.com>
---
 README.md    |  4 +---
 package.json |  6 +-----
 pom.xml      | 21 +++++++++------------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index ee4d3ecb..954b14b7 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Start the idp-wizard:
 ```bash
 git clone https://github.com/p2-inc/idp-wizard
 cd idp-wizard
-npm install --legacy-peer-deps && npm run start:dev
+yarn install --force && npm run start:dev
 ```
 
 ## License
@@ -102,5 +102,3 @@ We’ve changed the license of our core extensions from the AGPL v3 to the [Elas
 -----
 
 All other documentation, source code and other files in this repository are Copyright 2024 Phase Two, Inc.
-
-
diff --git a/package.json b/package.json
index 1b886949..05b11fc6 100644
--- a/package.json
+++ b/package.json
@@ -7,20 +7,16 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "prebuild": "npm run clean",
     "dr:surge": "node dr-surge.js",
-    "build": "webpack --config webpack.prod.js && npm run dr:surge",
+    "build": "yarn clean && webpack --config webpack.prod.js && yarn dr:surge",
     "start": "sirv dist --cors --single --host --port 8080",
     "start:dev": "webpack serve --color --progress --config webpack.dev.js",
     "test": "jest --watch",
     "test:coverage": "jest --coverage",
     "eslint": "eslint --ext .tsx,.js ./src/",
-    "lint": "npm run eslint",
     "format": "prettier --check --write ./src/**/*.{tsx,ts}",
     "type-check": "tsc --noEmit",
-    "ci-checks": "npm run type-check && npm run lint && npm run test:coverage",
     "build:bundle-profile": "webpack --config webpack.prod.js --profile --json > stats.json",
-    "bundle-profile:analyze": "npm run build:bundle-profile && webpack-bundle-analyzer ./stats.json",
     "clean": "rimraf dist",
     "storybook": "start-storybook -p 6006",
     "build:storybook": "build-storybook"
diff --git a/pom.xml b/pom.xml
index ebf407f4..b26d4efa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,36 +86,33 @@
 	<version>1.15.0</version>
         <executions>
           <execution>
-	    <id>setup-node-and-npm</id>
+	    <id>setup-node-and-yarn</id>
 	    <goals>
-	      <goal>install-node-and-npm</goal>
+	      <goal>install-node-and-yarn</goal>
 	    </goals>
 	    <phase>initialize</phase>
           </execution>
 	  <execution>
-	    <id>npm-install</id>
+	    <id>yarn-install</id>
 	    <goals>
-	      <goal>npm</goal>
+	      <goal>yarn</goal>
 	    </goals>
-	    <configuration>
-	      <arguments>install</arguments>
-	    </configuration>
 	    <phase>initialize</phase>
           </execution>
           <execution>
-	    <id>npm-build</id>
+	    <id>yarn-build</id>
 	    <goals>
-	      <goal>npm</goal>
+	      <goal>yarn</goal>
 	    </goals>
 	    <configuration>
-	      <arguments>run build</arguments>
+	      <arguments>build</arguments>
 	    </configuration>
 	    <phase>generate-resources</phase>
           </execution>
 	</executions>
         <configuration>
-          <nodeVersion>v16.13.2</nodeVersion>
-          <npmVersion>8.3.2</npmVersion>
+          <nodeVersion>v19.1.0</nodeVersion>
+          <yarnVersion>v1.22.19</yarnVersion>
 	  <workingDirectory>.</workingDirectory>
         </configuration>
       </plugin>