Skip to content

Commit ac60117

Browse files
authored
Merge pull request #76 from UnstableDesign/auth
3.1.0 -> 3.2.0
2 parents 892d800 + 82aa15d commit ac60117

File tree

113 files changed

+27498
-25552
lines changed

Some content is hidden

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

113 files changed

+27498
-25552
lines changed

browserslist .browserslistrc

File renamed without changes.

.firebaserc

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{
22
"projects": {
33
"default": "adacad-weaver"
4+
},
5+
"targets": {
6+
"adacad-weaver": {
7+
"hosting": {
8+
"adacad-weaver": [
9+
"adacad-weaver"
10+
]
11+
}
12+
}
413
}
5-
}
14+
}

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
!.vscode/extensions.json
2626

2727
# misc
28+
/.angular/cache
2829
/.sass-cache
2930
/connect.lock
3031
/coverage
@@ -42,3 +43,8 @@ testem.log
4243
# System Files
4344
.DS_Store
4445
Thumbs.db
46+
47+
# Firebase
48+
.firebase
49+
*-debug.log
50+
.runtimeconfig.json

.vscode/settings.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"typescript.tsdk": "node_modules/typescript/lib"
3+
}

angular.json

+17-29
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@
2323
"styles": [
2424
"src/styles.scss"
2525
],
26-
"scripts": []
26+
"scripts": [],
27+
"vendorChunk": true,
28+
"extractLicenses": false,
29+
"buildOptimizer": false,
30+
"sourceMap": true,
31+
"optimization": false,
32+
"namedChunks": true
2733
},
2834
"configurations": {
2935
"production": {
@@ -36,9 +42,7 @@
3642
"optimization": true,
3743
"outputHashing": "all",
3844
"sourceMap": false,
39-
"extractCss": true,
4045
"namedChunks": false,
41-
"aot": true,
4246
"extractLicenses": true,
4347
"vendorChunk": false,
4448
"buildOptimizer": true,
@@ -49,7 +53,8 @@
4953
}
5054
]
5155
}
52-
}
56+
},
57+
"defaultConfiguration": ""
5358
},
5459
"serve": {
5560
"builder": "@angular-devkit/build-angular:dev-server",
@@ -85,21 +90,15 @@
8590
]
8691
}
8792
},
88-
"lint": {
89-
"builder": "@angular-devkit/build-angular:tslint",
90-
"options": {
91-
"tsConfig": [
92-
"src/tsconfig.app.json",
93-
"src/tsconfig.spec.json"
94-
],
95-
"exclude": [
96-
"**/node_modules/**"
97-
]
98-
}
99-
},
10093
"deploy": {
10194
"builder": "@angular/fire:deploy",
102-
"options": {}
95+
"options": {
96+
"prerender": false,
97+
"ssr": false,
98+
"browserTarget": "adacad-weaver:build:production",
99+
"firebaseProject": "adacad-weaver",
100+
"firebaseHostingSite": "adacad-weaver"
101+
}
103102
}
104103
}
105104
},
@@ -114,17 +113,6 @@
114113
"protractorConfig": "./protractor.conf.js",
115114
"devServerTarget": "adacad-weaver:serve"
116115
}
117-
},
118-
"lint": {
119-
"builder": "@angular-devkit/build-angular:tslint",
120-
"options": {
121-
"tsConfig": [
122-
"e2e/tsconfig.e2e.json"
123-
],
124-
"exclude": [
125-
"**/node_modules/**"
126-
]
127-
}
128116
}
129117
}
130118
}
@@ -133,7 +121,7 @@
133121
"schematics": {
134122
"@schematics/angular:component": {
135123
"prefix": "app",
136-
"styleext": "scss"
124+
"style": "scss"
137125
},
138126
"@schematics/angular:directive": {
139127
"prefix": "app"

firebase.json

+50-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,51 @@
11
{
2-
"hosting": {
3-
"public": "dist",
4-
"ignore": [
5-
"firebase.json",
6-
"**/.*",
7-
"**/node_modules/**"
8-
],
9-
"rewrites": [
10-
{
11-
"source": "**",
12-
"destination": "/index.html"
13-
}
14-
]
15-
}
16-
}
2+
"hosting": [
3+
{
4+
"public": "dist",
5+
"ignore": [
6+
"firebase.json",
7+
"**/.*",
8+
"**/node_modules/**"
9+
],
10+
"rewrites": [
11+
{
12+
"source": "**",
13+
"destination": "/index.html"
14+
}
15+
]
16+
},
17+
{
18+
"target": "adacad-weaver",
19+
"public": "dist",
20+
"ignore": [
21+
"**/.*"
22+
],
23+
"headers": [
24+
{
25+
"source": "*.[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].+(css|js)",
26+
"headers": [
27+
{
28+
"key": "Cache-Control",
29+
"value": "public,max-age=31536000,immutable"
30+
}
31+
]
32+
},
33+
{
34+
"source": "/@(ngsw-worker.js|ngsw.json)",
35+
"headers": [
36+
{
37+
"key": "Cache-Control",
38+
"value": "no-cache"
39+
}
40+
]
41+
}
42+
],
43+
"rewrites": [
44+
{
45+
"source": "**",
46+
"destination": "/index.html"
47+
}
48+
]
49+
}
50+
]
51+
}

0 commit comments

Comments
 (0)