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

[uiExports] remove implementation-leaking and unused uiExport types

Browse source
This commit is contained in:
spalger 2016-12-15 10:59:04 -07:00
parent 7e90dc6355
commit 10016f362d
2 changed files with 5 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/optimize/base_optimizer.js
View file

@ -154,7 +154,7 @@ class BaseOptimizer {
exclude: babelExclude.concat(this.env.noParse),
loader: makeBabelLoader({ nonStandard: true }),
}
].concat(this.env.loaders),
],
postLoaders: this.env.postLoaders || [],
noParse: this.env.noParse,
},

69
src/ui/ui_bundler_env.js
View file

@ -53,8 +53,10 @@ module.exports = class UiBundlerEnv {
// map of which plugins created which aliases
this.aliasOwners = {};
// webpack loaders map loader configuration to regexps
this.loaders = [];
// loaders that are applied to webpack modules after all other processing
// NOTE: this is intentionally not exposed as a uiExport because it leaks
// too much of the webpack implementation to plugins, but is used by test_bundle
// core plugin to inject the instrumentation loader
this.postLoaders = [];
}
@ -71,25 +73,10 @@ module.exports = class UiBundlerEnv {
exportConsumer(type) {
switch (type) {
case 'loaders':
return (plugin, spec) => {
for (const loader of arr(spec)) this.addLoader(loader);
};
case 'postLoaders':
return (plugin, spec) => {
for (const loader of arr(spec)) this.addPostLoader(loader);
};
case 'noParse':
return (plugin, spec) => {
for (const re of arr(spec)) this.addNoParse(re);
};
case 'modules':
return (plugin, spec) => {
for (const id of keys(spec)) this.addModule(id, spec[id], plugin.id);
};
}
}
@ -97,10 +84,6 @@ module.exports = class UiBundlerEnv {
this.context[key] = val;
}
addLoader(loader) {
this.loaders.push(loader);
}
addPostLoader(loader) {
this.postLoaders.push(loader);
}
@ -109,50 +92,6 @@ module.exports = class UiBundlerEnv {
this.noParse.push(regExp);
}
addModule(id, spec, pluginId) {
this.claim(id, pluginId);
// configurable via spec
let path;
let parse = true;
let imports = null;
let exports = null;
let expose = null;
// basic style, just a path
if (isString(spec)) path = spec;
if (isArray(spec)) {
path = spec[0];
imports = spec[1];
exports = spec[2];
}
if (isPlainObject(spec)) {
path = spec.path;
parse = get(spec, 'parse', parse);
imports = get(spec, 'imports', imports);
exports = get(spec, 'exports', exports);
expose = get(spec, 'expose', expose);
}
if (!path) {
throw new TypeError('Invalid spec definition, unable to identify path');
}
this.aliases[id] = path;
const loader = [];
if (imports) {
loader.push(`imports?${imports}`);
}
if (exports) loader.push(`exports?${exports}`);
if (expose) loader.push(`expose?${expose}`);
if (loader.length) this.loaders.push({ test: asRegExp(path), loader: loader.join('!') });
if (!parse) this.addNoParse(path);
}
claim(id, pluginId) {
const owner = pluginId ? `Plugin ${pluginId}` : 'Kibana Server';