Skip to content

Commit 3bfb832

Browse files
committed
Merge branch 'release/1.4.0'
2 parents d3cddb5 + 67c8f46 commit 3bfb832

File tree

156 files changed

+29408
-9513
lines changed

Some content is hidden

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

156 files changed

+29408
-9513
lines changed

client/Dockerfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
## Stage 1 : Install dependencies
22
FROM node:15.7.0 as builder
33

4-
RUN npm i -g @angular/cli
5-
6-
COPY package.json /tmp/package.json
7-
COPY package-lock.json /tmp/package-lock.json
8-
RUN cd /tmp && npm install
9-
104
RUN mkdir /stm-client
115
WORKDIR /stm-client/
12-
RUN cp -r /tmp/node_modules ./
6+
7+
COPY package.json /stm-client/package.json
8+
COPY package-lock.json /stm-client/package-lock.json
9+
10+
RUN npm install
1311

1412

1513

client/Dockerfile-test

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
## Stage 1 : Install dependencies
22
FROM node:15.7.0 as builder
33

4-
RUN npm i -g @angular/cli
5-
6-
COPY package.json /tmp/package.json
7-
COPY package-lock.json /tmp/package-lock.json
8-
RUN cd /tmp && npm install
9-
104
RUN mkdir /stm-client
115
WORKDIR /stm-client/
12-
RUN cp -r /tmp/node_modules ./
6+
7+
COPY package.json /stm-client/package.json
8+
COPY package-lock.json /stm-client/package-lock.json
9+
10+
RUN npm install
1311

1412

1513

client/angular.json

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,18 @@
6161
}
6262
]
6363
},
64+
"dev": {
65+
"buildOptimizer": false,
66+
"optimization": {
67+
"scripts": false,
68+
"styles": false,
69+
"fonts": false
70+
},
71+
"vendorChunk": true,
72+
"extractLicenses": false,
73+
"sourceMap": true,
74+
"namedChunks": true
75+
},
6476
"ja": {
6577
"localize": [
6678
"ja"
@@ -88,7 +100,14 @@
88100
"with": "src/environments/environment.prod.ts"
89101
}
90102
],
91-
"optimization": true,
103+
"optimization": {
104+
"scripts": true,
105+
"styles": {
106+
"minify": true,
107+
"inlineCritical": true
108+
},
109+
"fonts": true
110+
},
92111
"outputHashing": "all",
93112
"sourceMap": false,
94113
"namedChunks": false,
@@ -103,7 +122,7 @@
103122
},
104123
{
105124
"type": "anyComponentStyle",
106-
"maximumWarning": "9kb",
125+
"maximumWarning": "10kb",
107126
"maximumError": "15kb"
108127
}
109128
]
@@ -135,7 +154,8 @@
135154
}
136155
]
137156
}
138-
}
157+
},
158+
"defaultConfiguration": "dev"
139159
},
140160
"serve": {
141161
"builder": "@angular-devkit/build-angular:dev-server",
@@ -163,6 +183,9 @@
163183
},
164184
"fr-FR": {
165185
"browserTarget": "simple-task-manager:build:fr-FR"
186+
},
187+
"dev": {
188+
"browserTarget": "simple-task-manager:build:dev"
166189
}
167190
}
168191
},

client/e2e/protractor.conf.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

client/e2e/src/app.e2e-spec.ts

Lines changed: 0 additions & 23 deletions
This file was deleted.

client/e2e/src/app.po.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

client/e2e/tsconfig.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)