Skip to content

Commit

Permalink
Merge branch 'release/v0.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
musicEnfanthen committed Feb 26, 2022
2 parents bf48af0 + d5bf03e commit e08aa88
Show file tree
Hide file tree
Showing 314 changed files with 19,179 additions and 6,966 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Ignore miscellaneous folders
.angular/
.cache/
.github/
.idea/
.husky/
Expand Down
15 changes: 4 additions & 11 deletions .github/workflows/ci_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node-version: [12, 14.17, 16]
node-version: [14.17, 16, 17]

steps:
- name: Checkout repo
Expand All @@ -28,7 +28,7 @@ jobs:
fetch-depth: 0 # Get all history and branches

- name: Set up node ${{ matrix.node-version}}
uses: actions/setup-node@v2.5.0
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
Expand All @@ -55,17 +55,10 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

- name: Test build for GH Pages (Node < v16)
if: matrix.node-version != 16
- name: Test build for GH Pages
run: |
yarn run build:gh
# Workaround for build path issue with node 16:
# https://github.com/angular/angular-cli/issues/21202
- name: Test build for GH Pages (Node == v16)
if: matrix.node-version == 16
run: |
yarn build:prod --delete-output-path false --base-href $npm_package_homepage && yarn gzip:dist && yarn doc:build
deploy:
Expand All @@ -85,7 +78,7 @@ jobs:
uses: actions/checkout@v2

- name: Set up node ${{ matrix.node-version}}
uses: actions/setup-node@v2.5.0
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ speed-measure-plugin*.json

# misc
/.angular/cache
/.cache/
/.sass-cache
/connect.lock
/coverage
Expand Down
1 change: 0 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@

# cf. https://typicode.github.io/husky/#/?id=package-scripts
yarn run lint-staged
yarn run format:fix-staged
3 changes: 2 additions & 1 deletion .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"src/**/*.{ts,html}": ["yarn lint-files:fix"]
"src/**/*.{ts,tsx,js,jsx,html}": "yarn lint-files:fix",
"src/**/*.{ts,tsx,js,jsx,html,css,json,md}": "yarn format-files:fix"
}
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ speed-measure-plugin*.json
.history/*

# misc
/.angular/cache
/.cache/
/.sass-cache
/connect.lock
/coverage
Expand Down
148 changes: 148 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@
},
"defaultProject": "awg-app",
"cli": {
"defaultCollection": "@angular-eslint/schematics"
"defaultCollection": "@angular-eslint/schematics",
"cache": {
"enabled": true,
"path": ".angular/cache",
"environment": "all"
}
}
}
92 changes: 45 additions & 47 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "awg-app",
"version": "0.7.19",
"version": "0.8.0",
"license": "MIT",
"author": {
"name": "Stefan Münnich",
Expand Down Expand Up @@ -52,9 +52,8 @@
"lint-files:fix": "yarn lint-files --fix",
"lint-staged": "lint-staged",
"tslint-check": "tslint-config-prettier-check ./tslint.json",
"format:check": "prettier --check \"src/**/*.{ts,js,css,html}\"",
"format:write": "prettier --write \"src/**/*.{ts,js,css,html}\"",
"format:fix-staged": "pretty-quick --staged",
"format-files:check": "prettier --check \"src/**/*.{ts,js,css,html}\"",
"format-files:fix": "prettier --write \"src/**/*.{ts,js,css,html}\"",
"-- DOCS --": "",
"doc": "yarn compodoc --tsconfig tsconfig.doc.json --theme Readthedocs --output dist/awg-app/compodoc",
"doc:build": "yarn doc",
Expand All @@ -75,84 +74,83 @@
"deploy:ci": "ng deploy --no-build --message=\"Release $npm_package_name (v$npm_package_version) on gh-pages\""
},
"dependencies": {
"@angular/animations": "~13.1.1",
"@angular/common": "~13.1.1",
"@angular/compiler": "~13.1.1",
"@angular/core": "~13.1.1",
"@angular/forms": "~13.1.1",
"@angular/localize": "~13.1.1",
"@angular/platform-browser": "~13.1.1",
"@angular/platform-browser-dynamic": "~13.1.1",
"@angular/platform-server": "~13.1.1",
"@angular/router": "~13.1.1",
"@angular/animations": "~13.2.4",
"@angular/common": "~13.2.4",
"@angular/compiler": "~13.2.4",
"@angular/core": "~13.2.4",
"@angular/forms": "~13.2.4",
"@angular/localize": "~13.2.4",
"@angular/platform-browser": "~13.2.4",
"@angular/platform-browser-dynamic": "~13.2.4",
"@angular/platform-server": "~13.2.4",
"@angular/router": "~13.2.4",
"@ctrl/ngx-codemirror": "^5.1.1",
"@fortawesome/angular-fontawesome": "^0.10.1",
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@kolkov/ngx-gallery": "^1.2.3",
"@fortawesome/fontawesome-svg-core": "^1.3.0",
"@fortawesome/free-solid-svg-icons": "^6.0.0",
"@kolkov/ngx-gallery": "2.0.1",
"@ng-bootstrap/ng-bootstrap": "^11.0.0",
"bootstrap": "^4.6.1",
"codemirror": "^5.64.0",
"core-js": "^3.19.1",
"codemirror": "^5.65.2",
"core-js": "^3.21.1",
"d3-drag": "^3.0.0",
"d3-force": "^3.0.0",
"d3-selection": "^3.0.0",
"d3-zoom": "^3.0.0",
"font-awesome": "^4.7.0",
"json2typescript": "^1.4.1",
"n3": "^1.12.2",
"n3": "^1.13.0",
"ngx-json-viewer": "^3.0.2",
"ngx-order-pipe": "^2.2.0",
"rdfstore": "^0.9.17",
"rxjs": "~6.6.7",
"rxjs": "~7.5.4",
"snapsvg": "^0.5.1",
"tslib": "^2.3.1",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~13.1.2",
"@angular-eslint/builder": "^13.0.1",
"@angular-eslint/eslint-plugin": "^13.0.1",
"@angular-eslint/eslint-plugin-template": "^13.0.1",
"@angular-eslint/schematics": "^13.0.1",
"@angular-eslint/template-parser": "^13.0.1",
"@angular/cli": "~13.1.2",
"@angular/compiler-cli": "~13.1.1",
"@commitlint/cli": "^15.0.0",
"@commitlint/config-angular": "^15.0.0",
"@compodoc/compodoc": "^1.1.16",
"@angular-devkit/build-angular": "~13.2.5",
"@angular-eslint/builder": "^13.1.0",
"@angular-eslint/eslint-plugin": "^13.1.0",
"@angular-eslint/eslint-plugin-template": "^13.1.0",
"@angular-eslint/schematics": "^13.1.0",
"@angular-eslint/template-parser": "^13.1.0",
"@angular/cli": "~13.2.5",
"@angular/compiler-cli": "~13.2.4",
"@commitlint/cli": "^16.2.1",
"@commitlint/config-angular": "^16.2.1",
"@compodoc/compodoc": "^1.1.19",
"@types/d3": "^7.1.0",
"@types/jasmine": "~3.10.2",
"@types/jasmine": "~3.10.3",
"@types/node": "^15.14.9",
"@typescript-eslint/eslint-plugin": "^5.7.0",
"@typescript-eslint/parser": "^5.7.0",
"@typescript-eslint/eslint-plugin": "^5.12.1",
"@typescript-eslint/parser": "^5.12.1",
"angular-cli-ghpages": "^1.0.0",
"conventional-recommended-bump": "^6.1.0",
"cross-var": "^1.1.0",
"eslint": "^8.4.1",
"eslint-config-prettier": "^8.3.0",
"eslint": "^8.9.0",
"eslint-config-prettier": "^8.4.0",
"eslint-plugin-angular": "^4.1.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-jsdoc": "^37.2.2",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsdoc": "^37.9.4",
"eslint-plugin-prettier": "^4.0.0",
"gzipper": "^6.0.0",
"gzipper": "^7.0.0",
"husky": "^7.0.4",
"jasmine-core": "~3.10.1",
"karma": "~6.3.9",
"jasmine-core": "~4.0.1",
"karma": "~6.3.16",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "^2.1.0",
"karma-coverage": "^2.2.0",
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.7.0",
"lint-staged": "^12.1.2",
"lint-staged": "^12.3.4",
"prettier": "^2.5.1",
"pretty-quick": "^3.1.2",
"source-map-explorer": "^2.5.2",
"standard-version": "^9.3.2",
"typescript": "~4.5.4",
"typescript": "~4.5.5",
"webpack-bundle-analyzer": "^4.5.0"
},
"engines": {
"node": ">= 12.14.1",
"node": ">= 14.17.0",
"npm": ">= 6.14.0",
"yarn": "^1.22.0"
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { appHomepage, appVersion, appVersionReleaseDate } from './app.globals';
export class AppConfig {
/**
* Getter for the URL of the Salsah API endpoint
* ({@link https://www.salsah.org}).
* ({@link https://www.salsah.org/api}).
*
* @returns {string}
*/
Expand Down
6 changes: 3 additions & 3 deletions src/app/app.globals.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY!
// Generated last time on Sat Jan 15 13:29:14 2022
// Generated last time on Sat Feb 26 08:50:29 2022

/**
* The latest version of the AWG App
*/
export const appVersion = '0.7.19';
export const appVersion = '0.8.0';

/**
* The release date of the latest version of the AWG App
*/
export const appVersionReleaseDate = '15. Januar 2022';
export const appVersionReleaseDate = '26. Februar 2022';

/**
* The URL of the AWG App
Expand Down
11 changes: 10 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { LOCALE_ID, NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { HttpClientModule } from '@angular/common/http';
import { registerLocaleData } from '@angular/common';
import localeDeDE from '@angular/common/locales/de';
Expand All @@ -24,7 +25,15 @@ registerLocaleData(localeDeDE);
* as well as the {@link CoreModule}, {@link SharedModule} and {@link SideInfoModule}.
*/
@NgModule({
imports: [BrowserModule, HttpClientModule, CoreModule, SharedModule, SideInfoModule, AppRoutingModule],
imports: [
BrowserModule,
BrowserAnimationsModule,
HttpClientModule,
CoreModule,
SharedModule,
SideInfoModule,
AppRoutingModule,
],
declarations: [AppComponent],
providers: [{ provide: LOCALE_ID, useValue: 'de-DE' }], // Change global LOCALE-ID
bootstrap: [AppComponent],
Expand Down
Loading

0 comments on commit e08aa88

Please sign in to comment.