Merge branch 'master' into issue663

.eslintrc.json

@@ -5,15 +5,23 @@
     "es2021": true,
     "jest/globals": true
   },
-  "extends": ["eslint:recommended", "plugin:react/recommended"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:prettier/recommended"
+  ],
   "globals": {
     "process": true
   },
   "overrides": [
     {
       "files": ["test/**"],
       "plugins": ["jest"],
-      "extends": ["plugin:jest/recommended"],
+      "extends": [
+        "eslint:recommended",
+        "plugin:jest/recommended",
+        "plugin:prettier/recommended"
+      ],
       "rules": { "jest/prefer-expect-assertions": "off" }
     }
   ],

.github/workflows/pr.yml

@@ -2,7 +2,7 @@ name: Pull request
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   lint:
@@ -25,14 +25,15 @@ jobs:
         # Hopefully this allows us to catch problems
         # with differing versions ahead of time.
         node-version: [19.x]
-      
+
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
+          cache: npm
           node-version: ${{ matrix.node-version }}
-        # https://docs.npmjs.com/cli/v9/commands/npm-ci
-      - run: npm install --force
+      - run: npm ci
+      - run: npm run lint
       - run: npm run build
-      - run: npm test
+      - run: npm test

.github/workflows/push.yml

@@ -1,6 +1,6 @@
 name: Push
 
-on: 
+on:
   push:
     branches:
       - master

.npmrc

@@ -0,0 +1,2 @@
+# required for react conflict https://github.com/vre2h/use-react-screenshot/issues/40
+legacy-peer-deps=true

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "search.useIgnoreFiles": true
-}
+  "search.useIgnoreFiles": true
+}

Makefile

@@ -1,5 +1,5 @@
 install:
-	npm install --force
+	npm ci
 build:
 	npm run build
 debug:

README.md

@@ -1,5 +1,5 @@
 # Welcome :wave: !
- 
+
 This is the official web app of the PolicyEngine project. <br/><br/>
 ![PolicyEngineWebApp](https://user-images.githubusercontent.com/117248915/221730075-b368a1df-d0d4-455c-8768-329e1eb9318e.png)
 
@@ -24,7 +24,7 @@ https://github.com/PolicyEngine/policyengine-app.git
 2. Install dependencies
 
 ```
-npm install
+npm ci
 ```
 
 3. Start a server on localhost to see your changes

jsconfig.json

@@ -1,5 +1,5 @@
 {
-    "compilerOptions": {
-        "baseUrl": "src"
-    }
+  "compilerOptions": {
+    "baseUrl": "src"
+  }
 }