Upgrade nativescript modules to version 6.1.0

xuhcc · Sep 5, 2019 · 79e5d62 · 79e5d62
1 parent 8f11e62
commit 79e5d62
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 80 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
         "nativescript-unit-test-runner": "0.7.0",
         "reflect-metadata": "~0.1.12",
         "rxjs": "~6.5.0",
-        "tns-core-modules": "6.0.4",
+        "tns-core-modules": "6.1.0",
         "zone.js": "~0.9.1"
     },
     "devDependencies": {
@@ -48,9 +48,9 @@
         "karma-jasmine": "2.0.1",
         "karma-nativescript-launcher": "0.4.0",
         "karma-webpack": "4.0.2",
-        "nativescript-dev-webpack": "1.0.1",
+        "nativescript-dev-webpack": "~1.2.0",
         "node-sass": "^4.12.0",
-        "tns-platform-declarations": "6.0.1",
+        "tns-platform-declarations": "~6.1.0",
         "typescript": "3.5.3"
     },
     "scripts": {

diff --git a/src/app/plaintext/plaintext.component.html b/src/app/plaintext/plaintext.component.html
@@ -1,7 +1,7 @@
 <ActionBar class="action-bar" (loaded)="onActionBarLoaded($event)">
   <!--
   It is not yet possible to use icon font with NavigationButton
-  https://github.com/NativeScript/NativeScript/issues/7520
+  https://github.com/NativeScript/NativeScript/issues/7542
   -->
   <NavigationButton
     icon="res://baseline_menu_black_24"

diff --git a/tsconfig.tns.json b/tsconfig.tns.json
@@ -1,7 +1,7 @@
 {
     "extends": "./tsconfig",
     "compilerOptions": {
-        "module": "es2015",
+        "module": "esNext",
         "moduleResolution": "node"
     }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -35,8 +35,7 @@ module.exports = env => {
 
     const {
         // The 'appPath' and 'appResourcesPath' values are fetched from
-        // the nsconfig.json configuration file
-        // when bundling with `tns run android|ios --bundle`.
+        // the nsconfig.json configuration file.
         appPath = "src",
         appResourcesPath = "App_Resources",
 
@@ -197,7 +196,7 @@ module.exports = env => {
         module: {
             rules: [
                 {
-                    test: nsWebpack.getEntryPathRegExp(appFullPath, entryPath),
+                    include: join(appFullPath, entryPath),
                     use: [
                         // Require all Android app components
                         platform === "android" && {