- #6 Support NativeScript (or rather: tns-ios) 3.4

- Webpack update

Author: EddyVerbruggen

.travis.yml

@@ -1,75 +1,71 @@
+android:
+  components:
+    - tools
+    - platform-tools
+    - build-tools-26.0.1
+    - android-26
+    - extra-android-m2repository
+    - sys-img-armeabi-v7a-android-21
+
+before_cache:
+    - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+
+cache:
+    directories:
+        - .nvm
+        - $HOME/.gradle/caches/
+        - $HOME/.gradle/wrapper/
+
+install:
+    - echo no | npm install -g nativescript
+    - tns usage-reporting disable
+    - tns error-reporting disable
+    - npm install
+    - cd src
+    - npm run setup
+
+script:
+
+
 matrix:
   include:
     - stage: "Lint"
       language: node_js
       os: linux
       node_js: "6"
-      script: cd src && npm run ci.tslint && cd ../demo && npm run ci.tslint
+      script: "npm run ci.tslint"
     - stage: "WebPack"
       os: osx
       env:
-        - BuildiOS="11"
-        - Xcode="9"
+        - Webpack="iOS"
       osx_image: xcode9
-      language: node_js 
+      language: node_js
       node_js: "6"
       jdk: oraclejdk8
-      script: cd demo && npm run build.plugin && npm i && npm run build-ios-bundle
+      script: cd ../demo && tns build ios --bundle
     - language: android
       os: linux
       env:
-        - Platform="Android"
+        - Webpack="Android"
       jdk: oraclejdk8
       before_install: nvm install 6.10.3
-      script: cd demo && npm run build.plugin && npm i && npm run build-android-bundle
-    - stage: "Build and Test"
-      env: 
-        - BuildAndroid="26"
+      script: cd ../demo && tns build android --bundle
+    - stage: "Build"
+      env:
+        - BuildAndroid="25"
       language: android
       os: linux
       jdk: oraclejdk8
-      before_install: nvm install stable
+      before_install: nvm install 6.10.3
       script:
-        - cd src && npm i && npm run tsc && cd ../demo && tns build android
+        - cd ../demo && tns build android
     - os: osx
       env:
         - BuildiOS="11"
         - Xcode="9"
       osx_image: xcode9
-      language: node_js 
-      node_js: "6"
-      jdk: oraclejdk8
-      script: 
-        - cd src && npm i && npm run tsc && cd ../demo && tns build ios
-    - os: linux
-      language: android
-      dist: precise
-      sudo: required
-      jdk: oraclejdk8
-      before_script:
-        - echo no | android create avd --force -n test -t android-21 -b armeabi-v7a
-        - emulator -avd test -no-audio -no-window &
-        - android-wait-for-emulator
-      before_install:
-        - nvm install 6
-      script: cd src && npm run test.android
-    - os: osx
       language: node_js
       node_js: "6"
       jdk: oraclejdk8
-      osx_image: xcode9
-      script: cd src && npm run test.ios
-
-android:
-  components:
-    - tools
-    - platform-tools
-    - build-tools-26.0.1
-    - android-26
-    - extra-android-m2repository
-    - sys-img-armeabi-v7a-android-21
-
-install:
-    - echo no | npm install -g nativescript
-    - tns usage-reporting disable
-    - tns error-reporting disable
+      script:
+        - cd ../demo && tns build ios

demo/app/tests/tests.js

@@ -1,7 +1,13 @@
 var WebviewUtils = require("nativescript-webview-utils").WebViewUtils;
 
-describe("greet function", function () {
+describe("addHeaders", function () {
   it("exists", function () {
     expect(WebviewUtils.addHeaders).toBeDefined();
   });
-});
+});
+
+describe("setUserAgent", function () {
+  it("exists", function () {
+    expect(WebviewUtils.setUserAgent).toBeDefined();
+  });
+});

demo/app/vendor-platform.android.ts

@@ -1,9 +1,9 @@
 require("application");
 if (!global["__snapshot"]) {
-  /*
-  In case snapshot generation is enabled these modules will get into the bundle but will not be required/evaluated.
-  The snapshot webpack plugin will add them to the tns-java-classes.js bundle file. This way, they will be evaluated on app start as early as possible.
-  */
+  // In case snapshot generation is enabled these modules will get into the bundle
+  // but will not be required/evaluated.
+  // The snapshot webpack plugin will add them to the tns-java-classes.js bundle file.
+  // This way, they will be evaluated on app start as early as possible.
   require("ui/frame");
   require("ui/frame/activity");
 }

demo/app/vendor-platform.ios.ts

@@ -0,0 +1,3 @@
+// There is a bug in angular: https://github.com/angular/angular-cli/pull/8589/files
+// Legendary stuff, its webpack plugin pretty much doesn't work with empty TypeScript files in v1.8.3
+void 0;

demo/app/vendor.ts

@@ -1,3 +1,10 @@
+// Snapshot the ~/app.css and the theme
+const application = require("application");
+require("ui/styling/style-scope");
+const appCssContext = require.context("~/", false, /^\.\/app\.(css|scss|less|sass)$/);
+global.registerWebpackModules(appCssContext);
+application.loadAppCss();
+
 require("./vendor-platform");
 
 require("bundle-entry-points");

demo/package.json

@@ -22,32 +22,23 @@
     "copy-webpack-plugin": "~4.0.1",
     "extract-text-webpack-plugin": "~3.0.0",
     "filewalker": "0.1.2",
-    "jasmine-core": "^2.5.2",
-    "karma": "^1.3.0",
-    "karma-jasmine": "^1.0.2",
+    "jasmine-core": "^2.8.0",
+    "karma": "^1.7.1",
+    "karma-jasmine": "^1.1.0",
     "karma-nativescript-launcher": "^0.4.0",
     "lazy": "1.0.11",
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-typescript": "libs",
-    "nativescript-dev-webpack": "^0.7.3",
+    "nativescript-dev-webpack": "~0.9.0",
     "raw-loader": "~0.5.1",
     "resolve-url-loader": "~2.1.0",
     "tns-platform-declarations": "~3.4.0",
-    "tslint": "~5.4.3",
     "typescript": "~2.6.0",
-    "webpack": "~3.2.0",
+    "webpack": "~3.8.1",
     "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-sources": "~1.0.1"
-  },
-  "scripts": {
-    "build.plugin": "cd ../src && npm run build",
-    "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'",
-    "ns-bundle": "ns-bundle",
-    "publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
-    "generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install",
-    "start-android-bundle": "npm run ns-bundle --android --run-app",
-    "start-ios-bundle": "npm run ns-bundle --ios --run-app",
-    "build-android-bundle": "npm run ns-bundle --android --build-app",
-    "build-ios-bundle": "npm run ns-bundle --ios --build-app"
+    "webpack-sources": "~1.0.1",
+    "css-loader": "~0.28.7",
+    "nativescript-worker-loader": "~0.8.1",
+    "uglifyjs-webpack-plugin": "~1.1.6"
   }
 }

demo/references.d.ts

@@ -1,2 +1 @@
-/// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
-/// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />
+/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.

demo/tsconfig.json

@@ -9,7 +9,8 @@
         "experimentalDecorators": true,
         "lib": [
             "es6",
-            "dom"
+            "dom",
+            "es2015.iterable"
         ],
         "pretty": true,
         "allowUnreachableCode": false,
@@ -20,12 +21,11 @@
         "noImplicitReturns": true,
         "noImplicitUseStrict": false,
         "noFallthroughCasesInSwitch": true,
-        "baseUrl": ".",
-        "paths": {
-            "*": [
-                "./node_modules/*"
-            ]
-        }
+        "typeRoots": [
+            "./node_modules/@types",
+            "./node_modules"
+        ],
+        "types": []
     },
     "exclude": [
         "node_modules",

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-webview-utils",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Add custom headers to a NativeScript WebView. Perhaps more utils later.",
   "main": "webview-utils",
   "typings": "index.d.ts",
@@ -11,20 +11,22 @@
     }
   },
   "scripts": {
-    "tsc": "tsc -skipLibCheck",
     "build": "npm i && tsc",
-    "postclone": "npm i && node scripts/postclone.js && cd ../demo && npm i && cd ../src && npm run plugin.link",
-    "test.android": "npm i && npm run tsc && npm run tslint && cd ../demo && tns build android && tns test android --justlaunch",
-    "test.ios": "npm i && npm run tsc && npm run tslint && cd ../demo && tns build ios && tns test ios --justlaunch",
-    "tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\"",
-    "plugin.link": "npm link && cd ../demo && npm link nativescript-webview-utils && cd ../src",
-    "plugin.tscwatch": "npm run tsc -- -w",
-    "demo.ios": "npm i && npm run tsc && cd ../demo && tns run ios --syncAllFiles",
-    "demo.android": "npm i && npm run tsc && cd ../demo && tns run android --syncAllFiles",
-    "demo.reset": "cd ../demo && rimraf platforms",
-    "plugin.prepare": "npm run tsc && cd ../demo && tns plugin remove nativescript-webview-utils && tns plugin add ../src",
-    "clean": "cd ../demo && rimraf hooks node_modules platforms && cd ../src && rimraf node_modules && npm run plugin.link",
-    "ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**'"
+    "demo.ios": "npm run preparedemo && cd ../demo && tns run ios --emulator",
+    "demo.ios.device": "npm run preparedemo && cd ../demo && tns platform remove ios && tns run ios",
+    "demo.android": "npm run preparedemo && cd ../demo && tns platform remove android && tns run android --justlaunch",
+    "test": "npm run tslint && npm run tslint.demo && cd ../demo && tns build ios && tns build android",
+    "test.ios": "cd ../demo && tns platform remove ios && tns test ios --emulator",
+    "test.ios.device": "cd ../demo && tns platform remove ios && tns test ios",
+    "test.android": "cd ../demo && tns platform remove android && tns test android --justlaunch",
+    "preparedemo": "npm run build && cd ../demo && tns plugin remove nativescript-webview-utils && tns plugin add ../src && tns install",
+    "setup": "npm run build && cd ../demo && npm i",
+    "setupandinstall": "npm i && cd ../demo && npm i && cd ../src && npm run build && cd ../demo && tns plugin add ../src && cd ../src",
+    "tslint": "tslint --config '../tslint.json' '*.ts' --exclude '**/node_modules/**'",
+    "tslint.demo": "tslint --config '../tslint.json' '../demo/app/*.ts' --exclude '**/node_modules/**'",
+    "ci.tslint": "npm run tslint && npm run tslint.demo",
+    "prepublishOnly": "npm run build",
+    "development.setup": "npm run setup && npm link && cd ../demo && npm link nativescript-webview-utils && cd ../src"
   },
   "keywords": [
     "ecosystem:NativeScript",
@@ -50,8 +52,6 @@
     "tns-core-modules": "~3.4.0",
     "tns-platform-declarations": "~3.4.0",
     "typescript": "~2.6.0",
-    "prompt": "^1.0.0",
-    "rimraf": "^2.5.0",
     "tslint": "^5.0.0"
   },
   "dependencies": {},

src/tsconfig.json

@@ -20,9 +20,16 @@
         "noImplicitAny": false,
         "noImplicitReturns": true,
         "noImplicitUseStrict": false,
-        "noFallthroughCasesInSwitch": true
+        "noFallthroughCasesInSwitch": true,
+        "typeRoots": [
+            "./node_modules/@types",
+            "./node_modules"
+        ],
+        "types": [
+        ]
     },
     "exclude": [
+        "demo",
         "node_modules"
     ],
     "compileOnSave": false