Skip to content

Commit

Permalink
Update webpack and family (#1038)
Browse files Browse the repository at this point in the history
  • Loading branch information
gauravtiwari authored Nov 26, 2017
1 parent 386fd85 commit 8527025
Show file tree
Hide file tree
Showing 7 changed files with 837 additions and 702 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
lib/*
node_modules/*
vendor/*
**/__tests__/**/*
38 changes: 20 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,39 @@
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.0",
"coffee-loader": "^0.8.0",
"compression-webpack-plugin": "^1.0.0",
"css-loader": "^0.28.5",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.2",
"babel-preset-env": "^1.6.1",
"coffee-loader": "^0.9.0",
"compression-webpack-plugin": "^1.0.1",
"css-loader": "^0.28.7",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.5",
"glob": "^7.1.2",
"js-yaml": "^3.9.1",
"node-sass": "^4.5.3",
"js-yaml": "^3.10.0",
"node-sass": "^4.7.2",
"path-complete-extname": "^0.1.0",
"postcss-cssnext": "^3.0.2",
"postcss-loader": "^2.0.6",
"postcss-loader": "^2.0.9",
"postcss-smart-import": "^0.7.5",
"rails-erb-loader": "^5.2.1",
"resolve-url-loader": "^2.2.0",
"sass-loader": "^6.0.6",
"style-loader": "^0.18.2",
"webpack": "^3.5.5",
"webpack-manifest-plugin": "^1.3.1"
"style-loader": "^0.19.0",
"webpack": "^3.8.1",
"webpack-manifest-plugin": "^1.3.2"
},
"devDependencies": {
"eslint": "^3.16.1",
"eslint-config-airbnb": "^14.1.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-react": "^6.10.0",
"eslint": "^4.11.0",
"eslint-config-airbnb": "^16.1.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-react": "^7.5.1",
"jest": "^21.2.1"
},
"jest": {
"testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",
"roots": ["<rootDir>/package"]
"roots": [
"<rootDir>/package"
]
},
"peerDependencies": {
"coffeescript": ">= 1.12.7 || >= 2.x"
Expand Down
3 changes: 1 addition & 2 deletions package/config_types/config_list.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ class ConfigList extends Array {
entry === key ||
entry.key === key ||
(entry.constructor && entry.constructor.name === key)
)
)
))

if (shouldThrow && index < 0) throw new Error(`Item ${key} not found`)
return index
Expand Down
1 change: 1 addition & 0 deletions package/config_types/config_object.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class ConfigObject extends Object {

toObject() {
const object = {}
/* eslint no-return-assign: 0 */
Object.keys(this).forEach(key => (object[key] = this[key]))
return object
}
Expand Down
4 changes: 3 additions & 1 deletion package/environment.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/* eslint global-require: 0 */
/* eslint import/no-dynamic-require: 0 */

const { basename, dirname, join, relative, resolve } = require('path')
const {
basename, dirname, join, relative, resolve
} = require('path')
const { sync } = require('glob')
const extname = require('path-complete-extname')

Expand Down
4 changes: 3 additions & 1 deletion package/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ const createEnvironment = () => {

const environment = createEnvironment()

module.exports = { environment, config, assetHost, loaders, Environment }
module.exports = {
environment, config, assetHost, loaders, Environment
}
Loading

0 comments on commit 8527025

Please sign in to comment.