Merge pull request #79 from NativeScript/zbranzov/ns3.4

Zdravko · web-flow · commit f44a825ddb37 · 2018-01-02T10:34:35.000+02:00
add support for ns 3.4 and dev-webpack 0.9.0
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ branches:
 env:
   global:
     - ANDROID_PACKAGE='demo-debug.apk'
-    - ANDROID_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/android/build/outputs/apk
+    - ANDROID_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/android/app/build/outputs/apk
     - ANDROID_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$ANDROID_PACKAGE?overwrite=true"
     - IOS_PACKAGE='demo.zip'
     - IOS_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/ios/build/emulator
@@ -25,14 +25,14 @@ matrix:
       language: node_js 
       node_js: "6"
       jdk: oraclejdk8
-      script: cd demo && npm run build.plugin && npm i && npm run ns-bundle --ios --build-app --uglify && cd ../demo-angular && npm run build.plugin && npm i && npm run ns-bundle --ios --build-app --uglify
+      script: cd demo && npm run build.plugin && npm i && tns build ios --env.uglify && cd ../demo-angular && npm run build.plugin && npm i && tns build ios --env.uglify --env.aot
     - language: android
       os: linux
       env:
         - WebpackAndroid="26"
       jdk: oraclejdk8
       before_install: nvm install 6.10.3
-      script: cd demo && npm run build.plugin && npm i && npm run ns-bundle --android --build-app --uglify --snapshot && cd ../demo-angular && npm run build.plugin && npm i && npm run ns-bundle --android --build-app --uglify --snapshot
+      script: cd demo && npm run build.plugin && npm i && tns build android --env.uglify --env.snapshot && cd ../demo-angular && npm run build.plugin && npm i && tns build android --env.uglify --env.snapshot --env.aot
     - language: android
       env: 
         - BuildAndroid="26"
diff --git a/demo-angular/app/app.css b/demo-angular/app/app.css
@@ -9,5 +9,5 @@ In many cases you may want to use the NativeScript core theme instead
 of writing your own CSS rules. For a full list of class names in the theme
 refer to http://docs.nativescript.org/ui/theme.
 */
-@import 'nativescript-theme-core/css/core.light.css';
+@import '~nativescript-theme-core/css/core.light.css';
 
diff --git a/demo-angular/app/app.module.ngfactory.d.ts b/demo-angular/app/app.module.ngfactory.d.ts
@@ -0,0 +1 @@
+export const AppModuleNgFactory: any;
diff --git a/demo-angular/app/pages/login/login.component.css b/demo-angular/app/pages/login/login.component.css
@@ -1,5 +1,5 @@
 .login-buttons {
     margin-left: 30;
     margin-right: 30;
-    margin-top: 80%;
+    margin-top: 70%;
 }
diff --git a/demo-angular/app/vendor-platform.android.ts b/demo-angular/app/vendor-platform.android.ts
@@ -1,9 +1,9 @@
-require("tns-core-modules/application");
+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.
-    */
-    require("tns-core-modules/ui/frame");
-    require("tns-core-modules/ui/frame/activity");
+    // 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");
 }
diff --git a/demo-angular/app/vendor-platform.ios.ts b/demo-angular/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;
diff --git a/demo-angular/app/vendor.ts b/demo-angular/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("reflect-metadata");
diff --git a/demo-angular/package.json b/demo-angular/package.json
@@ -3,55 +3,56 @@
   "license": "MIT",
   "nativescript": {
     "id": "org.nativescript.demoangular",
-    "tns-android": {
-      "version": "3.0.1"
-    },
     "tns-ios": {
-      "version": "3.0.1"
+      "version": "3.4.0"
+    },
+    "tns-android": {
+      "version": "3.4.0"
     }
   },
   "dependencies": {
-    "@angular/common": "~4.0.0",
-    "@angular/compiler": "~4.0.0",
-    "@angular/core": "~4.0.0",
-    "@angular/forms": "~4.0.0",
-    "@angular/http": "~4.0.0",
-    "@angular/platform-browser": "~4.0.0",
-    "@angular/platform-browser-dynamic": "~4.0.0",
-    "@angular/router": "~4.0.0",
-    "nativescript-angular": "^3.0.0 || ^2.0.0-rc.1",
+    "@angular/common": "~5.0.0",
+    "@angular/compiler": "~5.0.0",
+    "@angular/core": "~5.0.0",
+    "@angular/forms": "~5.0.0",
+    "@angular/http": "~5.0.0",
+    "@angular/platform-browser": "~5.0.0",
+    "@angular/platform-browser-dynamic": "~5.0.0",
+    "@angular/router": "~5.0.0",
+    "nativescript-angular": "^5.0.0",
     "nativescript-facebook": "../src",
     "nativescript-theme-core": "^1.0.2",
     "nativescript-unit-test-runner": "^0.3.4",
-    "rxjs": "~5.3.0",
-    "tns-core-modules": "^3.0.0",
+    "rxjs": "^5.5.0",
+    "tns-core-modules": "^3.4.0",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~4.0.0",
-    "@ngtools/webpack": "~1.5.0",
+    "@angular/compiler-cli": "~5.0.0",
+    "@ngtools/webpack": "~1.8.2",
     "babel-traverse": "6.12.0",
     "babel-types": "6.11.1",
     "babylon": "6.8.4",
     "copy-webpack-plugin": "~4.0.1",
-    "extract-text-webpack-plugin": "~2.1.0",
+    "css-loader": "~0.28.7",
+    "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",
     "karma-nativescript-launcher": "^0.4.0",
     "lazy": "1.0.11",
     "nativescript-css-loader": "~0.26.0",
-    "nativescript-dev-typescript": "^0.4.0",
-    "nativescript-dev-webpack": "^0.8.0",
+    "nativescript-dev-typescript": "^0.6.0",
+    "nativescript-dev-webpack": "^0.9.0",
+    "nativescript-worker-loader": "~0.8.1",
     "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.0.2",
-    "typescript": "~2.3.4",
-    "webpack": "~2.6.1",
-    "webpack-sources": "~1.0.1",
+    "resolve-url-loader": "~2.1.0",
     "tslint": "~5.4.3",
+    "typescript": "~2.4.2",
+    "webpack": "~3.8.1",
     "webpack-bundle-analyzer": "^2.8.2",
-    "nativescript-worker-loader": "~0.8.1"
+    "webpack-sources": "~1.0.1"
   },
   "scripts": {
     "ns-bundle": "ns-bundle",
@@ -60,10 +61,10 @@
     "ci.android.build": "npm run build.plugin && tns build android",
     "ci.ios.build": "npm run build.plugin && tns build ios",
     "publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
-    "start-android-bundle": "npm run ns-bundle --android --run-app --uglify --snapshot",
-    "start-ios-bundle": "npm run ns-bundle --ios --run-app --uglify",
-    "build-android-bundle": "npm run ns-bundle --android --build-app --uglify --snapshot",
-    "build-ios-bundle": "npm run ns-bundle --ios --build-app --uglify",
-    "generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install"
+    "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"
   }
 }
diff --git a/demo-angular/tsconfig.aot.json b/demo-angular/tsconfig.aot.json
diff --git a/demo-angular/tsconfig.json b/demo-angular/tsconfig.json
@@ -35,8 +35,7 @@
     },
     "exclude": [
         "node_modules",
-        "platforms",
-        "**/*.aot.ts"
+        "platforms"
     ],
     "compileOnSave": false
 }
diff --git a/demo/app/app.css b/demo/app/app.css
@@ -1,4 +1,4 @@
-﻿@import 'nativescript-theme-core/css/core.light.css';
+﻿@import '~nativescript-theme-core/css/core.light.css';
 .login-buttons {
     margin-left: 30;
     margin-right: 30;
diff --git a/demo/app/bundle-config.ts b/demo/app/bundle-config.ts
@@ -1,9 +1,9 @@
 if ((<any>global).TNS_WEBPACK) {
-    require("tns-core-modules/bundle-entry-points");
-
-    global.registerModule("login-page", () => require("./login-page"));
-    global.registerModule("home-page", () => require("./home-page"));
+    // registers tns-core-modules UI framework modules
+    require("bundle-entry-points");
 
     // register application modules
+    const context = require.context("~/", true, /page\.(xml|css|js|ts|scss|less|sass)$/);
+    global.registerWebpackModules(context);
     global.registerModule("nativescript-facebook", () => require("nativescript-facebook"));
-}
+}
diff --git a/demo/app/vendor-platform.android.ts b/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");
-}
+}
diff --git a/demo/app/vendor-platform.ios.ts b/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;
diff --git a/demo/app/vendor.ts b/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("tns-core-modules/bundle-entry-points");
-require("nativescript-facebook");
+
+require("bundle-entry-points");
diff --git a/demo/package.json b/demo/package.json
@@ -1,18 +1,18 @@
 {
   "nativescript": {
     "id": "org.nativescript.demo",
-    "tns-android": {
-      "version": "3.0.1"
-    },
     "tns-ios": {
-      "version": "3.0.1"
+      "version": "3.4.0"
+    },
+    "tns-android": {
+      "version": "3.4.0"
     }
   },
   "dependencies": {
     "nativescript-facebook": "../src",
     "nativescript-theme-core": "^1.0.2",
     "nativescript-unit-test-runner": "^0.3.4",
-    "tns-core-modules": "^3.0.0"
+    "tns-core-modules": "^3.4.0"
   },
   "devDependencies": {
     "awesome-typescript-loader": "~3.1.3",
@@ -22,7 +22,8 @@
     "chai": "~3.5.0",
     "chai-as-promised": "~5.3.0",
     "copy-webpack-plugin": "~4.0.1",
-    "extract-text-webpack-plugin": "~2.1.0",
+    "css-loader": "~0.28.7",
+    "extract-text-webpack-plugin": "~3.0.0",
     "filewalker": "0.1.2",
     "jasmine-core": "^2.5.2",
     "karma": "^1.3.0",
@@ -32,15 +33,15 @@
     "mocha": "~3.5.0",
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-appium": "^3.1.0",
-    "nativescript-dev-typescript": "^0.4.0",
-    "nativescript-dev-webpack": "^0.8.0",
+    "nativescript-dev-typescript": "^0.6.0",
+    "nativescript-dev-webpack": "^0.9.0",
     "nativescript-worker-loader": "~0.8.1",
     "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.0.2",
+    "resolve-url-loader": "~2.1.0",
     "tslint": "~5.4.3",
     "typescript": "~2.2.2",
     "wd": "~1.1.1",
-    "webpack": "~2.6.1",
+    "webpack": "~3.8.1",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-sources": "~1.0.1"
   },
@@ -54,11 +55,11 @@
     "ci.ios.uitest": "npm run appium --runtype=ios-simulator103iPhone6",
     "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 --uglify --snapshot",
-    "start-ios-bundle": "npm run ns-bundle --ios --run-app --uglify",
-    "build-android-bundle": "npm run ns-bundle --android --build-app --uglify --snapshot",
-    "build-ios-bundle": "npm run ns-bundle --ios --build-app --uglify",
     "e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
-    "compile-tests": "tsc -p e2e --watch"
+    "compile-tests": "tsc -p e2e --watch",
+    "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"
   }
 }
diff --git a/demo/references.d.ts b/demo/references.d.ts
@@ -0,0 +1 @@
+/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" /> Needed for autocompletion and compilation.
diff --git a/src/login-manager.android.metadata.json b/src/login-manager.android.metadata.json
@@ -1 +1 @@
-[{"__symbolic":"module","version":3,"metadata":{"onLoginCallback":{"__symbolic":"error","message":"Variable not initialized","line":7,"character":11},"onLogoutCallback":{"__symbolic":"error","message":"Variable not initialized","line":8,"character":11},"_registerLogoutCallback":{"__symbolic":"function"},"init":{"__symbolic":"function"},"_registerLoginCallback":{"__symbolic":"function"},"requestPublishPermissions":{"__symbolic":"function"},"requestReadPermissions":{"__symbolic":"function"},"login":{"__symbolic":"function"},"logout":{"__symbolic":"function"}}},{"__symbolic":"module","version":1,"metadata":{"onLoginCallback":{"__symbolic":"error","message":"Variable not initialized","line":7,"character":11},"onLogoutCallback":{"__symbolic":"error","message":"Variable not initialized","line":8,"character":11},"_registerLogoutCallback":{"__symbolic":"function"},"init":{"__symbolic":"function"},"_registerLoginCallback":{"__symbolic":"function"},"requestPublishPermissions":{"__symbolic":"function"},"requestReadPermissions":{"__symbolic":"function"},"login":{"__symbolic":"function"},"logout":{"__symbolic":"function"}}}]
+[{"__symbolic":"module","version":3,"metadata":{"onLogoutCallback":{"__symbolic":"error","message":"Variable not initialized","line":6,"character":11},"_registerLogoutCallback":{"__symbolic":"function"},"init":{"__symbolic":"function"},"_registerLoginCallback":{"__symbolic":"function"},"requestPublishPermissions":{"__symbolic":"function"},"requestReadPermissions":{"__symbolic":"function"},"login":{"__symbolic":"function"},"logout":{"__symbolic":"function"}}},{"__symbolic":"module","version":1,"metadata":{"onLogoutCallback":{"__symbolic":"error","message":"Variable not initialized","line":6,"character":11},"_registerLogoutCallback":{"__symbolic":"function"},"init":{"__symbolic":"function"},"_registerLoginCallback":{"__symbolic":"function"},"requestPublishPermissions":{"__symbolic":"function"},"requestReadPermissions":{"__symbolic":"function"},"login":{"__symbolic":"function"},"logout":{"__symbolic":"function"}}}]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`.login-buttons {`
`2`	`2`	`margin-left: 30;`
`3`	`3`	`margin-right: 30;`
`4`		`- margin-top: 80%;`
	`4`	`+ margin-top: 70%;`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// There is a bug in angular: https://github.com/angular/angular-cli/pull/8589/files`
	`2`	`+// Legendary stuff, its webpack plugin pretty much doesn't work with empty TypeScript files in v1.8.3`
	`3`	`+void 0;`