Skip to content

Commit edfcdb2

Browse files
committed
Build infrastructure and Angular 15 upgrade
1 parent aa27ebe commit edfcdb2

File tree

101 files changed

+16010
-33626
lines changed

Some content is hidden

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

101 files changed

+16010
-33626
lines changed

.editorconfig

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# https://editorconfig.org
1+
# Editor configuration, see https://editorconfig.org
22
root = true
33

44
[*]
@@ -8,7 +8,9 @@ indent_size = 2
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

11+
[*.ts]
12+
quote_type = single
1113

1214
[*.md]
13-
max_line_length = 0
15+
max_line_length = off
1416
trim_trailing_whitespace = false

.gitignore

+40-18
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,42 @@
1-
dist/
2-
node_modules/
3-
out-tsc/
4-
debug.log
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# Compiled output
4+
/dist
5+
/tmp
6+
/out-tsc
7+
/bazel-out
8+
9+
# Node
10+
/node_modules
511
npm-debug.log
6-
src/**/*.js
7-
src/**/*.d.ts
8-
!src/lib/typings.d.ts
9-
!src/demo/typings.d.ts
10-
!src/demo/systemjs.config.js
11-
!src/demo/systemjs.config.lib.js
12-
!**/*systemjs-angular-loader.js
13-
*.js.map
14-
e2e/**/*.js
15-
e2e/**/*.js.map
16-
.DS_Store
17-
**/.DS_Store
18-
*.iml
12+
yarn-error.log
13+
14+
# IDEs and editors
1915
.idea/
20-
!/src/lib/@types/codemirror-minified/index.d.ts
16+
.project
17+
.classpath
18+
.c9/
19+
*.launch
20+
.settings/
21+
*.sublime-workspace
22+
23+
# Visual Studio Code
24+
.vscode/*
25+
!.vscode/settings.json
26+
!.vscode/tasks.json
27+
!.vscode/launch.json
28+
!.vscode/extensions.json
29+
.history/*
30+
31+
# Miscellaneous
32+
/.angular/cache
33+
.sass-cache/
34+
/connect.lock
35+
/coverage
36+
/libpeerconnection.log
37+
testem.log
38+
/typings
39+
40+
# System files
41+
.DS_Store
42+
Thumbs.db

angular.json

+73-117
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,78 @@
11
{
2-
"$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"version": 1,
44
"newProjectRoot": "projects",
55
"projects": {
6-
"dev": {
7-
"root": "",
6+
"spring-flo": {
7+
"projectType": "library",
8+
"root": "projects/flo",
9+
"sourceRoot": "projects/flo",
10+
"architect": {
11+
"build": {
12+
"builder": "@angular-devkit/build-angular:ng-packagr",
13+
"options": {
14+
"project": "projects/flo/ng-package.json"
15+
},
16+
"configurations": {
17+
"production": {
18+
"tsConfig": "projects/flo/tsconfig.prod.json"
19+
},
20+
"development": {
21+
"tsConfig": "projects/flo/tsconfig.dev.json"
22+
}
23+
},
24+
"defaultConfiguration": "production"
25+
}
26+
}
27+
},
28+
"demo": {
829
"projectType": "application",
30+
"schematics": {
31+
"@schematics/angular:application": {
32+
"strict": true
33+
}
34+
},
35+
"root": "projects/demo",
36+
"sourceRoot": "projects/demo",
937
"architect": {
1038
"build": {
1139
"builder": "@angular-devkit/build-angular:browser",
1240
"options": {
13-
"outputPath": "dist-demo",
14-
"index": "src/demo/index.html",
15-
"main": "src/demo/main.ts",
16-
"tsConfig": "src/demo/tsconfig.dev.json",
17-
"polyfills": "src/demo/polyfills.ts",
41+
"outputPath": "dist/demo",
42+
"index": "projects/demo/index.html",
43+
"main": "projects/demo/main.ts",
44+
"polyfills": "projects/demo/polyfills.ts",
45+
"tsConfig": "tsconfig.json",
1846
"assets": [
19-
{
20-
"glob": "**/*",
21-
"input": "src/demo/icons",
22-
"output": "/icons"
23-
},
24-
{
25-
"glob": "favicon.ico",
26-
"input": "src/demo",
27-
"output": "/"
28-
}
47+
"projects/demo/favicon.ico",
48+
"projects/demo/icons"
2949
],
3050
"styles": [
31-
"src/demo/styles.css"
51+
"projects/demo/styles.css"
3252
],
3353
"scripts": []
3454
},
3555
"configurations": {
3656
"production": {
37-
"optimization": true,
38-
"outputHashing": "all",
39-
"sourceMap": false,
40-
"extractCss": true,
41-
"namedChunks": false,
42-
"aot": true,
43-
"extractLicenses": true,
44-
"vendorChunk": false,
45-
"buildOptimizer": true,
57+
"budgets": [
58+
{
59+
"type": "initial",
60+
"maximumWarning": "1500kb",
61+
"maximumError": "2500kb"
62+
},
63+
{
64+
"type": "anyComponentStyle",
65+
"maximumWarning": "2kb",
66+
"maximumError": "4kb"
67+
}
68+
],
69+
"fileReplacements": [
70+
{
71+
"replace": "projects/demo/environments/environment.ts",
72+
"with": "projects/demo/environments/environment.prod.ts"
73+
}
74+
],
75+
"outputHashing": "all"
4676
},
4777
"development": {
4878
"buildOptimizer": false,
@@ -52,122 +82,48 @@
5282
"sourceMap": true,
5383
"namedChunks": true
5484
}
55-
}
85+
},
86+
"defaultConfiguration": "production"
5687
},
5788
"serve": {
5889
"builder": "@angular-devkit/build-angular:dev-server",
59-
"options": {
60-
"browserTarget": "dev:build"
61-
},
6290
"configurations": {
6391
"production": {
64-
"browserTarget": "dev:build:production"
92+
"browserTarget": "demo:build:production"
6593
},
6694
"development": {
67-
"browserTarget": "dev:build:development"
95+
"browserTarget": "demo:build:development"
6896
}
6997
},
7098
"defaultConfiguration": "development"
7199
},
72100
"extract-i18n": {
73101
"builder": "@angular-devkit/build-angular:extract-i18n",
74102
"options": {
75-
"browserTarget": "dev:build"
103+
"browserTarget": "demo:build"
76104
}
77105
},
78-
"lint": {
79-
"builder": "@angular-devkit/build-angular:tslint",
106+
"test": {
107+
"builder": "@angular-devkit/build-angular:karma",
80108
"options": {
81-
"tsConfig": [
82-
"tsconfig.json"
83-
],
84-
"exclude": []
85-
}
86-
}
87-
}
88-
},
89-
"packaged": {
90-
"root": "",
91-
"projectType": "application",
92-
"architect": {
93-
"build": {
94-
"builder": "@angular-devkit/build-angular:browser",
95-
"options": {
96-
"outputPath": "dist-demo",
97-
"index": "src/demo/index.html",
98-
"main": "src/demo/main.ts",
99-
"tsConfig": "src/demo/tsconfig.packaged.json",
100-
"polyfills": "src/demo/polyfills.ts",
109+
"main": "projects/demo/test.ts",
110+
"polyfills": "projects/demo/polyfills.ts",
111+
"tsConfig": "projects/demo/tsconfig.spec.json",
112+
"karmaConfig": "projects/demo/karma.conf.js",
101113
"assets": [
102-
{
103-
"glob": "**/*",
104-
"input": "src/demo/icons",
105-
"output": "/icons"
106-
},
107-
{
108-
"glob": "favicon.ico",
109-
"input": "src/demo",
110-
"output": "/"
111-
}
114+
"projects/demo/favicon.ico",
115+
"projects/demo/icons"
112116
],
113117
"styles": [
114-
"src/demo/styles.css"
118+
"projects/demo/styles.css"
115119
],
116120
"scripts": []
117-
},
118-
"configurations": {
119-
"production": {
120-
"optimization": true,
121-
"outputHashing": "all",
122-
"sourceMap": false,
123-
"extractCss": true,
124-
"namedChunks": false,
125-
"aot": true,
126-
"extractLicenses": true,
127-
"vendorChunk": false,
128-
"buildOptimizer": true
129-
}
130-
}
131-
},
132-
"serve": {
133-
"builder": "@angular-devkit/build-angular:dev-server",
134-
"options": {
135-
"browserTarget": "packaged:build"
136-
},
137-
"configurations": {
138-
"production": {
139-
"browserTarget": "packaged:build:production"
140-
}
141-
}
142-
},
143-
"extract-i18n": {
144-
"builder": "@angular-devkit/build-angular:extract-i18n",
145-
"options": {
146-
"browserTarget": "packaged:build"
147-
}
148-
},
149-
"lint": {
150-
"builder": "@angular-devkit/build-angular:tslint",
151-
"options": {
152-
"tsConfig": [
153-
"tsconfig.json"
154-
],
155-
"exclude": []
156121
}
157122
}
158123
}
159124
}
160125
},
161-
"schematics": {
162-
"@schematics/angular:component": {
163-
"prefix": "app",
164-
"styleext": "css"
165-
},
166-
"@schematics/angular:directive": {
167-
"prefix": "app"
168-
}
169-
},
170126
"cli": {
171-
"analytics": false
127+
"analytics": "bd528680-ddc0-4237-939c-9732e1a89a68"
172128
}
173129
}

integration/.gitignore

-10
This file was deleted.

integration/README.md

-26
This file was deleted.

integration/bs-config.aot.json

-5
This file was deleted.

integration/bs-config.e2e-aot.json

-11
This file was deleted.

integration/bs-config.e2e.json

-14
This file was deleted.

0 commit comments

Comments
 (0)