Improve dll plugin relation with webpackshims

.eslintrc.js

@@ -109,7 +109,7 @@ module.exports = {
         // instructs import/no-extraneous-dependencies to treat modules
         // in plugins/ or ui/ namespace as "core modules" so they don't
         // trigger failures for not being listed in package.json
-        'import/core-modules': ['plugins', 'ui', 'uiExports'],
+        'import/core-modules': ['plugins', 'legacy/ui', 'uiExports'],
 
         'import/resolver': {
           '@kbn/eslint-import-resolver-kibana': {

src/cli/cluster/cluster_manager.js

@@ -170,7 +170,6 @@ export default class ClusterManager {
       fromRoot('x-pack/common'),
       fromRoot('x-pack/plugins'),
       fromRoot('x-pack/server'),
-      fromRoot('x-pack/webpackShims'),
       fromRoot('config'),
       ...extraPaths,
     ].map(path => resolve(path));

src/dev/precommit_hook/casing_check_config.js

@@ -185,7 +185,6 @@ export const TEMPORARILY_IGNORED_PATHS = [
   'packages/kbn-ui-framework/doc_site/src/images/elastic-logo.svg',
   'packages/kbn-ui-framework/doc_site/src/images/hint-arrow.svg',
   'packages/kbn-ui-framework/doc_site/src/images/react-logo.svg',
-  'webpackShims/angular-ui-select.js',
   'webpackShims/elasticsearch-browser.js',
   'webpackShims/moment-timezone.js',
   'webpackShims/ui-bootstrap.js',

src/legacy/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js

@@ -21,7 +21,7 @@ import 'ui/directives/css_truncate';
 import 'ui/directives/field_name';
 import 'ui/filters/unique';
 import './discover_field';
-import 'angular-ui-select';
+import 'ui/angular_ui_select';
 import _ from 'lodash';
 import $ from 'jquery';
 import rison from 'rison-node';

src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js

@@ -19,6 +19,7 @@
 
 import _ from 'lodash';
 import angular from 'angular';
+import 'angular-elastic/elastic';
 import rison from 'rison-node';
 import { savedObjectManagementRegistry } from '../../saved_object_registry';
 import objectViewHTML from './_view.html';
@@ -40,7 +41,7 @@ uiRoutes
     k7Breadcrumbs: getViewBreadcrumbs
   });
 
-uiModules.get('apps/management')
+uiModules.get('apps/management', ['monospaced.elastic'])
   .directive('kbnManagementObjectsView', function (kbnIndex, confirmModal, i18n) {
     return {
       restrict: 'E',

src/legacy/ui/public/angular-bootstrap/index.js

@@ -5,6 +5,14 @@
  * TODO: Write custom components that address our needs to directly and deprecate these Bootstrap components.
  */
 
+import 'angular';
+
+import { uiModules } from 'ui/modules';
+
+uiModules.get('kibana', [
+  'ui.bootstrap',
+]);
+
 /*
  * angular-ui-bootstrap
  * http://angular-ui.github.io/bootstrap/

webpackShims/angular-ui-select.js → src/legacy/ui/public/angular_ui_select.js

@@ -17,10 +17,11 @@
  * under the License.
  */
 
-require('jquery');
-require('angular');
-require('angular-sanitize');
-require('ui-select/dist/select');
-require('ui-select/dist/select.css');
+import 'jquery';
+import 'angular';
+import 'angular-sanitize';
+import 'ui-select/dist/select';
 
-require('ui/modules').get('kibana', ['ui.select', 'ngSanitize']);
+import { uiModules } from 'ui/modules';
+
+uiModules.get('kibana', ['ui.select', 'ngSanitize']);

src/legacy/ui/public/autoload/modules.js

@@ -54,3 +54,7 @@ import '../courier/saved_object/ui/saved_object_save_as_checkbox';
 import '../react_components';
 import '../i18n';
 import '../query_bar/directive';
+
+import '@elastic/ui-ace';
+import { uiModules } from 'ui/modules';
+uiModules.get('kibana', ['ui.ace']);

src/legacy/ui/public/styles/bootstrap/buttons.less

@@ -1,5 +1,5 @@
 /**
- * angular-ui-select depends upon these styles. Don't use them in your markup.
+ * ui/angular-ui-select depends upon these styles. Don't use them in your markup.
  * Please use the UI Framework styles instead.
  */
 

src/legacy/ui/public/test_harness/test_harness.js

@@ -18,6 +18,8 @@
  */
 
 // chrome expects to be loaded first, let it get its way
+import $ from 'jquery';
+import bindJqueryToFindTestSubject from 'ui/jquery/find_test_subject';
 import chrome from '../chrome';
 
 import { parse as parseUrl } from 'url';
@@ -30,6 +32,8 @@ import './test_harness.css';
 import 'ng_mock';
 import { setupTestSharding } from './test_sharding';
 
+bindJqueryToFindTestSubject($);
+
 const { query } = parseUrl(window.location.href, true);
 if (query && query.mocha) {
   try {

src/legacy/ui/public/tooltip/tooltip.js

@@ -17,14 +17,18 @@
  * under the License.
  */
 
+import 'ui/angular-bootstrap';
 import html from './tooltip.html';
 import chrome from 'ui/chrome';
+import  { uiModules } from 'ui/modules';
 
-require('ui-bootstrap')
+uiModules.get('kibana')
   .config(function ($tooltipProvider) {
     // we use the uiSettings client because the config service is not available in the config phase
     const uiSettings = chrome.getUiSettingsClient();
 
+    $tooltipProvider.setTriggers({ 'mouseenter': 'mouseleave click' });
+
     $tooltipProvider.options({
       placement: 'bottom',
       animation: !uiSettings.get('accessibility:disableAnimations'),

webpackShims/ui-bootstrap.js → src/optimize/dynamic_dll_plugin/dll_allowed_modules.js

@@ -17,12 +17,17 @@
  * under the License.
  */
 
-require('angular');
-require('ui/angular-bootstrap');
-var uiModules = require('ui/modules').uiModules;
+import path from 'path';
 
-var kibana = uiModules.get('kibana', ['ui.bootstrap']);
+export function notInNodeModules(checkPath) {
+  return !checkPath.includes(`${path.sep}node_modules${path.sep}`);
+}
 
-module.exports = kibana.config(function ($tooltipProvider) {
-  $tooltipProvider.setTriggers({ 'mouseenter': 'mouseleave click' });
-});
+export function notInNodeModulesOrWebpackShims(checkPath) {
+  return notInNodeModules(checkPath)
+    && !checkPath.includes(`${path.sep}webpackShims${path.sep}`);
+}
+
+export function inPluginNodeModules(checkPath) {
+  return checkPath.match(/[\/\\]plugins.*[\/\\]node_modules/);
+}

src/optimize/dynamic_dll_plugin/dll_compiler.js

@@ -18,18 +18,21 @@
  */
 
 import { configModel } from './dll_config_model';
+import { notInNodeModulesOrWebpackShims, notInNodeModules } from './dll_allowed_modules';
 import { fromRoot } from '../../legacy/utils';
 import { PUBLIC_PATH_PLACEHOLDER } from '../public_path_placeholder';
 import fs from 'fs';
 import mkdirp from 'mkdirp';
 import webpack from 'webpack';
 import { promisify } from 'util';
 import path from 'path';
+import rimraf from 'rimraf';
 
 const readFileAsync = promisify(fs.readFile);
 const mkdirpAsync = promisify(mkdirp);
 const existsAsync = promisify(fs.exists);
 const writeFileAsync = promisify(fs.writeFile);
+const rimrafAsync = promisify(rimraf);
 
 export class DllCompiler {
   static getRawDllConfig(uiBundles = {}, babelLoaderCacheDir = '', threadLoaderPoolConfig = {}) {
@@ -163,7 +166,26 @@ export class DllCompiler {
   async run(dllEntries) {
     const dllConfig = this.dllConfigGenerator(this.rawDllConfig);
     await this.upsertEntryFile(dllEntries);
-    await this.runWebpack(dllConfig());
+
+    try {
+      this.logWithMetadata(['info', 'optimize:dynamic_dll_plugin'], 'Client vendors dll compilation started');
+
+      await this.runWebpack(dllConfig());
+
+      this.logWithMetadata(
+        ['info', 'optimize:dynamic_dll_plugin'],
+        `Client vendors dll compilation finished with success`
+      );
+    } catch (e) {
+      this.logWithMetadata(
+        ['fatal', 'optimize:dynamic_dll_plugin'],
+        `Client vendors dll compilation failed`
+      );
+
+      // Still throw the original error has here we just want
+      // log the fail message
+      throw e;
+    }
 
     // Style dll file isn't always created but we are
     // expecting it to exist always as we are referencing
@@ -182,9 +204,7 @@ export class DllCompiler {
 
   async runWebpack(config) {
     return new Promise((resolve, reject) => {
-      this.logWithMetadata(['info', 'optimize:dynamic_dll_plugin'], 'Client vendors dll compilation started');
-
-      webpack(config, (err, stats) => {
+      webpack(config, async (err, stats) => {
         // If a critical error occurs or we have
         // errors in the stats compilation,
         // reject the promise and logs the errors
@@ -197,18 +217,59 @@ export class DllCompiler {
         }));
 
         if (webpackErrors) {
-          this.logWithMetadata(
-            ['fatal', 'optimize:dynamic_dll_plugin'],
-            `Client vendors dll compilation failed`
-          );
+          // Reject with webpack fatal errors
           return reject(webpackErrors);
         }
 
-        // Otherwise let it proceed
-        this.logWithMetadata(
-          ['info', 'optimize:dynamic_dll_plugin'],
-          `Client vendors dll compilation finished with success`
-        );
+        // Identify if we have not allowed modules
+        // bundled inside the dll bundle
+        const notAllowedModules = [];
+
+        stats.compilation.modules.forEach((module) => {
+          // ignore if no module or userRequest are defined
+          if (!module || !module.resource) {
+            return;
+          }
+
+          // ignore if this module represents the
+          // dll entry file
+          if (module.resource === this.getEntryPath()) {
+            return;
+          }
+
+          // A module is not allowed if it's not a node_module, a webpackShim
+          // or the reasons from being bundled into the dll are not node_modules
+          if(notInNodeModulesOrWebpackShims(module.resource)) {
+            const reasons = module.reasons || [];
+
+            reasons.forEach((reason) => {
+              // Skip if we can't read the reason info
+              if (!reason || !reason.module || !reason.module.resource) {
+                return;
+              }
+
+              // Is the reason for this module being bundle a
+              // node_module or no?
+              if (notInNodeModules(reason.module.resource)) {
+                notAllowedModules.push(module.resource);
+              }
+            });
+          }
+        });
+
+        if (notAllowedModules.length) {
+          // Delete the built dll, as it contains invalid modules, and reject listing
+          // all the not allowed modules
+          try {
+            await rimrafAsync(this.rawDllConfig.outputPath);
+          } catch (e) {
+            return reject(e);
+          }
+
+          return reject(`The following modules are not allowed to be bundled into the dll: \n${notAllowedModules.join('\n')}`);
+        }
+
+        // Otherwise it has succeed
         return resolve(stats);
       });
     });