nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update extract-text-webpack-plugin to version 3.0.2 (#5584)

This commit is contained in:
Yamagishi Kazutoshi 2017-11-05 21:07:59 +09:00 committed by Eugen Rochko
parent 8abe9e9058
commit 8a588145d5
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
config/webpack/shared.js
View File

@ -12,27 +12,24 @@ const localePackPaths = require('./generateLocalePacks');
const extensionGlob = `**/*{${settings.extensions.join(',')}}*`; const extensionGlob = `**/*{${settings.extensions.join(',')}}*`;
const entryPath = join(settings.source_path, settings.source_entry_path); const entryPath = join(settings.source_path, settings.source_entry_path);
const packPaths = sync(join(entryPath, extensionGlob)); const packPaths = sync(join(entryPath, extensionGlob));
const entryPacks = [...packPaths, ...localePackPaths].filter(path => path !== join(entryPath, 'custom.js'));
const themePaths = Object.keys(themes).reduce(
(themePaths, name) => {
themePaths[name] = resolve(join(settings.source_path, themes[name]));
return themePaths;
}, {});
module.exports = { module.exports = {
entry: Object.assign( entry: Object.assign(
entryPacks.reduce( packPaths.reduce((map, entry) => {
(map, entry) => { const localMap = map;
const localMap = map; const namespace = relative(join(entryPath), dirname(entry));
let namespace = relative(join(entryPath), dirname(entry)); localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry);
if (namespace === join('..', '..', '..', 'tmp', 'packs')) { return localMap;
namespace = ''; // generated by generateLocalePacks.js }, {}),
} localePackPaths.reduce((map, entry) => {
localMap[join(namespace, basename(entry, extname(entry)))] = resolve(entry); const localMap = map;
return localMap; localMap[basename(entry, extname(entry, extname(entry)))] = resolve(entry);
}, {} return localMap;
), themePaths }, {}),
Object.keys(themes).reduce((themePaths, name) => {
themePaths[name] = resolve(join(settings.source_path, themes[name]));
return themePaths;
}, {})
), ),
output: { output: {

2
package.json
View File

@ -48,7 +48,7 @@
"es6-symbol": "^3.1.1", "es6-symbol": "^3.1.1",
"escape-html": "^1.0.3", "escape-html": "^1.0.3",
"express": "^4.16.2", "express": "^4.16.2",
"extract-text-webpack-plugin": "^2.1.2", "extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^0.11.2", "file-loader": "^0.11.2",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"glob": "^7.1.1", "glob": "^7.1.1",

12
yarn.lock
View File

@ -287,7 +287,7 @@ async@^1.4.0, async@^1.5.2:
version "1.5.2" version "1.5.2"
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
async@^2.1.2, async@^2.1.4, async@^2.1.5: async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.1:
version "2.5.0" version "2.5.0"
resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d" resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
dependencies: dependencies:
@ -2607,12 +2607,12 @@ extglob@^0.3.1:
dependencies: dependencies:
is-extglob "^1.0.0" is-extglob "^1.0.0"
extract-text-webpack-plugin@^2.1.2: extract-text-webpack-plugin@^3.0.2:
version "2.1.2" version "3.0.2"
resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c" resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
dependencies: dependencies:
async "^2.1.2" async "^2.4.1"
loader-utils "^1.0.2" loader-utils "^1.1.0"
schema-utils "^0.3.0" schema-utils "^0.3.0"
webpack-sources "^1.0.1" webpack-sources "^1.0.1"