Skip to content

Commit

Permalink
Feature/angular6 (#100)
Browse files Browse the repository at this point in the history
* update client dependencies to Angular 6
* update to TypeScript 2.9.2
* also update other dependencies such as ng-bootstrap, ace, rxjs, ...
* optimize imports in Java and TypeScript
* update webpack and tsconfig configuration for new angular 6 version
  • Loading branch information
krusche committed Aug 30, 2018
1 parent 52ed6a4 commit 6662a62
Show file tree
Hide file tree
Showing 46 changed files with 1,515 additions and 2,812 deletions.
131 changes: 73 additions & 58 deletions package.json
Expand Up @@ -8,117 +8,131 @@
"node_modules"
],
"dependencies": {
"@angular/common": "5.2.11",
"@angular/compiler": "5.2.11",
"@angular/core": "5.2.11",
"@angular/forms": "5.2.11",
"@angular/platform-browser": "5.2.11",
"@angular/platform-browser-dynamic": "5.2.11",
"@angular/router": "5.2.11",
"@angular/upgrade": "5.2.11",
"@angular/common": "6.1.6",
"@angular/compiler": "6.1.6",
"@angular/core": "6.1.6",
"@angular/forms": "6.1.6",
"@angular/platform-browser": "6.1.6",
"@angular/platform-browser-dynamic": "6.1.6",
"@angular/router": "6.1.6",
"@angular/upgrade": "6.1.6",
"@fortawesome/angular-fontawesome": "0.1.1",
"@fortawesome/fontawesome-svg-core": "1.2.4",
"@fortawesome/free-solid-svg-icons": "5.3.1",
"@ls1intum/apollon": "0.4.12",
"@ng-bootstrap/ng-bootstrap": "1.1.2",
"@ng-bootstrap/ng-bootstrap": "3.2.0",
"@types/remarkable": "^1.7.0",
"ace-builds": "1.3.3",
"ace-builds": "1.4.1",
"angular": "1.5.8",
"angular-fittext": "2.1.1",
"angular-translate-interpolation-messageformat": "^2.17.0",
"angular2-moment": "^1.7.1",
"bootstrap": "4.1.1",
"angular2-moment": "1.9.0",
"bootstrap": "4.1.3",
"bower": "^1.8.4",
"core-js": "2.5.7",
"moment": "2.22.2",
"font-awesome": "4.7.0",
"interactjs": "1.3.4",
"jquery": "3.3.1",
"ng-jhipster": "0.5.3",
"ng-jhipster": "0.5.4",
"ng2-ace-editor": "^0.3.8",
"ng2-charts": "^1.6.0",
"ng2-dnd": "^5.0.2",
"ngx-cacheable": "1.0.6",
"ngx-cookie": "4.0.2",
"ngx-infinite-scroll": "0.8.4",
"ngx-infinite-scroll": "6.0.1",
"ngx-treeview": "6.0.0",
"ngx-webstorage": "2.0.1",
"ngx-cacheable": "1.0.6",
"popper.js": "^1.14.3",
"reflect-metadata": "0.1.12",
"remarkable": "^1.7.1",
"rxjs": "5.5.11",
"rxjs": "6.3.0",
"rxjs-compat": "6.3.0",
"showdown": "1.8.6",
"sockjs-client": "1.1.5",
"tether": "1.4.4",
"webstomp-client": "1.2.0",
"tslib": "1.9.3",
"webstomp-client": "1.2.4",
"yarn": "^1.9.4",
"zone.js": "0.8.26"
},
"devDependencies": {
"@angular/cli": "1.7.4",
"@angular/compiler-cli": "5.2.11",
"@ngtools/webpack": "6.0.8",
"@types/angular": "^1.6.45",
"@types/jasmine": "2.8.7",
"@types/node": "9.6.21",
"@angular/cli": "6.1.5",
"@angular/compiler-cli": "6.1.6",
"@ngtools/webpack": "6.1.5",
"@types/angular": "^1.6.50",
"@types/jasmine": "2.8.8",
"@types/jest": "23.3.1",
"@types/node": "10.9.4",
"angular": "1.5.8",
"angular-router-loader": "0.8.5",
"angular2-template-loader": "0.6.2",
"awesome-typescript-loader": "4.0.1",
"browser-sync": "2.24.4",
"awesome-typescript-loader": "5.2.0",
"browser-sync": "2.24.7",
"browser-sync-webpack-plugin": "2.2.2",
"cache-loader": "1.2.2",
"codelyzer": "4.3.0",
"copy-webpack-plugin": "4.5.1",
"css-loader": "0.28.11",
"codelyzer": "4.4.4",
"copy-webpack-plugin": "4.5.2",
"css-loader": "1.0.0",
"exports-loader": "0.7.0",
"extract-text-webpack-plugin": "4.0.0-beta.0",
"file-loader": "1.1.11",
"fork-ts-checker-webpack-plugin": "0.4.2",
"generator-jhipster": "4.14.5",
"file-loader": "2.0.0",
"fork-ts-checker-webpack-plugin": "0.4.9",
"friendly-errors-webpack-plugin": "1.7.0",
"generator-jhipster": "5.2.1",
"html-loader": "0.5.5",
"html-webpack-plugin": "3.2.0",
"jasmine-core": "3.1.0",
"karma": "1.7.1",
"jasmine-core": "3.2.1",
"karma": "3.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-coverage": "1.1.1",
"karma-coverage": "1.1.2",
"karma-intl-shim": "1.0.3",
"karma-jasmine": "1.1.0",
"karma-jasmine": "1.1.2",
"karma-junit-reporter": "1.2.0",
"karma-notify-reporter": "1.0.1",
"karma-phantomjs-launcher": "1.0.4",
"karma-remap-istanbul": "0.6.0",
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "2.0.13",
"merge-jsons-webpack-plugin": "1.0.15",
"node-sass": "4.9.0",
"karma-webpack": "3.0.0",
"merge-jsons-webpack-plugin": "1.0.17",
"moment-locales-webpack-plugin": "1.0.7",
"node-sass": "4.9.3",
"patch-package": "^5.1.1",
"phantomjs-prebuilt": "2.1.16",
"postcss-loader": "2.1.5",
"postcss-loader": "3.0.0",
"postinstall-prepare": "^1.0.1",
"prettier": "1.13.5",
"prettier": "1.14.2",
"proxy-middleware": "0.15.0",
"rimraf": "2.6.2",
"sass-loader": "7.0.3",
"simple-progress-webpack-plugin": "1.1.2",
"sass-loader": "7.1.0",
"sourcemap-istanbul-instrumenter-loader": "0.2.0",
"style-loader": "0.21.0",
"style-loader": "0.23.0",
"tapable": "1.0.0",
"thread-loader": "1.1.5",
"terser-webpack-plugin": "1.0.2",
"thread-loader": "1.2.0",
"to-string-loader": "1.1.5",
"ts-loader": "4.4.1",
"tslint": "5.10.0",
"tslint-config-prettier": "1.13.0",
"ts-loader": "4.5.0",
"tslint": "5.11.0",
"tslint-config-prettier": "1.15.0",
"tslint-loader": "3.6.0",
"typescript": "2.8.4",
"uglifyjs-webpack-plugin": "1.2.5",
"webpack": "4.13.0",
"webpack-cli": "3.0.8",
"webpack-dev-server": "3.1.4",
"webpack-merge": "4.1.3",
"typescript": "2.9.2",
"uglifyjs-webpack-plugin": "1.3.0",
"webpack": "4.17.1",
"webpack-cli": "3.1.0",
"webpack-dev-server": "3.1.7",
"webpack-merge": "4.1.4",
"webpack-notifier": "1.6.0",
"webpack-visualizer-plugin": "0.1.11",
"workbox-webpack-plugin": "3.2.0",
"workbox-webpack-plugin": "3.4.1",
"write-file-webpack-plugin": "4.3.2"
},
"engines": {
"node": ">=8.9.0"
"node": ">=8.9.0",
"yarn": ">=1.3.2"
},
"scripts": {
"precommit": "lint-staged",
"prettier:format": "yarn prettier --write 'src/**/*.{ts,css,scss}'",
"lint": "tslint --project tsconfig.json -e 'node_modules/**'",
"lint:fix": "yarn run lint --fix",
Expand All @@ -128,10 +142,11 @@
"start": "yarn run webpack:dev",
"serve": "yarn run start",
"build": "yarn run webpack:prod",
"test": "yarn run lint && karma start src/test/javascript/karma.conf.js",
"test:watch": "yarn test --watch",
"webpack:dev": "yarn run webpack-dev-server --config webpack/webpack.dev.js --progress --inline --hot --profile --port=9060 --watch-content-base",
"webpack:build:main": "yarn run webpack --config webpack/webpack.dev.js --progress --profile",
"test": "yarn run lint && jest --coverage --logHeapUsage -w=2 --config src/test/javascript/jest.conf.js",
"test:watch": "yarn test --watch --clearCache",
"webpack:dev": "yarn run webpack-dev-server --config webpack/webpack.dev.js --inline --hot --port=9060 --watch-content-base --env.stats=minimal",
"webpack:dev-verbose": "yarn run webpack-dev-server --config webpack/webpack.dev.js --inline --hot --port=9060 --watch-content-base --profile --progress --env.stats=normal",
"webpack:build:main": "yarn run webpack --config webpack/webpack.dev.js --env.stats=minimal",
"webpack:build": "yarn run cleanup && yarn run webpack:build:main",
"webpack:prod:main": "node_modules/bower/bin/bower install && yarn run webpack --config webpack/webpack.prod.js --profile",
"webpack:prod": "yarn run cleanup && yarn run webpack:prod:main && yarn run clean-www",
Expand Down
@@ -1,7 +1,8 @@
package de.tum.in.www1.artemis.domain;

import javax.persistence.*;

import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import java.io.Serializable;
import java.util.Objects;

Expand Down
@@ -1,10 +1,8 @@
package de.tum.in.www1.artemis.domain;

import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;

import javax.persistence.*;

import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import java.io.Serializable;
import java.util.Objects;

Expand Down
@@ -1,12 +1,12 @@
package de.tum.in.www1.artemis.domain;

import de.tum.in.www1.artemis.domain.enumeration.DiagramType;

import javax.persistence.*;
import java.io.Serializable;
import java.time.ZonedDateTime;
import java.util.Objects;

import de.tum.in.www1.artemis.domain.enumeration.DiagramType;

/**
* A ModelingExercise.
*/
Expand Down
@@ -1,10 +1,8 @@
package de.tum.in.www1.artemis.domain;

import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;

import javax.persistence.*;

import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import java.io.Serializable;
import java.util.Objects;

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/de/tum/in/www1/artemis/domain/Result.java
Expand Up @@ -12,7 +12,9 @@
import java.io.Serializable;
import java.text.DecimalFormat;
import java.time.ZonedDateTime;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

/**
* A Result.
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/de/tum/in/www1/artemis/domain/TextExercise.java
@@ -1,10 +1,9 @@
package de.tum.in.www1.artemis.domain;

import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;

import javax.persistence.*;

import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Lob;
import java.io.Serializable;
import java.util.Objects;

Expand Down
@@ -1,10 +1,9 @@
package de.tum.in.www1.artemis.domain;

import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;

import javax.persistence.*;

import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Lob;
import java.io.Serializable;
import java.util.Objects;

Expand Down
@@ -1,10 +1,9 @@
package de.tum.in.www1.artemis.repository;

import de.tum.in.www1.artemis.domain.DragAndDropMapping;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import org.springframework.data.jpa.repository.*;


/**
* Spring Data JPA repository for the DragAndDropMapping entity.
Expand Down
@@ -1,11 +1,11 @@
package de.tum.in.www1.artemis.repository;

import de.tum.in.www1.artemis.domain.FileUploadExercise;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import org.springframework.data.jpa.repository.*;

import java.util.List;


Expand Down
@@ -1,10 +1,9 @@
package de.tum.in.www1.artemis.repository;

import de.tum.in.www1.artemis.domain.FileUploadSubmission;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import org.springframework.data.jpa.repository.*;


/**
* Spring Data JPA repository for the FileUploadSubmission entity.
Expand Down
@@ -1,10 +1,9 @@
package de.tum.in.www1.artemis.repository;

import de.tum.in.www1.artemis.domain.ProgrammingSubmission;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import org.springframework.data.jpa.repository.*;


/**
* Spring Data JPA repository for the ProgrammingSubmission entity.
Expand Down
@@ -1,10 +1,9 @@
package de.tum.in.www1.artemis.repository;

import de.tum.in.www1.artemis.domain.Submission;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import org.springframework.data.jpa.repository.*;


/**
* Spring Data JPA repository for the Submission entity.
Expand Down
@@ -1,11 +1,11 @@
package de.tum.in.www1.artemis.repository;

import de.tum.in.www1.artemis.domain.TextExercise;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

import org.springframework.data.jpa.repository.*;

import java.util.List;


Expand Down
@@ -1,10 +1,9 @@
package de.tum.in.www1.artemis.repository;

import de.tum.in.www1.artemis.domain.TextSubmission;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import org.springframework.data.jpa.repository.*;


/**
* Spring Data JPA repository for the TextSubmission entity.
Expand Down

0 comments on commit 6662a62

Please sign in to comment.