Skip to content

Commit

Permalink
[webpack] switch to rjs-repack-loader for shorter id and smaller dep …
Browse files Browse the repository at this point in the history
…tree
  • Loading branch information
spalger committed Aug 14, 2015
1 parent b0711eb commit 4f8cad5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"angular-nvd3": "panda01/angular-nvd3#kibana",
"angular-route": "1.2.28",
"ansicolors": "^0.3.2",
"auto-preload-rjscommon-deps-loader": "^1.0.4",
"autoprefixer": "^5.2.0",
"autoprefixer-loader": "^2.0.0",
"babel": "^5.8.21",
Expand Down Expand Up @@ -109,6 +108,7 @@
"raw-loader": "^0.5.1",
"requirefrom": "^0.2.0",
"rimraf": "^2.4.1",
"rjs-repack-loader": "^1.0.6",
"script-loader": "^0.6.1",
"semver": "^4.3.6",
"style-loader": "^0.12.3",
Expand Down
2 changes: 1 addition & 1 deletion src/optimize/BaseOptimizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class BaseOptimizer {
{ 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[\/\\](plugins|ui)[\/\\].+\.js$/, loader: `auto-preload-rjscommon-deps${mapQ}` },
{ test: /[\/\\]src[\/\\](plugins|ui)[\/\\].+\.js$/, loader: `rjs-repack${mapQ}` },
{
test: /\.js$/,
exclude: /[\/\\](node_modules|bower_components)[\/\\]/,
Expand Down
3 changes: 2 additions & 1 deletion tasks/build/downloadNodes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module.exports = function (grunt) {
let { map, fromNode, promisify } = require('bluebird');
let { resolve } = require('path');
let { pluck } = require('lodash');
let { createWriteStream } = require('fs');
let { createGunzip } = require('zlib');
let { Extract } = require('tar');
Expand Down Expand Up @@ -79,7 +80,7 @@ module.exports = function (grunt) {
grunt.registerTask('build:downloadNodes:start', start);
grunt.registerTask('build:downloadNodes:finish', function () {
start().then(() => {
grunt.log.ok(`node binaries for ${platforms.join(', ')} downloaded`);
grunt.log.ok(`node binaries for ${pluck(platforms, 'name').join(', ')} downloaded`);
})
.nodeify(this.async());
});
Expand Down
2 changes: 1 addition & 1 deletion tasks/config/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = function (grunt) {
optimizeBuild: {
options: {
wait: false,
ready: /Server running/,
ready: /Optimization .+ complete/,
quiet: false
},
cmd: './build/kibana/bin/kibana',
Expand Down

0 comments on commit 4f8cad5

Please sign in to comment.