Skip to content

Commit ab4be5f

Browse files
tmunzertmunzer
committed
Merge branch 'web-ext-types'
2 parents 496305a + 8cac738 commit ab4be5f

142 files changed

Lines changed: 45061 additions & 24306 deletions

File tree

Some content is hidden

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

‎.DS_Store‎

2 KB
Binary file not shown.

‎.dccache‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ logs
44
npm-debug.log*
55
yarn-debug.log*
66
yarn-error.log*
7-
7+
.angular/
88
# Runtime data
99
pids
1010
*.pid
@@ -34,6 +34,8 @@ bower_components
3434

3535
# Compiled binary addons (https://nodejs.org/api/addons.html)
3636
build/Release
37+
angular/src/web-ext-artifacts/
38+
dist/
3739

3840
# Dependency directories
3941
node_modules/

src/angular/.browserslistrc renamed to angular/.browserslistrc

File renamed without changes.

src/angular/.editorconfig renamed to angular/.editorconfig

File renamed without changes.

src/angular/.gitignore renamed to angular/.gitignore

File renamed without changes.

src/angular.json renamed to angular/angular.json

Lines changed: 46 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,52 @@
11
{
2-
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
2+
"$schema": "./node_modules/@cli/lib/config/schema.json",
33
"version": 1,
44
"newProjectRoot": "projects",
55
"projects": {
6-
"angular-chrome-extension": {
7-
"root": "angular",
8-
"sourceRoot": "angular/src",
6+
"angular-mist-extension": {
7+
"root": "",
8+
"sourceRoot": "src",
99
"projectType": "application",
1010
"prefix": "app",
1111
"schematics": {
1212
"@schematics/angular:component": {
1313
"style": "sass"
14+
},
15+
"@schematics/angular:application": {
16+
"strict": true
1417
}
1518
},
1619
"architect": {
1720
"build": {
18-
"builder": "ngx-build-plus:browser",
21+
"builder": "@angular-builders/custom-webpack:browser",
1922
"options": {
2023
"aot": true,
21-
"outputPath": "angular/dist",
22-
"index": "angular/src/index.html",
23-
"main": "angular/src/main.ts",
24-
"polyfills": "angular/src/polyfills.ts",
25-
"tsConfig": "angular/src/tsconfig.app.json",
24+
"outputPath": "dist",
25+
"index": "src/index.html",
26+
"main": "src/main.ts",
27+
"polyfills": "src/polyfills.ts",
28+
"tsConfig": "src/tsconfig.app.json",
2629
"assets": [
27-
"angular/src/manifest.json",
28-
"angular/src/assets"
30+
"src/manifest.json",
31+
"src/assets"
2932
],
3033
"styles": [
31-
"angular/src/styles.scss"
34+
"src/styles.scss"
3235
],
33-
"scripts": []
36+
"scripts": [],
37+
"vendorChunk": true,
38+
"extractLicenses": false,
39+
"buildOptimizer": false,
40+
"sourceMap": true,
41+
"optimization": false,
42+
"namedChunks": true
3443
},
3544
"configurations": {
3645
"production": {
3746
"fileReplacements": [{
38-
"replace": "angular/src/environments/environment.ts",
39-
"with": "angular/src/environments/environment.prod.ts"
47+
"replace": "src/environments/environment.ts",
48+
"with": "src/environments/environment.prod.ts"
4049
}],
41-
"optimization": true,
42-
"outputHashing": "all",
43-
"sourceMap": false,
44-
"namedChunks": false,
45-
"aot": true,
46-
"extractLicenses": true,
47-
"vendorChunk": false,
48-
"buildOptimizer": true,
4950
"budgets": [{
5051
"type": "initial",
5152
"maximumWarning": "2mb",
@@ -55,42 +56,53 @@
5556
"type": "anyComponentStyle",
5657
"maximumWarning": "6kb"
5758
}
58-
]
59+
],
60+
"optimization": {
61+
"scripts": true,
62+
"styles": {
63+
"minify": true,
64+
"inlineCritical": false
65+
},
66+
"fonts": true
67+
},
68+
"outputHashing": "all",
69+
"sourceMap": false,
70+
"namedChunks": false,
71+
"extractLicenses": true,
72+
"vendorChunk": false,
73+
"buildOptimizer": true
5974
}
6075
}
6176
},
6277
"serve": {
63-
"builder": "ngx-build-plus:dev-server",
78+
"builder": "@angular-devkit/build-angular:dev-server",
6479
"options": {
65-
"browserTarget": "angular-chrome-extension:build"
80+
"browserTarget": "angular-mist-extension:build"
6681
},
6782
"configurations": {
6883
"production": {
69-
"browserTarget": "angular-chrome-extension:build:production"
84+
"browserTarget": "angular-mist-extension:build:production"
7085
}
7186
}
7287
},
7388
"extract-i18n": {
7489
"builder": "@angular-devkit/build-angular:extract-i18n",
7590
"options": {
76-
"browserTarget": "angular-chrome-extension:build"
91+
"browserTarget": "angular-mist-extension:build"
7792
}
7893
},
7994
"lint": {
8095
"builder": "@angular-devkit/build-angular:tslint",
8196
"options": {
8297
"tsConfig": [
83-
"angular/src/tsconfig.app.json"
98+
"src/tsconfig.app.json"
8499
],
85-
"exclude": [
86-
"**/node_modules/**"
87-
]
100+
"exclude": []
88101
}
89102
}
90103
}
91104
}
92105
},
93-
"defaultProject": "angular-chrome-extension",
94106
"cli": {
95107
"analytics": false
96108
}

0 commit comments

Comments
 (0)