Skip to content

Commit 800a551

Browse files
committed
Merge branch 'stage' for release 1.3.0
2 parents c330df4 + fcb7253 commit 800a551

File tree

148 files changed

+6412
-9791
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+6412
-9791
lines changed
File renamed without changes.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ speed-measure-plugin*.json
3232
.history/*
3333

3434
# misc
35+
/.angular/cache
3536
/.sass-cache
3637
/connect.lock
3738
/coverage

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Based on https://mherman.org/blog/dockerizing-an-angular-app/
22
# base image
3-
FROM node:12-alpine as DEV
3+
FROM node:14-alpine as DEV
44

55
# removed this for now
66
# install chrome for protractor tests
@@ -17,7 +17,7 @@ ENV PATH /app/node_modules/.bin:$PATH
1717
# install and cache app dependencies
1818
COPY package.json /app/package.json
1919
RUN npm install
20-
RUN npm install -g @angular/cli@7.3.9
20+
RUN npm install -g @angular/cli@14.2.3
2121

2222
# add app
2323
COPY . /app

Dockerfile-prod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Based on https://mherman.org/blog/dockerizing-an-angular-app/
22
# base image
3-
FROM node:12-alpine as builder
3+
FROM node:14-alpine as builder
44

55
# removed this for now
66
# install chrome for protractor tests
@@ -17,7 +17,7 @@ ENV PATH /app/node_modules/.bin:$PATH
1717
# install and cache app dependencies
1818
COPY package.json /app/package.json
1919
RUN npm install
20-
RUN npm install -g @angular/cli@7.3.9
20+
RUN npm install -g @angular/cli@14.2.3
2121

2222
# add app
2323
COPY . /app

angular.json

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@
2222
"main": "src/main.ts",
2323
"polyfills": "src/polyfills.ts",
2424
"tsConfig": "tsconfig.app.json",
25-
"aot": true,
2625
"assets": [
27-
"src/favicon.ico",
26+
"src/favicon.ico",
2827
"src/assets",
29-
{ "glob": "**/*", "input": "node_modules/ngx-monaco-editor/assets/monaco", "output": "./assets/monaco/" }
28+
{ "glob": "**/*", "input": "node_modules/monaco-editor", "output": "assets/monaco-editor" }
3029
],
3130
"styles": [
3231
"./node_modules/animate.css/animate.min.css",
@@ -36,14 +35,19 @@
3635
"scripts": [
3736
"node_modules/popper.js/dist/umd/popper.min.js",
3837
"node_modules/bootstrap/dist/js/bootstrap.min.js"
39-
]
38+
],
39+
"vendorChunk": true,
40+
"extractLicenses": false,
41+
"buildOptimizer": false,
42+
"sourceMap": true,
43+
"optimization": false,
44+
"namedChunks": true
4045
},
4146
"configurations": {
4247
"production": {
4348
"optimization": true,
4449
"outputHashing": "all",
4550
"sourceMap": false,
46-
"extractCss": true,
4751
"namedChunks": false,
4852
"extractLicenses": true,
4953
"vendorChunk": false,
@@ -61,7 +65,8 @@
6165
}
6266
]
6367
}
64-
}
68+
},
69+
"defaultConfiguration": ""
6570
},
6671
"serve": {
6772
"builder": "@angular-devkit/build-angular:dev-server",
@@ -92,17 +97,6 @@
9297
"scripts": []
9398
}
9499
},
95-
"lint": {
96-
"builder": "@angular-devkit/build-angular:tslint",
97-
"options": {
98-
"tsConfig": [
99-
"tsconfig.app.json",
100-
"tsconfig.spec.json",
101-
"e2e/tsconfig.json"
102-
],
103-
"exclude": ["**/node_modules/**"]
104-
}
105-
},
106100
"e2e": {
107101
"builder": "@angular-devkit/build-angular:protractor",
108102
"options": {

e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": ["jasmine", "jasminewd2", "node"]
88
}
99
}

0 commit comments

Comments
 (0)