Drop 'miqApp' webpack compile-time alias

Signed-off-by: Vojtech Szocs <vojtech.szocs@gmail.com>
ManageIQ · Nov 15, 2017 · 999b07d · 999b07d
1 parent cbef26d
commit 999b07d
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 11 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -22,7 +22,6 @@
     "sendDataWithRx": false,
     "vanillaJsAPI": false, // local: miq_api.js
     "ManageIQ": false, // local: mig_global.js
-    "miqApp": false, // alias: ManageIQ.angular.app
     "Promise": false, // bower: es6-shim
     "_": false, // bower: lodash
     "__": false, // local: i18n.js

diff --git a/app/javascript/miq-redux/test-helper.ts b/app/javascript/miq-redux/test-helper.ts
@@ -2,7 +2,7 @@ import { IModule } from 'angular';
 
 import { rootReducer, addReducer, clearReducers, applyReducerHash } from './reducer';
 
-const app: IModule = miqApp;
+const app: IModule = ManageIQ.angular.app;
 
 // allow unit-testing specific module exports
 if (jasmine) {

diff --git a/app/javascript/packs/custom-typings.ts b/app/javascript/packs/custom-typings.ts
@@ -3,11 +3,6 @@
  */
 declare const ManageIQ: any;
 
-/**
- * Compile-time global, alias for `ManageIQ.angular.app`.
- */
-declare const miqApp: any;
-
 /**
  * Runtime global, available when running tests with Jasmine.
  */

diff --git a/app/javascript/packs/miq-redux-common.ts b/app/javascript/packs/miq-redux-common.ts
@@ -5,7 +5,7 @@ import { addReducer, applyReducerHash } from '../miq-redux/reducer';
 import { ReduxStore, ReduxApi } from '../miq-redux/redux-typings';
 import '../miq-redux/test-helper';
 
-const app: IModule = miqApp;
+const app: IModule = ManageIQ.angular.app;
 
 const initialState = {};
 

diff --git a/config/webpack/shared.js b/config/webpack/shared.js
@@ -44,9 +44,6 @@ module.exports = {
 
   plugins: [
     new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))),
-    new webpack.DefinePlugin({
-      miqApp: 'ManageIQ.angular.app'
-    }),
     new ExtractTextPlugin(env.NODE_ENV === 'production' ? '[name]-[hash].css' : '[name].css'),
 
     // Workaround for angular/angular#11580