Merge branch 'release/v0.7.5'

webern-unibas-ch · Aug 28, 2020 · daac122 · daac122
2 parents acfd0c3 + c7ee26d
commit daac122
Show file tree

Hide file tree

Showing 159 changed files with 5,255 additions and 3,718 deletions.
diff --git a/browserslist → .browserslistrc b/browserslist → .browserslistrc
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -0,0 +1,55 @@
+name: CI Tests
+
+on:
+    push:
+        branches:
+            - '**'
+        tags-ignore:
+            - '*'
+        paths-ignore:
+            - '**.md'
+
+jobs:
+    test:
+        name: Run tests (Node v${{ matrix.node-version }}, ${{ matrix.os }})
+        runs-on: ${{ matrix.os }}
+        strategy:
+            matrix:
+                os: [ubuntu-latest]
+                node-version: [10, 12.18, 14]
+
+        steps:
+            - name: Checkout repo
+              uses: actions/checkout@v2
+
+            - name: Set up node ${{ matrix.node-version}}
+              uses: actions/setup-node@v1
+              with:
+                  node-version: ${{ matrix.node-version }}
+
+            - name: Cache node modules
+              uses: actions/cache@v2
+              with:
+                  path: ~/.yarn
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-node-
+
+            - name: yarn install dependencies
+              run: |
+                  yarn install
+
+            - name: Run CI tests with coverage
+              run: |
+                  yarn run test:ci
+
+            - name: Upload code coverage
+              if: matrix.node-version == 12.18 # upload coverage report for current node version only
+              uses: codecov/codecov-action@v1
+              with:
+                  flags: unittests
+                  env_vars: ${{ matrix.os }}, ${{ matrix.node-version }}
+
+            - name: Test build for Github Pages
+              run: |
+                  yarn run build:prod
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -0,0 +1,46 @@
+name: Deployment
+
+on:
+    push:
+        branches:
+            - master # generally, only deploy if we are on 'master'
+
+jobs:
+    build:
+        name: Deploy app (Node v${{ matrix.node-version }}, ${{ matrix.os }})
+        runs-on: ${{ matrix.os }}
+        strategy:
+            matrix:
+                os: [ubuntu-latest]
+                node-version: [12.18]
+
+        steps:
+            - name: Checkout repo
+              uses: actions/checkout@v2
+
+            - name: Set up node ${{ matrix.node-version}}
+              uses: actions/setup-node@v1
+              with:
+                  node-version: ${{ matrix.node-version }}
+
+            - name: Cache node modules
+              uses: actions/cache@v2
+              with:
+                  path: ~/.yarn
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-node-
+
+            - name: yarn install dependencies
+              run: |
+                  yarn install
+
+            - name: Build app for GH Pages
+              run: |
+                  yarn build:gh
+
+            - name: Deploy to GH Pages
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  yarn run deploy:ci
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 
 language: node_js
 node_js:
-    - '10'
+    - '12'
 
 addons:
     chrome: stable
@@ -26,8 +26,8 @@ stages:
     - name: test
       if: tag IS blank # exclude tags from being tested
     # deploy stage
-    - name: deploy # generally, only deploy if we are on 'master'
-      if: branch = master
+    #- name: deploy # generally, only deploy if we are on 'master'
+    #  if: branch = master
 
 jobs:
     include:
@@ -39,8 +39,8 @@ jobs:
           after_success:
               # run code coverage only after successful tests
               - bash <(curl -s https://codecov.io/bash)
-        - stage: deploy
-          name: 'Deploy to gh-pages'
-          script:
-              # run deploy script (only on master, see stages)
-              - yarn run deploy:ci
+        #- stage: deploy
+        #  name: 'Deploy to gh-pages'
+        #  script:
+        #      # run deploy script (only on master, see stages)
+        #      - yarn run deploy:ci
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.7.5](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.4...v0.7.5) (2020-08-28)
+
+### Features
+
+-   **edition:** lazy load edition view feature modules ([88db959](https://github.com/webern-unibas-ch/awg-app/commit/88db959a4b0957bbe1e9b6b82cedc858e9979505))
+
+### Bug Fixes
+
+-   **app:** remove BrowserAnimationsModule ([3b7ef7c](https://github.com/webern-unibas-ch/awg-app/commit/3b7ef7ca32951aa8df2bb7dcf5db1b8238d2da88))
+-   **edition:** add alpha value to forceSimulation restart ([7b2216f](https://github.com/webern-unibas-ch/awg-app/commit/7b2216fc7b1ec38601633f9337a7f111ee7658eb))
+-   **edition:** end all subscriptions on destroy ([58306a4](https://github.com/webern-unibas-ch/awg-app/commit/58306a484087964e65383219c24d2fd2c649f9a5))
+-   **edition:** fix convolute navigation error ([4c38f5a](https://github.com/webern-unibas-ch/awg-app/commit/4c38f5a06f975a0caabb492bdcd94ec023e37194)), closes [#15](https://github.com/webern-unibas-ch/awg-app/issues/15)
+-   **edition:** fix ReferenceError of EditonGraphModule caused by N3 ([73d64c0](https://github.com/webern-unibas-ch/awg-app/commit/73d64c01c8466f87f4833accea4e8dd5bd39e7bf)), closes [#21](https://github.com/webern-unibas-ch/awg-app/issues/21)
+-   **edition:** move N3 graph methods into service ([94cce2d](https://github.com/webern-unibas-ch/awg-app/commit/94cce2d1adb50a782d77831ab1efd410cdfb4c0e))
+-   **edition:** remove service from GraphVisualizerModule ([3882525](https://github.com/webern-unibas-ch/awg-app/commit/3882525a968c9d7a9486366a24691ac43f34e4eb))
+-   **page-not-found:** fix image width for 404 ([f5d5199](https://github.com/webern-unibas-ch/awg-app/commit/f5d5199ab80ec6095bcb59b6fbdb950d8e944cde))
+-   **shared:** fix creation of dynamic module in compile-html ([f50f49a](https://github.com/webern-unibas-ch/awg-app/commit/f50f49a21fe58e1dd3793e9b42734621b2f6b1fc))
+-   **shared:** fix json2typescript decorators after breaking change ([b826ecf](https://github.com/webern-unibas-ch/awg-app/commit/b826ecf62bbdeead39a9b0c098bef6e1f710ab9d))
+
 ### [0.7.4](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.3...v0.7.4) (2020-07-16)
 
 ### Build System

diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # AWG App
 
 ![GitHub package.json version](https://img.shields.io/github/package-json/v/webern-unibas-ch/awg-app.svg)
+![Deployment](https://github.com/webern-unibas-ch/awg-app/workflows/Deployment/badge.svg)
+![CI tests](https://github.com/webern-unibas-ch/awg-app/workflows/CI%20Tests/badge.svg)
 [![Build Status](https://travis-ci.org/webern-unibas-ch/awg-app.svg?branch=master)](https://travis-ci.org/webern-unibas-ch/awg-app)
 [![codecov](https://codecov.io/gh/webern-unibas-ch/awg-app/branch/master/graph/badge.svg)](https://codecov.io/gh/webern-unibas-ch/awg-app)
 [![compodoc](https://edition.anton-webern.ch/compodoc/images/coverage-badge-documentation.svg)](https://edition.anton-webern.ch/compodoc/index.html)

diff --git a/angular.json b/angular.json
@@ -13,13 +13,22 @@
                 "build": {
                     "builder": "@angular-devkit/build-angular:browser",
                     "options": {
-                        "outputPath": "dist",
+                        "outputPath": "dist/awg-app",
                         "index": "src/index.html",
                         "main": "src/main.ts",
                         "polyfills": "src/polyfills.ts",
                         "tsConfig": "tsconfig.app.json",
                         "assets": ["src/favicon.ico", "src/assets"],
                         "aot": false,
+                        "allowedCommonJsDependencies": [
+                            "@ctrl/ngx-codemirror",
+                            "lodash",
+                            "codemirror/mode/sparql/sparql",
+                            "codemirror/mode/go/go",
+                            "codemirror/mode/turtle/turtle",
+                            "json2typescript",
+                            "readable-stream"
+                        ],
                         "styles": [
                             "src/index.style.css",
                             "node_modules/bootstrap/dist/css/bootstrap.min.css",
@@ -51,7 +60,6 @@
                             "sourceMap": false,
                             "extractCss": true,
                             "namedChunks": false,
-                            "aot": false,
                             "extractLicenses": true,
                             "vendorChunk": false,
                             "buildOptimizer": false,
@@ -112,6 +120,13 @@
                             "src/plugins/htmlConverter.js"
                         ],
                         "assets": ["src/favicon.ico", "src/assets"]
+                    },
+                    "configurations": {
+                        "ci": {
+                            "watch": false,
+                            "progress": false,
+                            "browsers": "ChromeHeadlessCI"
+                        }
                     }
                 },
                 "lint": {
@@ -132,6 +147,15 @@
                             "devServerTarget": "awg-app:serve:production"
                         }
                     }
+                },
+                "deploy": {
+                    "builder": "angular-cli-ghpages:deploy",
+                    "options": {
+                        "name": "github-actions",
+                        "email": "github-actions@users.noreply.github.com",
+                        "repo": "https://github.com/webern-unibas-ch/awg-app.git",
+                        "cname": "edition.anton-webern.ch"
+                    }
                 }
             }
         }

diff --git a/commitlint.config.js b/commitlint.config.js
@@ -23,7 +23,8 @@ module.exports = {
                 'README',
                 'CHANGELOG',
                 'LICENSE',
-                'travis'
+                'travis',
+                'gh-actions'
             ]
         ]
     }

diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
@@ -1,9 +1,9 @@
 {
-    "extends": "../tsconfig.json",
+    "extends": "../tsconfig.base.json",
     "compilerOptions": {
         "outDir": "../out-tsc/app",
         "module": "commonjs",
-        "target": "es5",
+        "target": "es2018",
         "types": ["jasmine", "jasminewd2", "node"]
     }
 }
diff --git a/karma.conf.js b/karma.conf.js
@@ -32,9 +32,9 @@ module.exports = function(config) {
         reporters: ['progress', 'kjhtml'],
         customLaunchers: {
             // cf. https://medium.com/faun/configuring-travis-ci-for-angular-application-34afee1715f
-            ChromeHeadlessNoSandbox: {
+            ChromeHeadlessCI: {
                 base: 'ChromeHeadless',
-                flags: ['--no-sandbox']
+                flags: ['--no-sandbox', '--disable-gpu']
             }
         },
         port: 9876,