Skip to content

Commit f9b9e25

Browse files
devversionjosephperrott
authored andcommitted
build: fix dashboard deployment (#12293)
1 parent e13bfe0 commit f9b9e25

File tree

6 files changed

+5004
-4766
lines changed

6 files changed

+5004
-4766
lines changed

scripts/deploy/deploy-dashboard.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ firebaseBin=$(npm bin)/firebase
2525
cd ${dashboardFolder}
2626

2727
# Install node_modules for the dashboard and afterwards build the dashboard app in production.
28-
(npm install; $(npm bin)/ng build --aot -prod) &
28+
(npm install; npm run build-production) &
2929

3030
# Install node modules for dashboard functions. Firebase CLI needs to execute the functions
3131
# to collect all function names before it can deploy them.

tools/dashboard/.angular-cli.json

-38
This file was deleted.

tools/dashboard/angular.json

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"material2-board": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"prefix": "app",
11+
"schematics": {},
12+
"architect": {
13+
"build": {
14+
"builder": "@angular-devkit/build-angular:browser",
15+
"options": {
16+
"outputPath": "dist/",
17+
"index": "src/index.html",
18+
"main": "src/main.ts",
19+
"polyfills": "src/polyfills.ts",
20+
"tsConfig": "src/tsconfig.json",
21+
"assets": [
22+
"src/favicon.ico",
23+
"src/assets"
24+
],
25+
"styles": [
26+
"src/styles.scss",
27+
"src/theme.scss"
28+
],
29+
"scripts": []
30+
},
31+
"configurations": {
32+
"production": {
33+
"fileReplacements": [
34+
{
35+
"replace": "src/environments/environment.ts",
36+
"with": "src/environments/environment.prod.ts"
37+
}
38+
],
39+
"optimization": true,
40+
"outputHashing": "all",
41+
"sourceMap": false,
42+
"extractCss": true,
43+
"namedChunks": false,
44+
"aot": true,
45+
"extractLicenses": true,
46+
"vendorChunk": false,
47+
"buildOptimizer": true
48+
}
49+
}
50+
},
51+
"serve": {
52+
"builder": "@angular-devkit/build-angular:dev-server",
53+
"options": {
54+
"browserTarget": "material2-board:build"
55+
},
56+
"configurations": {
57+
"production": {
58+
"browserTarget": "material2-board:build:production"
59+
}
60+
}
61+
},
62+
"extract-i18n": {
63+
"builder": "@angular-devkit/build-angular:extract-i18n",
64+
"options": {
65+
"browserTarget": "material2-board:build"
66+
}
67+
},
68+
"test": {
69+
"builder": "@angular-devkit/build-angular:karma",
70+
"options": {
71+
"main": "src/test.ts",
72+
"polyfills": "src/polyfills.ts",
73+
"tsConfig": "src/tsconfig.spec.json",
74+
"karmaConfig": "src/karma.conf.js",
75+
"styles": [
76+
"src/styles.css"
77+
],
78+
"scripts": [],
79+
"assets": [
80+
"src/favicon.ico",
81+
"src/assets"
82+
]
83+
}
84+
},
85+
"lint": {
86+
"builder": "@angular-devkit/build-angular:tslint",
87+
"options": {
88+
"tsConfig": [
89+
"src/tsconfig.app.json",
90+
"src/tsconfig.spec.json"
91+
],
92+
"exclude": [
93+
"**/node_modules/**"
94+
]
95+
}
96+
}
97+
}
98+
}
99+
},
100+
"defaultProject": "material2-board"
101+
}

tools/dashboard/functions/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"version": "0.0.0",
44
"main": "index.js",
55
"dependencies": {
6-
"@firebase/app-types": "^0.1.1",
7-
"@octokit/rest": "^14.0.4",
8-
"@types/jsonwebtoken": "^7.2.5",
9-
"firebase-admin": "^5.8.1",
10-
"firebase-functions": "^0.8.1",
11-
"jsonwebtoken": "^8.1.0",
12-
"request": "^2.83.0",
13-
"ts-node": "^4.1.0",
14-
"typescript": "^2.6.2"
6+
"@firebase/app-types": "^0.3.2",
7+
"@octokit/rest": "^15.9.4",
8+
"@types/jsonwebtoken": "^7.2.8",
9+
"firebase-admin": "^5.13.0",
10+
"firebase-functions": "^1.1.0",
11+
"jsonwebtoken": "^8.3.0",
12+
"request": "^2.87.0",
13+
"ts-node": "^7.0.0",
14+
"typescript": "^2.9.2"
1515
}
1616
}

0 commit comments

Comments
 (0)