Merge pull request #374 from ngx-rocket/bugfix/cordova

Fixed Ionic/Cordova build (closes #372)
ngx-rocket · Sep 7, 2018 · edbc8c7 · edbc8c7
2 parents f6f2080 + 6ddb61a
commit edbc8c7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/.github_changelog_generator b/.github_changelog_generator
@@ -3,5 +3,5 @@ enhancement-label=**Enhancements**:
 filter-by-milestone=false
 enhancement-labels=feature,documentation
 issue-line-labels=feature,documentation
-exclude-labels=duplicate,question,invalid,wontfix,discussion-open,dropped
+exclude-labels=duplicate,question,invalid,wontfix,discussion-open,dropped,killed
 author=false
diff --git a/generators/app/templates/__cordova._config.xml b/generators/app/templates/__cordova._config.xml
@@ -140,8 +140,6 @@
   <plugin name="cordova-plugin-splashscreen" spec="^5.0.1"/>
   <plugin name="cordova-plugin-statusbar" spec="^2.4.1"/>
   <plugin name="cordova-plugin-whitelist" spec="^1.3.3"/>
-  <plugin name="ionic-plugin-keyboard" spec="^2.2.1"/>
-<% if (props.mobile.includes('ios')) { -%>
-  <plugin name="cordova-plugin-ionic-webview" spec="^1.1.16"/>
-<% } -%>
+  <plugin name="cordova-plugin-ionic-webview" spec="^2.0.0" />
+  <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
 </widget>
diff --git a/generators/app/templates/_angular.json b/generators/app/templates/_angular.json
@@ -45,10 +45,10 @@
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
-              "aot": true,
+              "aot": <%= props.ui !== 'ionic' %>,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": true,
+              "buildOptimizer": <%= props.ui !== 'ionic' %>,
 <% if (props.pwa) { -%>
               "serviceWorker": true,
 <% } -%>

diff --git a/generators/app/templates/_package.json b/generators/app/templates/_package.json
@@ -48,7 +48,8 @@
     "cordova-custom-config": "^5.0.2",
     "cordova-ios": "^4.5.4",
     "cordova-plugin-device": "^2.0.1",
-    "cordova-plugin-ionic-webview": "^1.1.16",
+    "cordova-plugin-ionic-webview": "^2.0.0",
+    "cordova-plugin-ionic-keyboard": "^2.0.5",
     "cordova-plugin-splashscreen": "^5.0.2",
     "cordova-plugin-statusbar": "^2.4.1",
     "cordova-plugin-whitelist": "^1.3.3",
@@ -131,8 +132,8 @@
       "cordova-plugin-splashscreen": {},
       "cordova-plugin-statusbar": {},
       "cordova-plugin-whitelist": {},
-      "ionic-plugin-keyboard": {},
-      "cordova-plugin-ionic-webview": {}
+      "cordova-plugin-ionic-webview": {},
+      "cordova-plugin-ionic-keyboard": {}
     }
   }
 <% } else { -%>

diff --git a/generators/app/templates/src/_index.html b/generators/app/templates/src/_index.html
@@ -49,11 +49,7 @@
 <% if (props.target.includes('cordova')) { -%>
   <!-- Include Cordova script only when needed -->
   <script>
-<%   if (props.mobile.includes('ios')) { -%>
     if (!/^http/.test(location.protocol)|/^localhost:8080/.test(location.host)) {
-<%   } else { -%>
-    if (!/^http/.test(location.protocol)) {
-<%   } -%>
       /**
        * https://github.com/angular/angular/issues/22509
        * Prevent cordova.js 5.2.4+ routing bug