Skip to content

Commit 0ff79ea

Browse files
committed
Merge branch '@invertase/v7-development' of https://github.com/firebase/firebaseui-web into @invertase/align-react
2 parents 2604580 + 9a1ae4e commit 0ff79ea

File tree

16 files changed

+8286
-15294
lines changed

16 files changed

+8286
-15294
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ dist-ssr
1515
# Angular
1616
.angular
1717

18+
# Coverage
19+
coverage
20+
1821
# Editor directories and files
1922
.vscode/*
2023
!.vscode/extensions.json

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@ If you are using [TailwindCSS](https://tailwindcss.com/), import the base CSS fr
131131

132132
```css
133133
@import "tailwindcss";
134-
@import "@firebase-ui/styles/src/base.css";
134+
@import "@firebase-ui/styles/tailwind";
135135
```
136136

137137
If you are not using Tailwind, import the distributable CSS in your project:
138138

139139
```css
140-
@import "@firebase-ui/styles/dist.css";
140+
@import "@firebase-ui/styles";
141141
```
142142

143143
To learn more about theming, view the [theming](#theming) section.

examples/angular/angular.json

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"prefix": "app",
1111
"architect": {
1212
"build": {
13-
"builder": "@angular-devkit/build-angular:application",
13+
"builder": "@angular/build:application",
1414
"options": {
1515
"outputPath": "dist/angular-ssr",
1616
"index": "src/index.html",
@@ -26,7 +26,7 @@
2626
"styles": ["src/styles.css"],
2727
"scripts": [],
2828
"server": "src/main.server.ts",
29-
"prerender": true,
29+
"prerender": false,
3030
"ssr": {
3131
"entry": "src/server.ts"
3232
}
@@ -36,8 +36,8 @@
3636
"budgets": [
3737
{
3838
"type": "initial",
39-
"maximumWarning": "500kB",
40-
"maximumError": "1MB"
39+
"maximumWarning": "1MB",
40+
"maximumError": "2MB"
4141
},
4242
{
4343
"type": "anyComponentStyle",
@@ -56,7 +56,7 @@
5656
"defaultConfiguration": "production"
5757
},
5858
"serve": {
59-
"builder": "@angular-devkit/build-angular:dev-server",
59+
"builder": "@angular/build:dev-server",
6060
"configurations": {
6161
"production": {
6262
"buildTarget": "angular-ssr:build:production"
@@ -68,10 +68,10 @@
6868
"defaultConfiguration": "development"
6969
},
7070
"extract-i18n": {
71-
"builder": "@angular-devkit/build-angular:extract-i18n"
71+
"builder": "@angular/build:extract-i18n"
7272
},
7373
"test": {
74-
"builder": "@angular-devkit/build-angular:karma",
74+
"builder": "@angular/build:karma",
7575
"options": {
7676
"polyfills": ["zone.js", "zone.js/testing"],
7777
"tsConfig": "tsconfig.spec.json",
@@ -94,7 +94,7 @@
9494
"prefix": "lib",
9595
"architect": {
9696
"build": {
97-
"builder": "@angular-devkit/build-angular:ng-packagr",
97+
"builder": "@angular/build:ng-packagr",
9898
"options": {
9999
"project": "projects/angular/ng-package.json"
100100
},
@@ -109,7 +109,7 @@
109109
"defaultConfiguration": "production"
110110
},
111111
"test": {
112-
"builder": "@angular-devkit/build-angular:karma",
112+
"builder": "@angular/build:karma",
113113
"options": {
114114
"tsConfig": "projects/angular/tsconfig.spec.json",
115115
"polyfills": ["zone.js", "zone.js/testing"]
@@ -120,5 +120,31 @@
120120
},
121121
"cli": {
122122
"analytics": false
123+
},
124+
"schematics": {
125+
"@schematics/angular:component": {
126+
"type": "component"
127+
},
128+
"@schematics/angular:directive": {
129+
"type": "directive"
130+
},
131+
"@schematics/angular:service": {
132+
"type": "service"
133+
},
134+
"@schematics/angular:guard": {
135+
"typeSeparator": "."
136+
},
137+
"@schematics/angular:interceptor": {
138+
"typeSeparator": "."
139+
},
140+
"@schematics/angular:module": {
141+
"typeSeparator": "."
142+
},
143+
"@schematics/angular:pipe": {
144+
"typeSeparator": "."
145+
},
146+
"@schematics/angular:resolver": {
147+
"typeSeparator": "."
148+
}
123149
}
124150
}

0 commit comments

Comments
 (0)