feature() update to 4.0.0-alpha.9

peterennis · Jul 12, 2018 · a1be296 · a1be296
1 parent df9ab0f
commit a1be296
Show file tree

Hide file tree

Showing 23 changed files with 1,488 additions and 1,363 deletions.
diff --git a/angular.json b/angular.json
@@ -1,10 +1,14 @@
 {
   "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
   "version": 1,
+  "defaultProject": "app",
   "projects": {
     "app": {
       "root": "",
+      "sourceRoot": "src",
       "projectType": "application",
+      "prefix": "app",
+      "schematics": {},
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -22,9 +26,9 @@
                 "output": "assets"
               },
               {
-                "glob": "**/*",
-                "input": "node_modules/@ionic/angular/dist/ionic",
-                "output": "./ionic"
+                "glob": "**/*.svg",
+                "input": "node_modules/@ionic/angular/dist/ionic/svg",
+                "output": "./svg"
               }
             ],
             "styles": [
@@ -41,8 +45,8 @@
             "production": {
               "fileReplacements": [
                 {
-                  "src": "src/environments/environment.ts",
-                  "replaceWith": "src/environments/environment.prod.ts"
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
                 }
               ],
               "optimization": true,
@@ -82,9 +86,7 @@
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
             "styles": [
-              {
-                "input": "styles.css"
-              }
+              "styles.css"
             ],
             "scripts": [],
             "assets": [
@@ -112,6 +114,30 @@
               "**/node_modules/**"
             ]
           }
+        },
+        "ionic-cordova-build": {
+          "builder": "@ionic/ng-toolkit:cordova-build",
+          "options": {
+            "browserTarget": "app:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "app:build:production"
+            }
+          }
+        },
+        "ionic-cordova-serve": {
+          "builder": "@ionic/ng-toolkit:cordova-serve",
+          "options": {
+            "cordovaBuildTarget": "app:ionic-cordova-build",
+            "devServerTarget": "app:serve"
+          },
+          "configurations": {
+            "production": {
+              "cordovaBuildTarget": "app:ionic-cordova-build:production",
+              "devServerTarget": "app:serve:production"
+            }
+          }
         }
       }
     },
@@ -137,5 +163,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "defaultCollection": "@ionic/schematics-angular"
   }
 }
diff --git a/e2e/src/app.po.ts b/e2e/src/app.po.ts
@@ -6,6 +6,6 @@ export class AppPage {
   }
 
   getParagraphText() {
-    return element(by.css('app-root ion-content')).getText();
+    return element(by.deepCss('app-root ion-content')).getText();
   }
 }
diff --git a/ionic.config.json b/ionic.config.json
@@ -1,7 +1,5 @@
 {
   "name": "aetabs",
-  "type": "angular",
-  "integrations": {
-    "cordova": {}
-  }
-}
+  "integrations": {},
+  "type": "angular"
+}