Skip to content

Commit

Permalink
webpack: remove json-loader
Browse files Browse the repository at this point in the history
  • Loading branch information
@fundon
fundon committed Dec 16, 2016
1 parent 7098eab commit 3cc1c1e
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 39 deletions.
4 changes: 0 additions & 4 deletions build/webpack.base.conf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ module.exports = {
test: /\.vue$/,
loader: 'vue-loader'
},
{
test: /\.json$/,
loader: 'json-loader'
},
{
test: /\.js$/,
loader: 'babel-loader',
Expand Down
9 changes: 4 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"bulma": "0.2.3",
"font-awesome": "4.7.0",
"mdi": "1.7.22",
"plotly.js": "1.21.1",
"plotly.js": "1.21.2",
"vue": "2.1.6",
"vue-bulma-breadcrumb": "github:vue-bulma/breadcrumb",
"vue-bulma-card": "github:vue-bulma/card",
Expand Down Expand Up @@ -68,14 +68,14 @@
"vue-resource": "1.0.3",
"vue-router": "2.1.1",
"vuex": "2.0.0",
"vuex-router-sync": "3.0.0",
"vuex-router-sync": "4.0.1",
"wysiwyg.css": "0.0.2"
},
"devDependencies": {
"autoprefixer": "^6.5.4",
"babel-core": "^6.20.0",
"babel-eslint": "^7.1.1",
"babel-loader": "^6.2.9",
"babel-loader": "6.2.10",
"babel-plugin-transform-export-extensions": "^6.8.0",
"babel-preset-es2015": "^6.14.0",
"babel-preset-stage-2": "^6.17.0",
Expand All @@ -97,7 +97,6 @@
"html-webpack-plugin": "^2.24.1",
"http-proxy-middleware": "^0.17.3",
"imports-loader": "^0.7.0",
"json-loader": "^0.5.4",
"node-sass": "^4.0.0",
"opn": "^4.0.2",
"ora": "^0.3.0",
Expand All @@ -113,7 +112,7 @@
"vue-loader": "^10.0.2",
"vue-template-compiler": "2.1.6",
"webpack": "^2.1.0-beta.28",
"webpack-dev-middleware": "^1.8.4",
"webpack-dev-middleware": "^1.9.0",
"webpack-hot-middleware": "^2.13.2",
"webpack-merge": "^1.1.1"
}
Expand Down
66 changes: 36 additions & 30 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@ accepts@~1.3.3:
negotiator "0.6.1"

acorn-dynamic-import@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.0.tgz#276bae36be195f0d890e93f1327817c077145709"
version "2.0.1"
resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz#23f671eb6e650dab277fef477c321b1178a8cca2"
dependencies:
acorn "^4.0.3"
in-publish "^2.0.0"

acorn-jsx@^3.0.0:
version "3.0.1"
Expand Down Expand Up @@ -480,9 +479,9 @@ babel-helpers@^6.16.0:
babel-runtime "^6.0.0"
babel-template "^6.16.0"

babel-loader@^6.2.9:
version "6.2.9"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.9.tgz#2bce6a1c29b47afa90b937ba1fb1f87084d61c61"
babel-loader@6.2.10:
version "6.2.10"
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.10.tgz#adefc2b242320cd5d15e65b31cea0e8b1b02d4b0"
dependencies:
find-cache-dir "^0.1.1"
loader-utils "^0.2.11"
Expand Down Expand Up @@ -1820,8 +1819,8 @@ de-indent@^1.0.2:
resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"

debug@*, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
version "2.4.2"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.4.2.tgz#a255d4489f58a2d7b6aaaddb9b7c60828f6ba27a"
version "2.4.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.4.4.tgz#c04d17a654e9202464803f096153f70a6f31f4be"
dependencies:
ms "0.7.2"

Expand Down Expand Up @@ -4312,6 +4311,13 @@ memory-fs@^0.3.0, memory-fs@~0.3.0:
errno "^0.1.3"
readable-stream "^2.0.1"

memory-fs@~0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
dependencies:
errno "^0.1.3"
readable-stream "^2.0.1"

meow@^3.1.0, meow@^3.7.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
Expand Down Expand Up @@ -5076,9 +5082,9 @@ planar-graph-to-polyline@^1.0.0:
two-product "^1.0.0"
uniq "^1.0.0"

plotly.js@1.21.1:
version "1.21.1"
resolved "https://registry.yarnpkg.com/plotly.js/-/plotly.js-1.21.1.tgz#7b2fac8ad30f8a15a7ca101f5f343ae1b782c240"
plotly.js@1.21.2:
version "1.21.2"
resolved "https://registry.yarnpkg.com/plotly.js/-/plotly.js-1.21.2.tgz#ed5c84009b43a48323b8a16267958b904e67b8b3"
dependencies:
"3d-view" "^2.0.0"
alpha-shape "^1.0.0"
Expand Down Expand Up @@ -5664,18 +5670,7 @@ readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0
isarray "0.0.1"
string_decoder "~0.10.x"

"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@~2.0.0, readable-stream@~2.0.5:
version "2.0.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.1"
isarray "~1.0.0"
process-nextick-args "~1.0.6"
string_decoder "~0.10.x"
util-deprecate "~1.0.1"

readable-stream@^2.1.0, readable-stream@^2.1.5:
"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.5:
version "2.2.2"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
dependencies:
Expand All @@ -5696,6 +5691,17 @@ readable-stream@~1.1.9:
isarray "0.0.1"
string_decoder "~0.10.x"

readable-stream@~2.0.0, readable-stream@~2.0.5:
version "2.0.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.1"
isarray "~1.0.0"
process-nextick-args "~1.0.6"
string_decoder "~0.10.x"
util-deprecate "~1.0.1"

readable-stream@~2.1.4:
version "2.1.5"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
Expand Down Expand Up @@ -7147,9 +7153,9 @@ vue@2.1.6:
version "2.1.6"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.1.6.tgz#2fc0024c07479ac6bc7d34a2cd5ef9ca5e90b143"

vuex-router-sync@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/vuex-router-sync/-/vuex-router-sync-3.0.0.tgz#3b632baa86cc55192ab408b8d52e6490380df3d7"
vuex-router-sync@4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/vuex-router-sync/-/vuex-router-sync-4.0.1.tgz#4e71282b9869a6dd80a686f1629d6e8271cf6099"

vuex@2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -7177,11 +7183,11 @@ webgl-context@^2.2.0:
dependencies:
get-canvas-context "^1.0.1"

webpack-dev-middleware@^1.8.4:
version "1.8.4"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.8.4.tgz#e8765c9122887ce9e3abd4cc9c3eb31b61e0948d"
webpack-dev-middleware@^1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.9.0.tgz#a1c67a3dfd8a5c5d62740aa0babe61758b4c84aa"
dependencies:
memory-fs "~0.3.0"
memory-fs "~0.4.1"
mime "^1.3.4"
path-is-absolute "^1.0.0"
range-parser "^1.0.3"
Expand Down

0 comments on commit 3cc1c1e

Please sign in to comment.