Skip to content

Commit

Permalink
Merge branch '3-add-plop-module-generation' into merge-upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
Eole211 committed May 20, 2019
2 parents ed705bb + 3031ada commit 7008eea
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 25 deletions.
27 changes: 4 additions & 23 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,24 +1,5 @@
Copyright (c) 2018, Wanadev <http://www.wanadev.fr/>
All rights reserved.
Copyright (c) Wanadev 2018 <http://www.wanadev.fr/>, all rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Wanadev nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL WANADEV BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software is the property of Wanadev. You are not allowed to disclose, copy
or distribute it, in any form or medium, without express written permission of
Wanadev.
6 changes: 4 additions & 2 deletions config/webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const merge = require("webpack-merge");
const path = require("path");

const FriendlyErrorsWebpackPlugin = require("friendly-errors-webpack-plugin");
const HardSourceWebpackPlugin = require("hard-source-webpack-plugin");
//const HardSourceWebpackPlugin = require("hard-source-webpack-plugin");

const common = require("./webpack.common.js");

Expand All @@ -26,6 +26,8 @@ module.exports = merge(common, {
],
},
}),
new HardSourceWebpackPlugin(),
//new HardSourceWebpackPlugin(),
// No hardsource plugin because of errors with last Webpack version :
// https://github.com/webpack/webpack/issues/8052
],
});

0 comments on commit 7008eea

Please sign in to comment.