Merge pull request #80 from JoSSte/chore/npmUpdate

Upgrading to angular 14
JoSSte · Nov 15, 2022 · 6b4d28a · 6b4d28a
2 parents cd1f557 + 4479b26
commit 6b4d28a
Show file tree

Hide file tree

Showing 9 changed files with 18,291 additions and 24,454 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,18 +6,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Cache node modules
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
       - name: Node ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: npm install and npm run build
@@ -31,15 +31,14 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           artifacts: "dist/angular-githubaction/*"
-          token: ${{ secrets.TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v1
         if: always()
         with:
           files: test-results/*.xml
       #- name: Deploy to GH pages
       #  if: startsWith(github.ref, 'refs/tags/v')
-      #  run: |
-      #    npm i angular-cli-ghpages
-      #    cp ./dist/index.html ./dist/404.html
-      #    angular-cli-ghpages
+      # uses: JamesIves/github-pages-deploy-action@v4
+      #  with:
+      #    folder: dist # The folder the action should deploy.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/README.md b/README.md
@@ -71,7 +71,8 @@ if(r !== null){
 ```
 
 ## Sample Data
-These can also be found at [sample.participants.json](/resources/sample.participants.json) if you want to test the centralized JSON option  
+These can also be found at [sample.participants.json](/resources/sample.participants.json) if you want to test the centralized JSON option.  
+To test locally use http://localhost:4200/assets/json/participants_andeby.json  
 
 ``` json
 [

diff --git a/angular.json b/angular.json
@@ -98,18 +98,6 @@
               "src/favicon.ico"
             ]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -124,22 +112,10 @@
             "protractorConfig": "./protractor.conf.js",
             "devServerTarget": "scrum-timer:serve"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "e2e/tsconfig.e2e.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
   },
-  "defaultProject": "scrum-timer",
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",