Add files via upload

nestycoder87 · web-flow · commit 7833f9fa17ac · 2016-10-31T13:02:42.000+01:00
diff --git a/test-ang/README.md b/test-ang/README.md
@@ -1,13 +1,13 @@
-# angular-test
-
-
-This is the full test project
-
-# Installation
-```bash
-cd test-ang
-npm install
-npm start
-```
-
-Then go to [http://localhost:8080](http://localhost:8080) in your browser. Thank you 
+# angular-test
+
+
+This is the full test project
+
+# Installation
+```bash
+cd test-ang
+npm install
+npm start
+```
+
+Then go to [http://localhost:8080](http://localhost:8080) in your browser. Thank you 
diff --git a/test-ang/gulpfile.js b/test-ang/gulpfile.js
@@ -1,16 +1,55 @@
 var gulp = require('gulp');
+var gutil = require('gulp-util');
+var watch = require('gulp-watch');
+var ngAnnotate = require('gulp-ng-annotate');
 var concat = require('gulp-concat');
 var rename = require('gulp-rename');
 var uglify = require('gulp-uglify');
+var webpack  = require('webpack');
+var webpack_stream = require('webpack-stream');
+var WebpackDevServer = require('webpack-dev-server');
+var webpackConfig    = require('./webpack.config.js');
+var browserSync = require('browser-sync').create();
 
 var jsFiles = 'app/index.js',
-    jsDest = 'dist/scripts';
+    jsDest = 'app/dist/scripts';
 
     gulp.task('scripts', function() {
         return gulp.src(jsFiles)
-            .pipe(concat('scripts.js'))
+            .pipe(webpack_stream())
+            .pipe(rename('scripts.min.js'))
+			.pipe(ngAnnotate({
+            // true helps add where @ngInject is not used. It infers.
+            // Doesn't work with resolve, so we must be explicit there
+            add: true
+        }))
+            .pipe(uglify())
             .pipe(gulp.dest(jsDest))
+          /*  .pipe(concat('scripts.js'))
             .pipe(rename('scripts.min.js'))
             .pipe(uglify())
-            .pipe(gulp.dest(jsDest));
+
+            .pipe(gulp.dest(jsDest));*/
+    });
+    gulp.task('default', ['scripts', 'webpack-server'])
+    gulp.task('webpack-server', function (c) {
+      var myConfig = Object.create(webpackConfig);
+      console.log(myConfig);
+    myConfig.devtool = 'eval';
+    myConfig.debug = true;
+
+    // Start a webpack-dev-server
+    new WebpackDevServer(webpack(myConfig), {
+        stats: {
+            colors: true
+        },
+        contentBase: './app'
+    }).listen(myConfig.devServer.port, 'localhost', function (err) {
+        if (err) {
+            throw new gutil.PluginError('webpack-dev-server', err);
+        }
+        gutil.log('[webpack-dev-server]', 'http://localhost:8080/index.html');
+
+      //  gutil.log(['myConfig'], myConfig);
     });
+  });
diff --git a/test-ang/package.json b/test-ang/package.json
@@ -17,17 +17,24 @@
     "babel-core": "^6.18.0",
     "babel-loader": "^6.2.7",
     "babel-preset-es2015": "^6.18.0",
+    "browser-sync": "^2.17.5",
     "gulp-concat": "^2.6.0",
     "gulp-jshint": "^2.0.2",
+    "gulp-ng-annotate": "^2.0.0",
     "gulp-rename": "^1.2.2",
     "gulp-uglify": "^2.0.0",
+    "gulp-util": "^3.0.7",
+    "gulp-watch": "^4.3.10",
+    "jshint": "^2.9.4",
     "jshint-stylish": "^2.2.1",
     "webpack": "^1.13.3",
-    "webpack-dev-server": "^1.16.2"
+    "webpack-dev-server": "^1.16.2",
+    "webpack-stream": "^3.2.0"
   },
   "dependencies": {
     "angular": "^1.5.8",
     "angular-route": "^1.5.8",
-    "gulp": "^3.9.1"
+    "gulp": "^3.9.1",
+    "gulp-jshint": "^2.0.2"
   }
 }
diff --git a/test-ang/webpack.config.js b/test-ang/webpack.config.js
@@ -1,10 +1,15 @@
 module.exports = {
-  context: __dirname + '/app',
-  entry: './index.js',
+
+  entry: './app/index.js',
   output: {
-    path:  __dirname + '/app',
+     path: __dirname + '/',
+     contentBase: __dirname,
     publicPath: "",
     filename: 'bundle.js'
   },
+  devServer: {
+        inline: true,
+        port: 8080
+    }
 
 }
