Skip to content

Commit

Permalink
Merge pull request #4737 from ndresx/lint-glob-errors-fix
Browse files Browse the repository at this point in the history
Fix lint errors and normalize lint globs in package.json
  • Loading branch information
sokra committed Apr 18, 2017
2 parents 25ae65e + aea0e64 commit 8aa8a7b
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -97,8 +97,8 @@
"build:examples": "cd examples && node buildAll.js",
"pretest": "npm run lint-files",
"lint-files": "npm run lint && npm run beautify-lint",
"lint": "eslint lib bin hot buildin test/**/webpack.config.js test/binCases/**/test.js examples/**/webpack.config.js",
"beautify-lint": "beautify-lint 'lib/**/*.js' 'hot/**/*.js' 'bin/**/*.js' 'benchmark/*.js' 'test/*.js'",
"lint": "eslint lib bin hot buildin \"test/**/webpack.config.js\" \"test/binCases/**/test.js\" \"examples/**/webpack.config.js\"",
"beautify-lint": "beautify-lint \"lib/**/*.js\" \"hot/**/*.js\" \"bin/**/*.js\" \"benchmark/*.js\" \"test/*.js\"",
"nsp": "nsp check --output summary",
"benchmark": "mocha test/*.benchmark.js --harmony -R spec",
"cover": "node --harmony ./node_modules/istanbul/lib/cli.js cover -x '**/*.runtime.js' node_modules/mocha/bin/_mocha -- test/*.test.js",
Expand Down
2 changes: 1 addition & 1 deletion test/configCases/dll-plugin/1-use-dll/webpack.config.js
Expand Up @@ -3,7 +3,7 @@ var webpack = require("../../../../");
module.exports = {
plugins: [
new webpack.DllReferencePlugin({
manifest: require("../../../js/config/dll-plugin/manifest0.json"),
manifest: require("../../../js/config/dll-plugin/manifest0.json"), // eslint-disable-line node/no-missing-require
name: "../0-create-dll/dll.js",
scope: "dll",
sourceType: "commonjs2",
Expand Down
Expand Up @@ -17,7 +17,7 @@ module.exports = {
},
plugins: [
new webpack.DllReferencePlugin({
manifest: require("../../../js/config/dll-plugin/manifest0.json"),
manifest: require("../../../js/config/dll-plugin/manifest0.json"), // eslint-disable-line node/no-missing-require
name: "../0-create-dll/dll.js",
context: path.resolve(__dirname, "../0-create-dll"),
sourceType: "commonjs2"
Expand Down
5 changes: 3 additions & 2 deletions test/configCases/parsing/extended-api/webpack.config.js
@@ -1,8 +1,9 @@
var webpack = require("../../../../");
"use strict";
const webpack = require("../../../../");

module.exports = {
entry: {
other: './index'
other: "./index"
},
plugins: [
new webpack.ExtendedAPIPlugin()
Expand Down
2 changes: 1 addition & 1 deletion test/statsCases/filter-warnings/webpack.config.js
@@ -1,5 +1,5 @@
"use strict";
const webpack = require("webpack");
const webpack = require("../../../");

const baseConfig = {
entry: "./index",
Expand Down
2 changes: 1 addition & 1 deletion test/statsCases/resolve-plugin-context/webpack.config.js
@@ -1,4 +1,4 @@
const ResolvePackageFromRootPlugin = require("./ResolvePackageFromRootPlugin");
var ResolvePackageFromRootPlugin = require("./ResolvePackageFromRootPlugin");

module.exports = {
entry: "./index",
Expand Down
3 changes: 2 additions & 1 deletion test/statsCases/warnings-uglifyjs/webpack.config.js
@@ -1,4 +1,5 @@
var webpack = require("webpack");
"use strict";
const webpack = require("../../../");

module.exports = {
entry: "./index",
Expand Down

0 comments on commit 8aa8a7b

Please sign in to comment.