Skip to content

Commit 7c37368

Browse files
authored
Merge pull request #16 from Service-Soft/dev
Release 18.0.1
2 parents 45bc0ba + 43c3fe1 commit 7c37368

18 files changed

+9435
-8627
lines changed

.vscode/extensions.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
3-
"recommendations": ["angular.ng-template"]
4-
}
2+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
3+
"recommendations": ["angular.ng-template"]
4+
}

.vscode/launch.json

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
2-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
3-
"version": "0.2.0",
4-
"configurations": [
5-
{
6-
"name": "ng serve",
7-
"type": "pwa-chrome",
8-
"request": "launch",
9-
"preLaunchTask": "npm: start",
10-
"url": "http://localhost:4200/"
11-
},
12-
{
13-
"name": "ng test",
14-
"type": "chrome",
15-
"request": "launch",
16-
"preLaunchTask": "npm: test",
17-
"url": "http://localhost:9876/debug.html"
18-
}
19-
]
20-
}
2+
"configurations": [
3+
{
4+
"name": "ng serve",
5+
"preLaunchTask": "npm: start",
6+
"request": "launch",
7+
"type": "chrome",
8+
"url": "http://localhost:4200/"
9+
},
10+
{
11+
"name": "ng test",
12+
"preLaunchTask": "npm: test",
13+
"request": "launch",
14+
"type": "chrome",
15+
"url": "http://localhost:9876/debug.html"
16+
}
17+
],
18+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
19+
"version": "0.2.0"
20+
}

.vscode/tasks.json

+40-40
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
11
{
2-
// For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
3-
"version": "2.0.0",
4-
"tasks": [
5-
{
6-
"type": "npm",
7-
"script": "start",
8-
"isBackground": true,
9-
"problemMatcher": {
10-
"owner": "typescript",
11-
"pattern": "$tsc",
12-
"background": {
13-
"activeOnStart": true,
14-
"beginsPattern": {
15-
"regexp": "(.*?)"
16-
},
17-
"endsPattern": {
18-
"regexp": "bundle generation complete"
19-
}
2+
"tasks": [
3+
{
4+
"isBackground": true,
5+
"problemMatcher": {
6+
"background": {
7+
"activeOnStart": true,
8+
"beginsPattern": {
9+
"regexp": "(.*?)"
10+
},
11+
"endsPattern": {
12+
"regexp": "bundle generation complete"
13+
}
14+
},
15+
"owner": "typescript",
16+
"pattern": "$tsc"
17+
},
18+
"script": "start",
19+
"type": "npm"
20+
},
21+
{
22+
"isBackground": true,
23+
"problemMatcher": {
24+
"background": {
25+
"activeOnStart": true,
26+
"beginsPattern": {
27+
"regexp": "(.*?)"
28+
},
29+
"endsPattern": {
30+
"regexp": "bundle generation complete"
31+
}
32+
},
33+
"owner": "typescript",
34+
"pattern": "$tsc"
35+
},
36+
"script": "test",
37+
"type": "npm"
2038
}
21-
}
22-
},
23-
{
24-
"type": "npm",
25-
"script": "test",
26-
"isBackground": true,
27-
"problemMatcher": {
28-
"owner": "typescript",
29-
"pattern": "$tsc",
30-
"background": {
31-
"activeOnStart": true,
32-
"beginsPattern": {
33-
"regexp": "(.*?)"
34-
},
35-
"endsPattern": {
36-
"regexp": "bundle generation complete"
37-
}
38-
}
39-
}
40-
}
41-
]
42-
}
39+
],
40+
// For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
41+
"version": "2.0.0"
42+
}

angular.json

+80-80
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,62 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"version": 1,
43
"newProjectRoot": "projects",
54
"projects": {
65
"ngx-pwa": {
7-
"projectType": "library",
8-
"root": "projects/ngx-pwa",
9-
"sourceRoot": "projects/ngx-pwa/src",
10-
"prefix": "lib",
116
"architect": {
127
"build": {
138
"builder": "@angular-devkit/build-angular:ng-packagr",
14-
"options": {
15-
"project": "projects/ngx-pwa/ng-package.json"
16-
},
179
"configurations": {
18-
"production": {
19-
"tsConfig": "projects/ngx-pwa/tsconfig.lib.prod.json"
20-
},
2110
"development": {
2211
"tsConfig": "projects/ngx-pwa/tsconfig.lib.json"
12+
},
13+
"production": {
14+
"tsConfig": "projects/ngx-pwa/tsconfig.lib.prod.json"
2315
}
2416
},
25-
"defaultConfiguration": "production"
17+
"defaultConfiguration": "production",
18+
"options": {
19+
"project": "projects/ngx-pwa/ng-package.json"
20+
}
2621
},
2722
"test": {
2823
"builder": "@angular-devkit/build-angular:karma",
2924
"options": {
25+
"karmaConfig": "projects/ngx-pwa/karma.conf.js",
3026
"main": "projects/ngx-pwa/src/test.ts",
31-
"tsConfig": "projects/ngx-pwa/tsconfig.spec.json",
32-
"karmaConfig": "projects/ngx-pwa/karma.conf.js"
27+
"tsConfig": "projects/ngx-pwa/tsconfig.spec.json"
3328
}
3429
}
35-
}
30+
},
31+
"prefix": "lib",
32+
"projectType": "library",
33+
"root": "projects/ngx-pwa",
34+
"sourceRoot": "projects/ngx-pwa/src"
3635
},
3736
"ngx-pwa-showcase": {
38-
"projectType": "application",
39-
"schematics": {
40-
"@schematics/angular:component": {
41-
"style": "scss"
42-
}
43-
},
44-
"root": "projects/ngx-pwa-showcase",
45-
"sourceRoot": "projects/ngx-pwa-showcase/src",
46-
"prefix": "app",
4737
"architect": {
4838
"build": {
4939
"builder": "@angular-devkit/build-angular:browser",
50-
"options": {
51-
"outputPath": "dist/ngx-pwa-showcase",
52-
"index": "projects/ngx-pwa-showcase/src/index.html",
53-
"main": "projects/ngx-pwa-showcase/src/main.ts",
54-
"polyfills": "projects/ngx-pwa-showcase/src/polyfills.ts",
55-
"tsConfig": "projects/ngx-pwa-showcase/tsconfig.app.json",
56-
"inlineStyleLanguage": "scss",
57-
"assets": [
58-
"projects/ngx-pwa-showcase/src/favicon.ico",
59-
"projects/ngx-pwa-showcase/src/assets",
60-
"projects/ngx-pwa-showcase/src/manifest.webmanifest"
61-
],
62-
"styles": [
63-
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
64-
"projects/ngx-pwa-showcase/src/styles.scss"
65-
],
66-
"scripts": [],
67-
"serviceWorker": true,
68-
"ngswConfigPath": "projects/ngx-pwa-showcase/ngsw-config.json"
69-
},
7040
"configurations": {
41+
"development": {
42+
"buildOptimizer": false,
43+
"extractLicenses": false,
44+
"namedChunks": true,
45+
"optimization": false,
46+
"sourceMap": true,
47+
"vendorChunk": true
48+
},
7149
"production": {
7250
"budgets": [
7351
{
74-
"type": "initial",
52+
"maximumError": "1mb",
7553
"maximumWarning": "500kb",
76-
"maximumError": "1mb"
54+
"type": "initial"
7755
},
7856
{
79-
"type": "anyComponentStyle",
57+
"maximumError": "4kb",
8058
"maximumWarning": "2kb",
81-
"maximumError": "4kb"
59+
"type": "anyComponentStyle"
8260
}
8361
],
8462
"fileReplacements": [
@@ -88,57 +66,79 @@
8866
}
8967
],
9068
"outputHashing": "all"
91-
},
92-
"development": {
93-
"buildOptimizer": false,
94-
"optimization": false,
95-
"vendorChunk": true,
96-
"extractLicenses": false,
97-
"sourceMap": true,
98-
"namedChunks": true
9969
}
10070
},
101-
"defaultConfiguration": "production"
71+
"defaultConfiguration": "production",
72+
"options": {
73+
"assets": [
74+
"projects/ngx-pwa-showcase/src/favicon.ico",
75+
"projects/ngx-pwa-showcase/src/assets",
76+
"projects/ngx-pwa-showcase/src/manifest.webmanifest"
77+
],
78+
"index": "projects/ngx-pwa-showcase/src/index.html",
79+
"inlineStyleLanguage": "scss",
80+
"main": "projects/ngx-pwa-showcase/src/main.ts",
81+
"ngswConfigPath": "projects/ngx-pwa-showcase/ngsw-config.json",
82+
"outputPath": "dist/ngx-pwa-showcase",
83+
"polyfills": "projects/ngx-pwa-showcase/src/polyfills.ts",
84+
"scripts": [],
85+
"serviceWorker": true,
86+
"styles": [
87+
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
88+
"projects/ngx-pwa-showcase/src/styles.scss"
89+
],
90+
"tsConfig": "projects/ngx-pwa-showcase/tsconfig.app.json"
91+
}
92+
},
93+
"extract-i18n": {
94+
"builder": "@angular-devkit/build-angular:extract-i18n",
95+
"options": {
96+
"buildTarget": "ngx-pwa-showcase:build"
97+
}
10298
},
10399
"serve": {
104100
"builder": "@angular-devkit/build-angular:dev-server",
105101
"configurations": {
106-
"production": {
107-
"browserTarget": "ngx-pwa-showcase:build:production"
108-
},
109102
"development": {
110-
"browserTarget": "ngx-pwa-showcase:build:development"
103+
"buildTarget": "ngx-pwa-showcase:build:development"
104+
},
105+
"production": {
106+
"buildTarget": "ngx-pwa-showcase:build:production"
111107
}
112108
},
113109
"defaultConfiguration": "development"
114110
},
115-
"extract-i18n": {
116-
"builder": "@angular-devkit/build-angular:extract-i18n",
117-
"options": {
118-
"browserTarget": "ngx-pwa-showcase:build"
119-
}
120-
},
121111
"test": {
122112
"builder": "@angular-devkit/build-angular:karma",
123113
"options": {
124-
"main": "projects/ngx-pwa-showcase/src/test.ts",
125-
"polyfills": "projects/ngx-pwa-showcase/src/polyfills.ts",
126-
"tsConfig": "projects/ngx-pwa-showcase/tsconfig.spec.json",
127-
"karmaConfig": "projects/ngx-pwa-showcase/karma.conf.js",
128-
"inlineStyleLanguage": "scss",
129114
"assets": [
130-
"projects/ngx-pwa-showcase/src/favicon.ico",
131-
"projects/ngx-pwa-showcase/src/assets",
132-
"projects/ngx-pwa-showcase/src/manifest.webmanifest"
115+
"projects/ngx-pwa-showcase/src/favicon.ico",
116+
"projects/ngx-pwa-showcase/src/assets",
117+
"projects/ngx-pwa-showcase/src/manifest.webmanifest"
133118
],
119+
"inlineStyleLanguage": "scss",
120+
"karmaConfig": "projects/ngx-pwa-showcase/karma.conf.js",
121+
"main": "projects/ngx-pwa-showcase/src/test.ts",
122+
"polyfills": "projects/ngx-pwa-showcase/src/polyfills.ts",
123+
"scripts": [],
134124
"styles": [
135-
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
136-
"projects/ngx-pwa-showcase/src/styles.scss"
125+
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
126+
"projects/ngx-pwa-showcase/src/styles.scss"
137127
],
138-
"scripts": []
128+
"tsConfig": "projects/ngx-pwa-showcase/tsconfig.spec.json"
139129
}
140130
}
141-
}
131+
},
132+
"prefix": "app",
133+
"projectType": "application",
134+
"root": "projects/ngx-pwa-showcase",
135+
"schematics": {
136+
"@schematics/angular:component": {
137+
"style": "scss"
138+
}
139+
},
140+
"sourceRoot": "projects/ngx-pwa-showcase/src"
142141
}
143-
}
142+
},
143+
"version": 1
144144
}

api/api.tsconfig.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
"compilerOptions": {
3+
"lib": ["es2017"],
34
"module": "commonjs",
4-
"resolveJsonModule": true,
5-
"lib": [
6-
"es2017"
7-
]
5+
"resolveJsonModule": true
86
}
97
}

0 commit comments

Comments
 (0)