Skip to content
This repository was archived by the owner on Sep 15, 2023. It is now read-only.

Commit 41f912d

Browse files
gillerrgillerr
authored
Merge pull request #23 from admin-ch/update
Update
2 parents c0a93b9 + c59a2c4 commit 41f912d

24 files changed

+7612
-8164
lines changed

browserslist renamed to .browserslistrc

File renamed without changes.

‎.github/workflows/nodejs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [10.x, 12.x]
19+
node-version: [10.x, 12.x, 14.x]
2020

2121
steps:
2222
- uses: actions/checkout@v2

‎.husky/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

‎.husky/_/husky.sh‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/sh
2+
if [ -z "$husky_skip_init" ]; then
3+
debug () {
4+
[ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1"
5+
}
6+
7+
readonly hook_name="$(basename "$0")"
8+
debug "starting $hook_name..."
9+
10+
if [ "$HUSKY" = "0" ]; then
11+
debug "HUSKY env variable is set to 0, skipping hook"
12+
exit 0
13+
fi
14+
15+
if [ -f ~/.huskyrc ]; then
16+
debug "sourcing ~/.huskyrc"
17+
. ~/.huskyrc
18+
fi
19+
20+
export readonly husky_skip_init=1
21+
sh -e "$0" "$@"
22+
exitCode="$?"
23+
24+
if [ $exitCode != 0 ]; then
25+
echo "husky - $hook_name hook exited with code $exitCode (error)"
26+
exit $exitCode
27+
fi
28+
29+
exit 0
30+
fi

‎.husky/commit-msg‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
node scripts/hook.commit-rules

‎.husky/pre-push‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
node scripts/hook.push-clean

‎.npmrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
registry=https://registry.npmjs.org/
2+
strict-ssl=false

‎angular.json‎

Lines changed: 121 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,16 @@
2828
"tsConfig": "tsconfig.app.json",
2929
"aot": true,
3030
"assets": [
31-
"src/assets",
32-
"src/robots.txt",
3331
{
34-
"glob": "**/frutiger.css",
35-
"input": "node_modules/@oblique/oblique/styles",
36-
"output": "assets/styles"
32+
"glob": "**/*",
33+
"input": "node_modules/@oblique/oblique/assets",
34+
"output": "assets"
3735
},
3836
{
39-
"glob": "**/*.json",
37+
"glob": "**/frutiger.css",
4038
"input": "node_modules/@oblique/oblique/styles",
4139
"output": "assets/styles"
4240
},
43-
{
44-
"glob": "images/favicon.png",
45-
"input": "node_modules/@oblique/oblique/styles",
46-
"output": "assets/styles/images"
47-
},
48-
{
49-
"glob": "images/logo.svg",
50-
"input": "node_modules/@oblique/oblique/styles",
51-
"output": "assets/styles/images"
52-
},
5341
{
5442
"glob": "*headers.conf",
5543
"input": "src/nginx",
@@ -59,14 +47,18 @@
5947
"glob": "Staticfile",
6048
"input": "src/nginx",
6149
"output": "./.."
62-
}
50+
},
51+
"src/assets",
52+
"src/robots.txt"
6353
],
6454
"styles": [
6555
"node_modules/@oblique/oblique/styles/css/oblique-core.css",
6656
"node_modules/@oblique/oblique/styles/css/oblique-material.css",
6757
"src/styles/styles.scss"
6858
],
69-
"scripts": []
59+
"scripts": [
60+
"node_modules/@oblique/oblique/ob-features.js"
61+
]
7062
},
7163
"configurations": {
7264
"dev": {
@@ -79,11 +71,33 @@
7971
"optimization": false,
8072
"outputHashing": "all",
8173
"sourceMap": true,
82-
"extractCss": true,
8374
"namedChunks": false,
8475
"extractLicenses": true,
8576
"vendorChunk": false,
86-
"buildOptimizer": true,
77+
"buildOptimizer": true, "assets": [
78+
{
79+
"glob": "**/*",
80+
"input": "node_modules/@oblique/oblique/assets",
81+
"output": "assets"
82+
},
83+
{
84+
"glob": "**/frutiger.css",
85+
"input": "node_modules/@oblique/oblique/styles",
86+
"output": "assets/styles"
87+
},
88+
{
89+
"glob": "*headers.conf",
90+
"input": "src/nginx",
91+
"output": "./../nginx/conf/includes"
92+
},
93+
{
94+
"glob": "Staticfile",
95+
"input": "src/nginx",
96+
"output": "./.."
97+
},
98+
"src/assets",
99+
"src/robots.txt"
100+
],
87101
"budgets": [
88102
{
89103
"type": "initial",
@@ -101,20 +115,44 @@
101115
{
102116
"replace": "src/environments/environment.ts",
103117
"with": "src/environments/environment.test.ts"
104-
},
105-
{
106-
"replace": "src/nginx/csp_headers.conf",
107-
"with": "src/nginx/csp_headers-test.conf"
108118
}
109119
],
110120
"optimization": true,
111121
"outputHashing": "all",
112122
"sourceMap": false,
113-
"extractCss": true,
114123
"namedChunks": false,
115124
"extractLicenses": true,
116125
"vendorChunk": false,
117126
"buildOptimizer": true,
127+
"assets": [
128+
{
129+
"glob": "**/*",
130+
"input": "node_modules/@oblique/oblique/assets",
131+
"output": "assets"
132+
},
133+
{
134+
"glob": "**/frutiger.css",
135+
"input": "node_modules/@oblique/oblique/styles",
136+
"output": "assets/styles"
137+
},
138+
{
139+
"glob": "*headers.conf",
140+
"input": "src/nginx",
141+
"output": "./../nginx/conf/includes"
142+
},
143+
{
144+
"glob": "csp_headers.conf",
145+
"input": "src/nginx/test",
146+
"output": "./../nginx/conf/includes"
147+
},
148+
{
149+
"glob": "Staticfile",
150+
"input": "src/nginx",
151+
"output": "./.."
152+
},
153+
"src/assets",
154+
"src/robots.txt"
155+
],
118156
"budgets": [
119157
{
120158
"type": "initial",
@@ -133,20 +171,44 @@
133171
{
134172
"replace": "src/environments/environment.ts",
135173
"with": "src/environments/environment.abn.ts"
136-
},
137-
{
138-
"replace": "src/nginx/csp_headers.conf",
139-
"with": "src/nginx/csp_headers-abn.conf"
140174
}
141175
],
142176
"optimization": true,
143177
"outputHashing": "all",
144178
"sourceMap": false,
145-
"extractCss": true,
146179
"namedChunks": false,
147180
"extractLicenses": true,
148181
"vendorChunk": false,
149182
"buildOptimizer": true,
183+
"assets": [
184+
{
185+
"glob": "**/*",
186+
"input": "node_modules/@oblique/oblique/assets",
187+
"output": "assets"
188+
},
189+
{
190+
"glob": "**/frutiger.css",
191+
"input": "node_modules/@oblique/oblique/styles",
192+
"output": "assets/styles"
193+
},
194+
{
195+
"glob": "*headers.conf",
196+
"input": "src/nginx",
197+
"output": "./../nginx/conf/includes"
198+
},
199+
{
200+
"glob": "csp_headers.conf",
201+
"input": "src/nginx/abn",
202+
"output": "./../nginx/conf/includes"
203+
},
204+
{
205+
"glob": "Staticfile",
206+
"input": "src/nginx",
207+
"output": "./.."
208+
},
209+
"src/assets",
210+
"src/robots.txt"
211+
],
150212
"budgets": [
151213
{
152214
"type": "initial",
@@ -165,20 +227,44 @@
165227
{
166228
"replace": "src/environments/environment.ts",
167229
"with": "src/environments/environment.prod.ts"
168-
},
169-
{
170-
"replace": "src/nginx/csp_headers.conf",
171-
"with": "src/nginx/csp_headers-prod.conf"
172230
}
173231
],
174232
"optimization": true,
175233
"outputHashing": "all",
176234
"sourceMap": false,
177-
"extractCss": true,
178235
"namedChunks": false,
179236
"extractLicenses": true,
180237
"vendorChunk": false,
181238
"buildOptimizer": true,
239+
"assets": [
240+
{
241+
"glob": "**/*",
242+
"input": "node_modules/@oblique/oblique/assets",
243+
"output": "assets"
244+
},
245+
{
246+
"glob": "**/frutiger.css",
247+
"input": "node_modules/@oblique/oblique/styles",
248+
"output": "assets/styles"
249+
},
250+
{
251+
"glob": "*headers.conf",
252+
"input": "src/nginx",
253+
"output": "./../nginx/conf/includes"
254+
},
255+
{
256+
"glob": "csp_headers.conf",
257+
"input": "src/nginx/prod",
258+
"output": "./../nginx/conf/includes"
259+
},
260+
{
261+
"glob": "Staticfile",
262+
"input": "src/nginx",
263+
"output": "./.."
264+
},
265+
"src/assets",
266+
"src/robots.txt"
267+
],
182268
"budgets": [
183269
{
184270
"type": "initial",

0 commit comments

Comments
 (0)