Merge pull request #160 from NativeScript/hdeshev/webpack-plugin

Webpack plugin for ng-sample

Author: hdeshev

Diff for: .gitignore

@@ -1,3 +1,4 @@
+nativescript-angular*.tgz
 bin/dist
 node_modules
 tags

Diff for: ng-sample/app/package.json

@@ -1,6 +1,8 @@
 {
     "name": "tns-template-hello-world",
     "main": "starter.js",
+    "bundleMain": "app.js",
+    "bundleOutput": "bundle.js",
     "version": "1.2.0",
     "author": "Telerik <[email protected]>",
     "description": "Nativescript hello-world project template",

Diff for: ng-sample/hooks/after-prepare/nativescript-dev-webpack.js

@@ -0,0 +1 @@
+module.exports = require("nativescript-dev-webpack/after-prepare-hook.js");

Diff for: ng-sample/hooks/after-prepare/webpack.js

@@ -41,14 +41,13 @@
 		"grunt-shell": "1.1.2",
 		"grunt-ts": "5.0.0-beta.5",
 		"nativescript-dev-typescript": "^0.3.1",
-		"shelljs": "^0.5.3",
-		"typescript": "1.8.2",
-		"webpack": "^1.12.9"
+		"nativescript-dev-webpack": "0.0.7",
+		"typescript": "1.8.2"
 	},
 	"nativescript": {
 		"id": "org.nativescript.ngsample",
 		"tns-android": {
 			"version": "1.7.1"
 		}
 	}
-}
+}

Diff for: ng-sample/package.json

@@ -8,6 +8,7 @@
         "experimentalDecorators": true,
         "removeComments": false,
         "emitDecoratorMetadata": true,
+        "noImplicitUseStrict": true,
         "noEmitOnError": true
     },
     "exclude": [

Diff for: ng-sample/tsconfig.json

@@ -1,50 +1,5 @@
-var path = require("path");
-var webpack = require("webpack");
+var bundler = require("nativescript-dev-webpack");
 
-
-console.log('PROJECT_DIR: ' + process.env.PROJECT_DIR);
-
-module.exports = {
-    //context: "./platforms/android/src/main/assets/app",
-    context: process.env.PROJECT_DIR,
-    entry: {
-        app: "./app",
-    },
-    output: {
-        path: __dirname,
-        pathinfo: true,
-        libraryTarget: "commonjs2",
-        filename: "bundle.js"
-    },
-    externals: [
-        function(context, request, callback) {
-            if (/browserify|crypto/.test(request)) {
-                return callback(null, "var {}");
-            } else {
-                callback();
-            }
-        }
-    ],
-    resolve: {
-        extensions: ["", ".js"],
-        packageMains: ["main"],
-        modulesDirectories: [
-            "tns_modules",
-        ]
-    },
-    module: {
-        loaders: [
-        ]
-    },
-    plugins: [
-        new webpack.DefinePlugin({
-            global: 'global',
-            __dirname: '__dirname'
-        }),
-        //new webpack.optimize.UglifyJsPlugin({
-            //compress: {
-                //warnings: true
-            //}
-        //})
-    ]
-};
+module.exports = bundler.getConfig({
+    // TODO: add project-specific webpack settings here...
+});

Diff for: ng-sample/webpack.config.js

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-angular",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "description": "",
   "homepage": "http://www.telerik.com",
   "bugs": "http://www.telerik.com",
@@ -37,7 +37,7 @@
     "typescript": "1.8.2"
   },
   "peerDependencies": {
-    "tns-core-modules": ">=2.0.0 || >=2.0.0-2016 || >=2.0.0-angular-2"
+    "tns-core-modules": ">=2.0.0 || >=2.0.0-2016 || >=2.0.0-angular-3"
   },
   "nativescript": {}
 }

Diff for: package.json

@@ -1,6 +1,3 @@
-//Import globals before the zone, so the latter can patch the global functions
-import 'globals';
-
 //prevent a crash in zone patches. pretend we're node.js
 global.process = {};
 const oldToString = Object.prototype.toString;
@@ -10,6 +7,10 @@ Object.prototype.toString = function() {
 import "zone.js/dist/zone.js"
 Object.prototype.toString = oldToString;
 delete global.process;
+//
+//Import globals after the zone, so the latter can't patch everything there.
+//The patchables should already be zone-aware already.
+import 'globals';
 
 import 'reflect-metadata';
 import './polyfills/array';