Move web pack 1 example results into a subfolder

2016-03-21 10:27:05 +01:00 · 2016-03-21 10:27:05 +01:00 · 935eefb291
parent f616f2e22f
commit 935eefb291
43 changed files with 25 additions and 11 deletions
--- a/examples/appcache/dist/webpack-1/0714810ae3fb211173e2964249507195.png
+++ b/examples/appcache/dist/webpack-1/0714810ae3fb211173e2964249507195.png
--- a/examples/appcache/dist/webpack-1/bundle.js
+++ b/examples/appcache/dist/webpack-1/bundle.js
--- a/examples/appcache/dist/webpack-1/index.html
+++ b/examples/appcache/dist/webpack-1/index.html
--- a/examples/appcache/dist/webpack-1/manifest.appcache
+++ b/examples/appcache/dist/webpack-1/manifest.appcache
--- a/examples/appcache/dist/webpack-1/styles.css
+++ b/examples/appcache/dist/webpack-1/styles.css
--- a/examples/appcache/webpack.config.js
+++ b/examples/appcache/webpack.config.js
@ -1,10 +1,12 @@
 var AppCachePlugin = require('appcache-webpack-plugin');
 var HtmlWebpackPlugin = require('../..');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var webpackMajorVersion = require('webpack/package.json').version.split('.')[0];
+
 module.exports = {
  entry: './example.js',
  output: {
-    path: __dirname + '/dist',
+    path: __dirname + '/dist/webpack-' + webpackMajorVersion,
    publicPath: '',
    filename: 'bundle.js'
  },
@ -28,4 +30,3 @@ module.exports = {
    new ExtractTextPlugin('styles.css')
  ]
 };
-
--- a/examples/custom-template/dist/webpack-1/0714810ae3fb211173e2964249507195.png
+++ b/examples/custom-template/dist/webpack-1/0714810ae3fb211173e2964249507195.png
--- a/examples/custom-template/dist/webpack-1/bundle.js
+++ b/examples/custom-template/dist/webpack-1/bundle.js
--- a/examples/custom-template/dist/webpack-1/index.html
+++ b/examples/custom-template/dist/webpack-1/index.html
--- a/examples/custom-template/dist/webpack-1/styles.css
+++ b/examples/custom-template/dist/webpack-1/styles.css
--- a/examples/custom-template/webpack.config.js
+++ b/examples/custom-template/webpack.config.js
@ -1,9 +1,11 @@
 var HtmlWebpackPlugin = require('../..');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var webpackMajorVersion = require('webpack/package.json').version.split('.')[0];
+
 module.exports = {
  entry: './example.js',
  output: {
-    path: __dirname + '/dist',
+    path: __dirname + '/dist/webpack-' + webpackMajorVersion,
    publicPath: '',
    filename: 'bundle.js'
  },
--- a/examples/default/dist/webpack-1/bundle.js
+++ b/examples/default/dist/webpack-1/bundle.js
--- a/examples/default/dist/webpack-1/index.html
+++ b/examples/default/dist/webpack-1/index.html
--- a/examples/default/webpack.config.js
+++ b/examples/default/webpack.config.js
@ -1,8 +1,9 @@
 var HtmlWebpackPlugin = require('../..');
+var webpackMajorVersion = require('webpack/package.json').version.split('.')[0];
 module.exports = {
  entry: './example.js',
  output: {
-    path: __dirname + '/dist',
+    path: __dirname + '/dist/webpack-' + webpackMajorVersion,
    publicPath: '',
    filename: 'bundle.js'
  },
--- a/examples/favicon/dist/webpack-1/bundle.js
+++ b/examples/favicon/dist/webpack-1/bundle.js
--- a/examples/favicon/dist/webpack-1/favicon.html
+++ b/examples/favicon/dist/webpack-1/favicon.html
--- a/examples/favicon/dist/webpack-1/favicon.ico
+++ b/examples/favicon/dist/webpack-1/favicon.ico
--- a/examples/favicon/dist/webpack-1/styles.css
+++ b/examples/favicon/dist/webpack-1/styles.css
--- a/examples/favicon/webpack.config.js
+++ b/examples/favicon/webpack.config.js
@ -1,9 +1,10 @@
 var HtmlWebpackPlugin = require('../..');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var webpackMajorVersion = require('webpack/package.json').version.split('.')[0];
 module.exports = {
  entry: './example.js',
  output: {
-    path: __dirname + '/dist',
+    path: __dirname + '/dist/webpack-' + webpackMajorVersion,
    publicPath: '',
    filename: 'bundle.js'
  },
--- a/examples/html-loader/dist/webpack-1/0714810ae3fb211173e2964249507195.png
+++ b/examples/html-loader/dist/webpack-1/0714810ae3fb211173e2964249507195.png
--- a/examples/html-loader/dist/webpack-1/about.html
+++ b/examples/html-loader/dist/webpack-1/about.html
--- a/examples/html-loader/dist/webpack-1/bundle.js
+++ b/examples/html-loader/dist/webpack-1/bundle.js
--- a/examples/html-loader/dist/webpack-1/favicon.ico
+++ b/examples/html-loader/dist/webpack-1/favicon.ico
--- a/examples/html-loader/dist/webpack-1/index.html
+++ b/examples/html-loader/dist/webpack-1/index.html
--- a/examples/html-loader/dist/webpack-1/styles.css
+++ b/examples/html-loader/dist/webpack-1/styles.css
--- a/examples/html-loader/webpack.config.js
+++ b/examples/html-loader/webpack.config.js
@ -1,9 +1,10 @@
 var HtmlWebpackPlugin = require('../..');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var webpackMajorVersion = require('webpack/package.json').version.split('.')[0];
 module.exports = {
  entry: './example.js',
  output: {
-    path: __dirname + '/dist',
+    path: __dirname + '/dist/webpack-' + webpackMajorVersion,
    publicPath: '',
    filename: 'bundle.js'
  },
--- a/examples/jade-loader/dist/webpack-1/0714810ae3fb211173e2964249507195.png
+++ b/examples/jade-loader/dist/webpack-1/0714810ae3fb211173e2964249507195.png
--- a/examples/jade-loader/dist/webpack-1/bundle.js
+++ b/examples/jade-loader/dist/webpack-1/bundle.js
--- a/examples/jade-loader/dist/webpack-1/favicon.ico
+++ b/examples/jade-loader/dist/webpack-1/favicon.ico
--- a/examples/jade-loader/dist/webpack-1/index.html
+++ b/examples/jade-loader/dist/webpack-1/index.html
--- a/examples/jade-loader/dist/webpack-1/styles.css
+++ b/examples/jade-loader/dist/webpack-1/styles.css
--- a/examples/jade-loader/webpack.config.js
+++ b/examples/jade-loader/webpack.config.js
@ -1,9 +1,10 @@
 var HtmlWebpackPlugin = require('../..');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var webpackMajorVersion = require('webpack/package.json').version.split('.')[0];
 module.exports = {
  entry: './example.js',
  output: {
-    path: __dirname + '/dist',
+    path: __dirname + '/dist/webpack-' + webpackMajorVersion,
    publicPath: '',
    filename: 'bundle.js'
  },
--- a/examples/javascript-advanced/dist/webpack-1/0714810ae3fb211173e2964249507195.png
+++ b/examples/javascript-advanced/dist/webpack-1/0714810ae3fb211173e2964249507195.png
--- a/examples/javascript-advanced/dist/webpack-1/bundle.js
+++ b/examples/javascript-advanced/dist/webpack-1/bundle.js
--- a/examples/javascript-advanced/dist/webpack-1/index.html
+++ b/examples/javascript-advanced/dist/webpack-1/index.html
--- a/examples/javascript-advanced/dist/webpack-1/styles.css
+++ b/examples/javascript-advanced/dist/webpack-1/styles.css
--- a/examples/javascript-advanced/webpack.config.js
+++ b/examples/javascript-advanced/webpack.config.js
@ -1,9 +1,10 @@
 var HtmlWebpackPlugin = require('../..');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var webpackMajorVersion = require('webpack/package.json').version.split('.')[0];
 module.exports = {
  entry: './example.js',
  output: {
-    path: __dirname + '/dist',
+    path: __dirname + '/dist/webpack-' + webpackMajorVersion,
    publicPath: '',
    filename: 'bundle.js'
  },
--- a/examples/javascript/dist/webpack-1/0714810ae3fb211173e2964249507195.png
+++ b/examples/javascript/dist/webpack-1/0714810ae3fb211173e2964249507195.png
--- a/examples/javascript/dist/webpack-1/bundle.js
+++ b/examples/javascript/dist/webpack-1/bundle.js
--- a/examples/javascript/dist/webpack-1/index.html
+++ b/examples/javascript/dist/webpack-1/index.html
@ -1,2 +1,2 @@
-<head><link href="styles.css" rel="stylesheet"></head>Hello World from backend2016-01-20T15:46:57.631Z<h2>Partial</h2>
+<head><link href="styles.css" rel="stylesheet"></head>Hello World from backend2016-03-21T08:52:41.516Z<h2>Partial</h2>
 <img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script>
--- a/examples/javascript/dist/webpack-1/styles.css
+++ b/examples/javascript/dist/webpack-1/styles.css
--- a/examples/javascript/webpack.config.js
+++ b/examples/javascript/webpack.config.js
@ -1,9 +1,10 @@
 var HtmlWebpackPlugin = require('../..');
 var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var webpackMajorVersion = require('webpack/package.json').version.split('.')[0];
 module.exports = {
  entry: './example.js',
  output: {
-    path: __dirname + '/dist',
+    path: __dirname + '/dist/webpack-' + webpackMajorVersion,
    publicPath: '',
    filename: 'bundle.js'
  },
--- a/spec/ExampleSpec.js
+++ b/spec/ExampleSpec.js
@ -16,19 +16,24 @@ var path = require('path');
 var webpack = require('webpack');
 var rm_rf = require('rimraf');
 var fs = require('fs');
+var webpackMajorVersion = require('webpack/package.json').version.split('.')[0];

 var OUTPUT_DIR = path.join(__dirname, '../dist');

+jasmine.getEnv().defaultTimeoutInterval = 5000;
+
 function runExample (exampleName, done) {
  var examplePath = path.resolve(__dirname, '..', 'examples', exampleName);
  var exampleOutput = path.join(OUTPUT_DIR, exampleName);
+  var fixturePath = path.join(examplePath, 'dist', 'webpack-' + webpackMajorVersion);
+  // Clear old results
  rm_rf(exampleOutput, function () {
    var options = require(path.join(examplePath, 'webpack.config.js'));
    options.context = examplePath;
    options.output.path = exampleOutput;
    webpack(options, function (err) {
      var dircompare = require('dir-compare');
-      var res = dircompare.compareSync(path.join(examplePath, 'dist'), exampleOutput, {compareSize: true});
+      var res = dircompare.compareSync(fixturePath, exampleOutput, {compareSize: true});

      res.diffSet.filter(function (diff) {
        return diff.state === 'distinct';