Skip to content

Refactor npm dependencies and make HMR work #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
teekaay wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Refactor npm dependencies and make HMR work #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3395c8
Rearrange (dev)dependencies and move babelrc to package.json
thomasklinger1234 Oct 6, 2017
a910d31
Remove bundle analyzer plugin
thomasklinger1234 Oct 6, 2017
ff8c3f1
Make HMR work again
thomasklinger1234 Oct 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .babelrc
View file
Open in desktop

This file was deleted.

76 changes: 47 additions & 29 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,54 +19,36 @@
"build": "cross-env NODE_ENV=production webpack --config webpack/webpack.config",
"prepush": "yarn lint"
},
"jest": {
"transform": {
"^.+\\.js$": "babel-jest",
"^.+\\.hbs$": "<rootDir>/webpack/jestHandlebarsLoader.js"
}
},
"devDependencies": {
"babel-core": "^6.21.0",
"babel-eslint": "^7.1.1",
"babel-jest": "^19.0.0",
"concurrently": "^3.1.0",
"eslint": "^3.18.0",
"eslint-config-airbnb": "^14.0.0",
"eslint-config-airbnb-base": "^11.1.2",
"eslint-import-resolver-webpack": "^0.8.1",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-no-unused-vars-rest": "^1.0.4",
"jest-cli": "^18.1.0",
"nodemon": "^1.11.0",
"webpack-dev-server": "^2.3.0"
},
"dependencies": {
"babel-core": "^6.21.0",
"babel-loader": "^6.2.10",
"babel-plugin-lodash": "^3.2.11",
"babel-polyfill": "^6.20.0",
"babel-preset-env": "^1.2.2",
"babel-preset-stage-1": "^6.16.0",
"backbone": "^1.3.3",
"backbone.marionette": "^3.2.0",
"clean-webpack-plugin": "^0.1.16",
"concurrently": "^3.1.0",
"copy-webpack-plugin": "^4.0.1",
"cross-env": "^3.1.4",
"css-loader": "^0.26.1",
"dotenv": "^4.0.0",
"eslint": "^3.18.0",
"eslint-config-airbnb": "^14.0.0",
"eslint-config-airbnb-base": "^11.1.2",
"eslint-import-resolver-webpack": "^0.8.1",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-no-unused-vars-rest": "^1.0.4",
"extract-text-webpack-plugin": "^2.0.0-beta",
"file-loader": "^0.10.0",
"flexboxgrid": "^6.3.1",
"handlebars": "^4.0.6",
"handlebars-loader": "^1.4.0",
"history": "3.0.0",
"html-webpack-harddisk-plugin": "^0.1.0",
"html-webpack-plugin": "^2.28.0",
"husky": "^0.13.1",
"isomorphic-fetch": "^2.2.1",
"jquery": "^3.2.1",
"jest-cli": "^18.1.0",
"json-loader": "^0.5.4",
"lodash": "^4.17.4",
"normalize.css": "^5.0.0",
"nodemon": "^1.11.0",
"postcss-cssnext": "^2.9.0",
"postcss-import": "^9.1.0",
"postcss-loader": "^1.2.2",
Expand All @@ -76,7 +58,43 @@
"style-loader": "^0.13.1",
"url-loader": "^0.5.7",
"webpack": "^2.2.1",
"webpack-bundle-analyzer": "^2.3.1",
"webpack-dev-server": "^2.3.0",
"webpack-dotenv-plugin": "^2.0.0"
},
"dependencies": {
"backbone": "^1.3.3",
"backbone.marionette": "^3.2.0",
"flexboxgrid": "^6.3.1",
"handlebars": "^4.0.6",
"history": "3.0.0",
"isomorphic-fetch": "^2.2.1",
"jquery": "^3.2.1",
"lodash": "^4.17.4",
"normalize.css": "^5.0.0"
},
"babel": {
"presets": [
[
"env",
{
"targets": {
"browsers": [
"last 2 versions",
"safari >= 7"
]
}
}
],
"stage-1"
],
"plugins": [
"lodash"
]
},
"jest": {
"transform": {
"^.+\\.js$": "babel-jest",
"^.+\\.hbs$": "<rootDir>/webpack/jestHandlebarsLoader.js"
}
}
}
1 change: 0 additions & 1 deletion webpack/webpack-dev-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const port = (+process.env.APP_PORT) || 3001

new WebpackDevServer(webpack(config), {
publicPath: config.output.publicPath,
hot: true,
host: ip,
stats: false,
historyApiFallback: true,
Expand Down
2 changes: 0 additions & 2 deletions webpack/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin')
const HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin')
const CleanWebpackPlugin = require('clean-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin')
// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin

const ip = process.env.APP_IP || '0.0.0.0'
const port = (+process.env.APP_PORT) || 3001
Expand Down Expand Up @@ -65,7 +64,6 @@ const config = {
new CopyWebpackPlugin([
{ from: path.resolve(__dirname, '../src/static'), to: 'static' }
])
// new BundleAnalyzerPlugin()
],
module: {
rules: [
Expand Down
39 changes: 5 additions & 34 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ acorn@^3.0.4:
version "3.3.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"

acorn@^4.0.11, acorn@^4.0.3, acorn@^4.0.4:
acorn@^4.0.3, acorn@^4.0.4:
version "4.0.11"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"

Expand Down Expand Up @@ -1420,7 +1420,7 @@ commander@2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"

commander@2.9.x, commander@^2.9.0:
commander@2.9.x:
version "2.9.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
dependencies:
Expand Down Expand Up @@ -1976,7 +1976,7 @@ duplexer3@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"

duplexer@^0.1.1, duplexer@~0.1.1:
duplexer@~0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"

Expand All @@ -1999,10 +1999,6 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

ejs@^2.5.5:
version "2.5.6"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"

electron-to-chromium@^1.2.7:
version "1.3.2"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.2.tgz#b8ce5c93b308db0e92f6d0435c46ddec8f6363ab"
Expand Down Expand Up @@ -2392,7 +2388,7 @@ expand-range@^1.8.1:
dependencies:
fill-range "^2.1.0"

express@^4.13.3, express@^4.14.1:
express@^4.13.3:
version "4.15.2"
resolved "https://registry.yarnpkg.com/express/-/express-4.15.2.tgz#af107fc148504457f2dca9a6f2571d7129b97b35"
dependencies:
Expand Down Expand Up @@ -2505,7 +2501,7 @@ fileset@^2.0.2:
glob "^7.0.3"
minimatch "^3.0.3"

filesize@3.5.6, filesize@^3.5.4:
filesize@3.5.6:
version "3.5.6"
resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"

Expand Down Expand Up @@ -2798,12 +2794,6 @@ growly@^1.2.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"

gzip-size@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
dependencies:
duplexer "^0.1.1"

handle-thing@^1.2.4:
version "1.2.5"
resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
Expand Down Expand Up @@ -4453,10 +4443,6 @@ onetime@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"

opener@^1.4.2:
version "1.4.3"
resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"

opn@4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
Expand Down Expand Up @@ -6500,21 +6486,6 @@ webidl-conversions@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"

webpack-bundle-analyzer@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.3.1.tgz#d97f8aadbcce68fc865c5787741d8549359a25cd"
dependencies:
acorn "^4.0.11"
chalk "^1.1.3"
commander "^2.9.0"
ejs "^2.5.5"
express "^4.14.1"
filesize "^3.5.4"
gzip-size "^3.0.0"
lodash "^4.17.4"
mkdirp "^0.5.1"
opener "^1.4.2"

webpack-dev-middleware@^1.9.0:
version "1.10.1"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893"
Expand Down