framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert to latest stable version of file-loader

Browse Source
This commit is contained in:
2017-07-01 07:09:40 -07:00
parent 39ac9e7ecc
commit d79504bf48
4 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@@ -2127,9 +2127,9 @@
}
},
"enhanced-resolve": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz",
"integrity": "sha1-n0tib1dyRe3PSyrYPYbhf09CHew=",
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.2.0.tgz",
"integrity": "sha512-Vlr4UydY821fadrNdW00y4FwebPe6TnD9dK0HhwhsqXEVpVCZnlZiGMcysrLT0+zENzA5Q/k9NCTXW0qbNRsxg==",
"dev": true
},
"entities": {
@@ -2710,9 +2710,9 @@
"dev": true
},
"file-loader": {
"version": "1.0.0-beta.1",
"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.0.0-beta.1.tgz",
"integrity": "sha512-e9IPZXhA1PB4PbYisPouZQ0J7TwDbpRjd3gBDsEmXeZMNWRZkkU7nFFcADnc2aCztCp9vYTErRXSSJt/old30Q==",
"version": "0.11.2",
"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz",
"integrity": "sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg==",
"dev": true,
"dependencies": {
"loader-utils": {

2
package.json
View File

@@ -100,7 +100,7 @@
"eslint-loader": "~1.8",
"eslint-plugin-import": "~2.6",
"extract-text-webpack-plugin": "~3.0.0-beta.3",
"file-loader": "~1.0.0-beta.1",
"file-loader": "^0.11.2",
"imagemin-mozjpeg": "~6.0",
"imagemin-webpack-plugin": "~1.5.0-beta.0",
"import-glob": "~1.5",

17
resources/assets/build/webpack.config.js
View File

@@ -46,7 +46,6 @@ let webpackConfig = {
include: config.paths.assets,
use: ExtractTextPlugin.extract({
fallback: 'style',
publicPath: '../',
use: [
{ loader: 'css', options: { sourceMap: config.enabled.sourceMaps } },
{
@@ -63,7 +62,6 @@ let webpackConfig = {
include: config.paths.assets,
use: ExtractTextPlugin.extract({
fallback: 'style',
publicPath: '../',
use: [
{ loader: 'css', options: { sourceMap: config.enabled.sourceMaps } },
{
@@ -78,7 +76,7 @@ let webpackConfig = {
}),
},
{
test: /\.(ttf|eot|png|jpe?g|gif|svg|ico)$/,
test: /\.(ttf|eot|woff2?|png|jpe?g|gif|svg|ico)$/,
include: config.paths.assets,
loader: 'file',
options: {
@@ -86,20 +84,11 @@ let webpackConfig = {
},
},
{
test: /\.woff2?$/,
include: config.paths.assets,
loader: 'url',
options: {
limit: 10000,
mimetype: 'application/font-woff',
name: `[path]${assetsFilenames}.[ext]`,
},
},
{
test: /\.(ttf|eot|woff2?|png|jpe?g|gif|svg)$/,
test: /\.(ttf|eot|woff2?|png|jpe?g|gif|svg|ico)$/,
include: /node_modules|bower_components/,
loader: 'file',
options: {
publicPath: '../',
name: `vendor/${config.cacheBusting}.[ext]`,
},
},

20
yarn.lock
View File

@@ -1680,12 +1680,18 @@ encodeurl@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
end-of-stream@1.0.0, end-of-stream@^1.0.0:
end-of-stream@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e"
dependencies:
once "~1.3.0"
end-of-stream@^1.0.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
dependencies:
once "^1.4.0"
engine.io-client@1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.0.tgz#7b730e4127414087596d9be3c88d2bc5fdb6cf5c"
@@ -1726,8 +1732,8 @@ engine.io@1.8.0:
ws "1.1.1"
enhanced-resolve@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
version "3.2.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.2.0.tgz#7b60300c98e155a9caa06bf4550ec010bf74f6f8"
dependencies:
graceful-fs "^4.1.2"
memory-fs "^0.4.0"
@@ -2123,9 +2129,9 @@ file-entry-cache@^2.0.0:
flat-cache "^1.2.1"
object-assign "^4.0.1"
file-loader@~1.0.0-beta.1:
version "1.0.0-beta.1"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.0.0-beta.1.tgz#e80e1a0e8e75e8ffe4cfde36cc053f79ca24f0e8"
file-loader@^0.11.2:
version "0.11.2"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
dependencies:
loader-utils "^1.0.2"
@@ -4089,7 +4095,7 @@ on-finished@~2.3.0:
dependencies:
ee-first "1.1.1"
once@^1.3.0, once@^1.3.3:
once@^1.3.0, once@^1.3.3, once@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
dependencies: