github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-25 10:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

[webpack] fix loader query string usage (#9497)

Browse source 
* [webpack] pin to fork with fixed loader aliases

* [optimizer] upgrade to postcss+autoprefixer

* [timelion] convert uiExports.modules -> webpackShims

* [uiExports] remove implementation-leaking and unused uiExport types

* [optimizer] remove unused imports

* [uiBundlerEnv] add a method for exporting global import aliases for special cases
This commit is contained in:
Spencer 2016-12-15 16:11:42 -07:00 • committed by GitHub
parent 2f93b18f11
commit cb3219c798
210 changed files with 134 additions and 58062 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/optimize/base_optimizer.js
View file

@ -1,3 +1,6 @@
import { resolve } from 'path';
import { writeFile } from 'fs';
import webpack from 'webpack';
import Boom from 'boom';
import DirectoryNameAsMain from 'webpack-directory-name-as-main';
@ -5,15 +8,14 @@ import ExtractTextPlugin from 'extract-text-webpack-plugin';
import CommonsChunkPlugin from 'webpack/lib/optimize/CommonsChunkPlugin';
import DefinePlugin from 'webpack/lib/DefinePlugin';
import UglifyJsPlugin from 'webpack/lib/optimize/UglifyJsPlugin';
import { defaults, transform } from 'lodash';
import fromRoot from '../utils/from_root';
import babelOptions from './babel_options';
import { inherits } from 'util';
import { defaults, transform } from 'lodash';
import { resolve } from 'path';
import { writeFile } from 'fs';
const babelExclude = [/[\/\\](webpackShims|node_modules|bower_components)[\/\\]/];
import pkg from '../../package.json';
import { setLoaderQueryParam, makeLoaderString } from './loaders';
const babelExclude = [/[\/\\](webpackShims|node_modules|bower_components)[\/\\]/];
class BaseOptimizer {
constructor(opts) {
@ -64,8 +66,38 @@ class BaseOptimizer {
}
getConfig() {
const mapQ = this.sourceMaps ? '?sourceMap' : '';
const mapQPre = mapQ ? mapQ + '&' : '?';
const loaderWithSourceMaps = (loader) =>
setLoaderQueryParam(loader, 'sourceMap', !!this.sourceMaps);
const makeStyleLoader = preprocessor => {
let loaders = [
loaderWithSourceMaps('css')
];
if (preprocessor) {
loaders = [
...loaders,
{
name: 'postcss',
query: {
config: require.resolve('./postcss.config')
}
},
loaderWithSourceMaps(preprocessor)
];
}
return ExtractTextPlugin.extract(makeLoaderString(loaders));
};
const makeBabelLoader = query => {
return makeLoaderString([
{
name: 'babel',
query: defaults({}, query || {}, babelOptions.webpack)
}
]);
};
return {
context: fromRoot('.'),
@ -101,42 +133,26 @@ class BaseOptimizer {
module: {
loaders: [
{
test: /\.less$/,
loader: ExtractTextPlugin.extract(
'style',
`css${mapQ}!autoprefixer${mapQPre}{ "browsers": ["last 2 versions","> 5%"] }!less${mapQPre}dumpLineNumbers=comments`
)
},
{
test: /\.scss$/,
loader: ExtractTextPlugin.extract(
'style',
`css${mapQ}!autoprefixer${mapQPre}{ "browsers": ["last 2 versions","> 5%"] }!sass${mapQPre}`
)
},
{ test: /\.css$/, loader: ExtractTextPlugin.extract('style', `css${mapQ}`) },
{ test: /\.less$/, loader: makeStyleLoader('less') },
{ test: /\.scss$/, loader: makeStyleLoader('sass') },
{ test: /\.css$/, loader: makeStyleLoader() },
{ test: /\.jade$/, loader: 'jade' },
{ test: /\.json$/, loader: 'json' },
{ test: /\.(html|tmpl)$/, loader: 'raw' },
{ test: /\.png$/, loader: 'url?limit=10000&name=[path][name].[ext]' },
{ test: /\.(woff|woff2|ttf|eot|svg|ico)(\?|$)/, loader: 'file?name=[path][name].[ext]' },
{ test: /[\/\\]src[\/\\](core_plugins|ui)[\/\\].+\.js$/, loader: `rjs-repack${mapQ}` },
{ test: /\.png$/, loader: 'url' },
{ test: /\.(woff|woff2|ttf|eot|svg|ico)(\?|$)/, loader: 'file' },
{ test: /[\/\\]src[\/\\](core_plugins|ui)[\/\\].+\.js$/, loader: loaderWithSourceMaps('rjs-repack') },
{
test: /\.js$/,
exclude: babelExclude.concat(this.env.noParse),
loader: 'babel',
query: babelOptions.webpack
loader: makeBabelLoader(),
},
{
test: /\.jsx$/,
exclude: babelExclude.concat(this.env.noParse),
loader: 'babel',
query: defaults({
nonStandard: true,
}, babelOptions.webpack)
loader: makeBabelLoader({ nonStandard: true }),
}
].concat(this.env.loaders),
],
postLoaders: this.env.postLoaders || [],
noParse: this.env.noParse,
},