Moving to npm rather than yarn (#694)

* moved to npm rather than yarn * fixed actions package cacheing * test fix
Mastercard · Jan 22, 2024 · 5dc6d6b · 5dc6d6b
1 parent bf3bfd7
commit 5dc6d6b
Show file tree

Hide file tree

Showing 8 changed files with 10,694 additions and 8,162 deletions.
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -34,8 +34,8 @@ jobs:
       uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
       with:
         node-version: '14.15.1'
-        cache: 'yarn'
-        cache-dependency-path: report/report-ng/yarn.lock
+        cache: 'npm'
+        cache-dependency-path: report/report-ng/package-lock.json
 
     - name: Run mutation testing
       run: mvn -B -Paggregate -Dnode=system test org.pitest:pitest-maven:mutationCoverage package

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,8 +28,8 @@ jobs:
       uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
       with:
         node-version: 16
-        cache: 'yarn'
-        cache-dependency-path: report/report-ng/yarn.lock
+        cache: 'npm'
+        cache-dependency-path: report/report-ng/package-lock.json
 
     - name: Configure Git User
       run: |

diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -35,8 +35,8 @@ jobs:
         uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
         with:
           node-version: '14.15.1'
-          cache: 'yarn'
-          cache-dependency-path: report/report-ng/yarn.lock
+          cache: 'npm'
+          cache-dependency-path: report/report-ng/package-lock.json
 
       - name: Cache SonarCloud packages
         uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,8 +32,8 @@ jobs:
       uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
       with:
         node-version: '14.15.1'
-        cache: 'yarn'
-        cache-dependency-path: report/report-ng/yarn.lock
+        cache: 'npm'
+        cache-dependency-path: report/report-ng/package-lock.json
 
     - name: Build with Maven
       run: mvn -B -Dnode=system package

diff --git a/report/report-core/src/test/java/com/mastercard/test/flow/report/WriterTest.java b/report/report-core/src/test/java/com/mastercard/test/flow/report/WriterTest.java
@@ -258,9 +258,9 @@ void chunkLoadingPath() throws Exception {
 						+ delta.getTarget().getLines().get( 0 ).length() )
 				.replaceAll( "\\d", "#" );
 
-		assertEquals( "f),[])),a.u=e=>(###===e?\"commo",
+		assertEquals( "d),[])),r.u=e=>(###===e?\"commo",
 				before, "raw resource runtime snippet" );
-		assertEquals( "f),[])),a.u=e=>\"res/\"+(###===e?\"commo",
+		assertEquals( "d),[])),r.u=e=>\"res/\"+(###===e?\"commo",
 				after, "written runtime snippet" );
 	}