Updating dependencies to not use peer deps.

dzearing · dzearing · commit f6514f706c04 · 2016-03-22T20:04:55.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 node_modules
 .DS_Store
 npm*.log
+coverage
+temp
 lib
+dist
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,69 +1,5 @@
 'use strict';
 
-let gulp = require('gulp');
+let build = require('node-library-build');
 
-let config = {
-  paths: {
-    libFolder: 'lib',
-    sourceMatch: [
-      'src/**/*.ts',
-      'typings/tsd.d.ts'
-    ],
-    testMatch: [
-      'lib/**/*.test.js'
-    ]
-  }
-}
-
-gulp.task('build', () => {
-  let ts = require('gulp-typescript');
-  let plumber = require('gulp-plumber');
-  let merge = require('merge2');
-  let lint = require('gulp-tslint');
-  let tsConfig = require('./tsconfig.json');
-  let paths = config.paths;
-  let errorCount = 0;
-  let allStreams = [];
-  let tsProject = ts.createProject(tsConfig.compilerOptions);
-  let gutil = require('gulp-util');
-  let sourceStream = gulp.src(paths.sourceMatch);
-
-  sourceStream
-    .pipe(lint({
-      configuration: require('./tslint.json')
-    }))
-    .pipe(lint.report('full', {
-      emitError: false
-    }));
-
-  let tsResult = sourceStream
-    .pipe(plumber({
-      errorHandler: function(error) {
-       // console.log(error);
-        errorCount++;
-      }
-    }))
-    .pipe(ts(tsProject, undefined, ts.reporter.longReporter()));
-
-  allStreams.push(tsResult.js.pipe(gulp.dest(paths.libFolder)));
-  allStreams.push(tsResult.dts.pipe(gulp.dest(paths.libFolder)));
-
-  let mergedStream = merge(allStreams);
-
-  mergedStream.on('queueDrain', function() {
-    if (errorCount) {
-//      throw new gutil.PluginError('msg', `[gulp-typescript] TypeScript error(s): ${ chalk.red(errorCount) }`, { showStack: false });
-    }
-  });
-
-  return mergedStream;
-});
-
-gulp.task('test', ['build'], () => {
-  let mocha = require('gulp-mocha');
-
-  return gulp.src(config.paths.testMatch, { read: false })
-    .pipe(mocha());
-});
-
-gulp.task('default', ['build']);
+build.initialize(require('gulp'));
diff --git a/package.json b/package.json
@@ -1,24 +1,17 @@
 {
   "name": "gulp-core-build-webpack",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "license": "MIT",
-  "peerDependencies": {
-    "webpack": "^1.12.14"
-  },
   "dependencies": {
-    "gulp-core-build": "^0.4.0",
+    "gulp-core-build": "^0.4.4",
     "gulp": "^3.9.1",
-    "gulp-util": "^3.0.7"
+    "gulp-util": "^3.0.7",
+    "webpack": "^1.12.14"
   },
   "devDependencies": {
-    "gulp-plumber": "^1.1.0",
-    "gulp-tslint": "^4.3.3",
-    "gulp-typescript": "^2.12.1",
-    "merge2": "^1.0.1",
-    "tslint": "^3.5.0",
-    "typescript": "^1.8.7"
+    "node-library-build": "^0.0.3"
   }
 }
diff --git a/src/WebpackTask.ts b/src/WebpackTask.ts
@@ -11,9 +11,11 @@ export class WebpackTask extends GulpTask<IWebpackConfig> {
     configPath: './webpack.config.js'
   };
 
+  public resources = {
+    webpack: require('webpack')
+  };
+
   public executeTask(gulp, completeCallback): any {
-    // let isProduction = (process.argv.indexOf('--production') > -1);
-    // let streams = [];
     let shouldInitWebpack = (process.argv.indexOf('--initwebpack') > -1);
     let path = require('path');
 
@@ -72,30 +74,6 @@ export class WebpackTask extends GulpTask<IWebpackConfig> {
                     `took ${gutil.colors.magenta(duration)} ms.`)
                 )); // end file
 
-/*
-
-                let chunkStats = {
-                  chunk: chunk,
-                  modules: null
-                };
-                let statsPath = path.join(outputDir, chunk.files[0]) + '.stats.json';
-
-                if (child.modules) {
-                  chunkStats.modules = statsResult.modules
-                    .filter(mod => (mod.chunks && mod.chunks.indexOf(chunk.id) > -1))
-                    .map(mod => ({ name: mod.name, size: mod.size }))
-                    .sort((a, b) => (a.size < b.size ? 1 : -1));
-                }
-
-                let fs = require('fs');
-
-                fs.writeFileSync(
-                  statsPath,
-                  JSON.stringify(chunkStats, null, 2),
-                  'utf8'
-                );
-*/
-
               }); // end chunk
 
             }); // end child
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,6 +1,9 @@
 'use strict';
 
-let webpack = require('webpack');
+/** Note: this require may need to be fixed to point to the build that exports the gulp-core-build-webpack instance. */
+let webpackTaskResources = require('web-library-build').webpack.resources;
+let webpack = webpackTaskResources.webpack;
+
 let path = require('path');
 let isProduction = process.argv.indexOf('--production') > -1;
 let packageJSON = require('./package.json');
