Commit 92525108 authored by lukas.burgey's avatar lukas.burgey

Merge branch 'update' into dev

parents 9d8cd20f 0e5a4555
......@@ -4,9 +4,9 @@ DEST := $(HOME)/www
NM := node_modules
NG := $(NM)/.bin/ng
NG_BUILD := $(NG) build --aot --output-path $(DEST)
NG_BUILD := $(NG) build --aot --output-path $(DEST)
.PHONY: all, clean, cleaner, dev, watch, prod, watch-prod
.PHONY: all, clean, cleaner, dev, watch, prod, watch-prod, $(NM)
all: prod
......@@ -22,15 +22,15 @@ $(NM):
$(NG): $(NM)
dev: $(HOME) $(NG)
@$(NG_BUILD)
$(NG_BUILD)
watch: $(HOME) $(NG)
@$(NG_BUILD) --watch
$(NG_BUILD) --watch
prod: $(HOME) $(NG)
@$(NG_BUILD) --prod
$(NG_BUILD) --prod
watch-prod: $(HOME) $(NG)
@$(NG_BUILD) --prod --watch
$(NG_BUILD) --prod --watch
$(DEST): $(HOME) prod
......@@ -11,6 +11,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
......@@ -27,6 +28,12 @@
},
"configurations": {
"production": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
......@@ -98,7 +105,7 @@
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "css"
"style": "css"
},
"@schematics/angular:directive": {
"prefix": "app"
......
This diff is collapsed.
{
"name": "feudal-webpage",
"version": "0.1.0",
"version": "1.0.0",
"license": "MIT",
"scripts": {
"ng": "ng",
......@@ -12,43 +12,42 @@
},
"private": true,
"dependencies": {
"@angular/animations": "8.2.14",
"@angular/cdk": "^8.2.3",
"@angular/common": "8.2.14",
"@angular/compiler": "8.2.14",
"@angular/core": "8.2.14",
"@angular/forms": "8.2.14",
"@angular/material": "^8.2.3",
"@angular/platform-browser": "8.2.14",
"@angular/platform-browser-dynamic": "8.2.14",
"@angular/animations": "9.1.4",
"@angular/cdk": "^9.2.2",
"@angular/common": "9.1.4",
"@angular/compiler": "9.1.4",
"@angular/core": "9.1.4",
"@angular/forms": "9.1.4",
"@angular/material": "^9.2.2",
"@angular/platform-browser": "9.1.4",
"@angular/platform-browser-dynamic": "9.1.4",
"@stomp/ng2-stompjs": "^7.2.0",
"core-js": "^2.6.3",
"hammerjs": "^2.0.8",
"ngx-cookie-service": "^2.1.0",
"npm": "^6.13.6",
"rxjs": "^6.5.4",
"tslib": "^1.9.0",
"zone.js": "~0.9.1"
"core-js": "^2.6.11",
"ngx-cookie-service": "^2.4.0",
"npm": "^6.14.4",
"rxjs": "^6.5.5",
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.803.22",
"@angular/cli": "8.3.22",
"@angular/compiler-cli": "8.2.14",
"@types/jasmine": "^3.3.8",
"@types/jasminewd2": "^2.0.6",
"@types/node": "^10.12.20",
"codelyzer": "^5.0.1",
"@angular-devkit/build-angular": "~0.901.4",
"@angular/cli": "9.1.4",
"@angular/compiler-cli": "9.1.4",
"@types/jasmine": "^3.5.10",
"@types/jasminewd2": "^2.0.8",
"@types/node": "^12.11.1",
"codelyzer": "^5.2.2",
"jasmine-core": "~3.3.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "^4.4.1",
"karma": "^5.0.4",
"karma-chrome-launcher": "~2.2.0",
"karma-cli": "~2.0.0",
"karma-coverage-istanbul-reporter": "^2.0.4",
"karma-coverage-istanbul-reporter": "^2.1.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"protractor": "~5.4.2",
"ts-node": "~8.0.2",
"karma-jasmine-html-reporter": "^1.5.3",
"protractor": "^6.0.0",
"ts-node": "^8.9.1",
"tslint": "~5.12.1",
"typescript": "3.5.3"
"typescript": "3.8.3"
}
}
......@@ -4,8 +4,6 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
import 'hammerjs';
if (environment.production) {
enableProdMode();
}
......
......@@ -5,8 +5,11 @@
"baseUrl": "./",
"types": []
},
"exclude": [
"test.ts",
"**/*.spec.ts"
"files": [
"main.ts",
"polyfills.ts"
],
"include": [
"src/**/*.d.ts"
]
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment