changed

milansar · Sep 14, 2018 · 74df96e · 74df96e
1 parent eb3076b
commit 74df96e
Showing 1 changed file with 97 additions and 29 deletions.
diff --git a/angular.json b/angular.json
@@ -13,15 +13,16 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/trivia",
+            "outputPath": "dist",
             "index": "projects/trivia/src/index.html",
             "main": "projects/trivia/src/main.ts",
+            "tsConfig": "projects/trivia/tsconfig.app.json",
             "polyfills": "projects/trivia/src/polyfills.ts",
-            "tsConfig": "projects/trivia/src/tsconfig.app.json",
             "assets": [
-              "projects/trivia/src/favicon.ico",
               "projects/trivia/src/assets",
-              "projects/trivia/src/manifest.json"
+              "projects/trivia/src/favicon.ico",
+              "projects/trivia/src/manifest.json",
+              "projects/trivia/src/robots.txt"
             ],
             "styles": [
               "projects/trivia/src/styles/rwa-trivia.theme.scss",
@@ -66,6 +67,9 @@
             "browserTarget": "trivia:build"
           },
           "configurations": {
+            "dev": {
+              "browserTarget": "trivia:build:dev"
+            },
             "production": {
               "browserTarget": "trivia:build:production"
             }
@@ -80,42 +84,56 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
+            "main": "projects/trivia/src/test.ts",
+            "karmaConfig": "projects/trivia/karma.conf.js",
+            "polyfills": "projects/trivia/src/polyfills.ts",
+            "tsConfig": "projects/trivia/tsconfig.spec.json",
+            "scripts": [],
             "styles": [
-              "projects/trivia/src/styles.css"
+              "projects/trivia/src/styles/rwa-trivia.theme.scss",
+              "projects/trivia/src/styles/styles.scss",
+              "projects/trivia/src/styles/global.scss",
+              "projects/trivia/src/styles/light.theme.scss",
+              "projects/trivia/src/styles/dark.theme.scss"
             ],
-            "scripts": [],
             "assets": [
+              "projects/trivia/src/assets",
               "projects/trivia/src/favicon.ico",
-              "projects/trivia/src/assets"
+              "projects/trivia/src/manifest.json",
+              "projects/trivia/src/robots.txt"
             ]
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "projects/trivia/tsconfig.app.json",
+              "projects/trivia/tsconfig.spec.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
+        },
+        "server": {
+          "builder": "@angular-devkit/build-angular:server",
+          "options": {
+            "outputPath": "functions/dist/server",
+            "main": "projects/trivia/src/main.server.ts",
+            "tsConfig": "projects/trivia/tsconfig.server.json"
+          }
         }
       }
     },
     "trivia-e2e": {
-      "root": "e2e/",
+      "root": "projects/trivia-e2e/",
       "projectType": "application",
       "architect": {
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
-            "protractorConfig": "e2e/protractor.conf.js",
+            "protractorConfig": "projects/trivia-e2e/protractor.conf.js",
             "devServerTarget": "trivia:serve"
           },
           "configurations": {
@@ -127,7 +145,7 @@
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
+            "tsConfig": "projects/trivia-e2e/tsconfig.e2e.json",
             "exclude": [
               "**/node_modules/**"
             ]
@@ -136,7 +154,7 @@
       }
     },
     "trivia-admin": {
-      "root": "projects",
+      "root": "projects/trivia-admin/",
       "sourceRoot": "projects/trivia-admin/src",
       "projectType": "application",
       "prefix": "app",
@@ -145,26 +163,41 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/trivia-admin",
+            "outputPath": "dist/admin",
+            "baseHref": "/admin",
+            "deployUrl": "/admin/",
             "index": "projects/trivia-admin/src/index.html",
             "main": "projects/trivia-admin/src/main.ts",
             "polyfills": "projects/trivia-admin/src/polyfills.ts",
-            "tsConfig": "projects/trivia-admin/src/tsconfig.app.json",
+            "tsConfig": "projects/trivia-admin/tsconfig.app.json",
             "assets": [
+              "projects/trivia-admin/src/assets",
               "projects/trivia-admin/src/favicon.ico",
-              "projects/trivia-admin/src/assets"
+              "projects/trivia-admin/src/manifest.json"
             ],
             "styles": [
-              "projects/trivia-admin/src/styles.css"
+              "projects/trivia-admin/src/styles/rwa-trivia.theme.scss",
+              "projects/trivia-admin/src/styles/styles.scss",
+              "projects/trivia-admin/src/styles/global.scss",
+              "projects/trivia-admin/src/styles/light.theme.scss",
+              "projects/trivia-admin/src/styles/dark.theme.scss"
             ],
             "scripts": []
           },
           "configurations": {
+            "dev": {
+              "fileReplacements": [
+                {
+                  "replace": "projects/shared-library/src/lib/environments/environment.ts",
+                  "with": "projects/shared-library/src/lib/environments/environment.dev.ts"
+                }
+              ]
+            },
             "production": {
               "fileReplacements": [
                 {
-                  "replace": "projects/trivia-admin/src/environments/environment.ts",
-                  "with": "projects/trivia-admin/src/environments/environment.prod.ts"
+                  "replace": "projects/shared-library/src/lib/environments/environment.ts",
+                  "with": "projects/shared-library/src/lib/environments/environment.prod.ts"
                 }
               ],
               "optimization": true,
@@ -199,10 +232,10 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
+            "main": "projects/trivia-admin/src/test.ts",
+            "polyfills": "projects/trivia-admin/src/polyfills.ts",
+            "tsConfig": "projects/trivia-admin/tsconfig.spec.json",
+            "karmaConfig": "projects/trivia-admin/karma.conf.js",
             "styles": [
               "projects/trivia-admin/src/styles.css"
             ],
@@ -217,13 +250,48 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
+              "projects/trivia-admin/tsconfig.app.json",
+              "projects/trivia-admin/tsconfig.spec.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
+        },
+        "server": {
+          "builder": "@angular-devkit/build-angular:server",
+          "options": {
+            "outputPath": "functions/dist/server",
+            "main": "projects/trivia-admin/src/main.server.ts",
+            "tsConfig": "projects/trivia-admin/tsconfig.server.json"
+          }
+        }
+      }
+    },
+    "trivia-admin-e2e": {
+      "root": "projects/trivia-admin-e2e/",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "projects/trivia-admin-e2e/protractor.conf.js",
+            "devServerTarget": "trivia-admin:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "trivia-admin:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "projects/trivia-admin-e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
         }
       }
     },