Fix merge conflicts.

cerner · Oct 27, 2023 · 0710859 · 0710859
2 parents f9f7448 + 5e170f7
commit 0710859
Show file tree

Hide file tree

Showing 555 changed files with 76,235 additions and 7,758 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1 +1,2 @@
 FROM docker.cernerrepos.net/ion/ion-node:5
+RUN npm install npm@9
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -18,4 +18,4 @@ runs:
       run: npm run clean
     - name: Install Dependencies
       shell: bash
-      run: npm install
+      run: npm ci
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -42,7 +42,7 @@ jobs:
           npm run lint
       - name: Testing Project
         run: |
-          npm run jest
+          npm run jest:no-coverage
       - if: github.event_name == 'pull_request'
         name: Danger
         uses: danger/[email protected]
@@ -81,7 +81,7 @@ jobs:
         env:
           SITE: build/${{ matrix.theme }}
           FORM_FACTOR: ${{ matrix.form-factor }}
-        run: npm run wdio-${{ matrix.theme }}
+        run: npm run wdio:${{ matrix.theme }}
 
   release-and-deploy:
     runs-on: ubuntu-latest

diff --git a/.npmrc b/.npmrc
@@ -1,2 +1,2 @@
-package-lock=false
+package-lock=true
 legacy-peer-deps=true
diff --git a/README.md b/README.md
@@ -182,7 +182,7 @@ npm run test
       For example:
        ```sh
        "scripts": {
-        "wdio-fusion": "terra wdio --disableSeleniumService=true --themes orion-fusion-theme",
+        "wdio:fusion": "terra wdio --disableSeleniumService=true --themes orion-fusion-theme",
         }
        ```
     - If any of the compose files were to be changed, you must refresh the docker container by deleting the corresponding existing docker images, then running the following command:
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		FROM docker.cernerrepos.net/ion/ion-node:5
		RUN npm install npm@9