refactor(*): Remove angular-loader in favor of using .name explicitly

spinnaker · Mar 16, 2018 · 16afcd0 · 16afcd0
1 parent 41b5b3b
commit 16afcd0
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 37 deletions.
diff --git a/pipeline/stages/bake/titusBakeStage.js b/pipeline/stages/bake/titusBakeStage.js
@@ -5,7 +5,7 @@ const angular = require('angular');
 import { PIPELINE_CONFIG_PROVIDER } from '@spinnaker/core';
 
 module.exports = angular.module('spinnaker.titus.pipeline.stage.titusBakeStage', [
-  require('./bakeExecutionDetails.controller.js'),
+  require('./bakeExecutionDetails.controller.js').name,
   PIPELINE_CONFIG_PROVIDER,
 ])
   .config(function (pipelineConfigProvider) {

diff --git a/pipeline/stages/cloneServerGroup/titusCloneServerGroupStage.js b/pipeline/stages/cloneServerGroup/titusCloneServerGroupStage.js
@@ -8,7 +8,7 @@ import { ACCOUNT_SERVICE, NAMING_SERVICE, StageConstants } from '@spinnaker/core
 module.exports = angular.module('spinnaker.titus.pipeline.stage.cloneServerGroupStage', [
   ACCOUNT_SERVICE,
   NAMING_SERVICE,
-  require('./cloneServerGroupExecutionDetails.controller.js'),
+  require('./cloneServerGroupExecutionDetails.controller.js').name,
 ])
   .config(function(pipelineConfigProvider) {
     pipelineConfigProvider.registerStage({

diff --git a/pipeline/stages/runJob/titusRunJobStage.js b/pipeline/stages/runJob/titusRunJobStage.js
@@ -4,7 +4,7 @@ const angular = require('angular');
 import {Subject} from 'rxjs';
 
 module.exports = angular.module('spinnaker.titus.pipeline.stage.runJobStage', [
-  require('./runJobExecutionDetails.controller.js')
+  require('./runJobExecutionDetails.controller.js').name
 ])
   .config(function (pipelineConfigProvider) {
     pipelineConfigProvider.registerStage({

diff --git a/serverGroup/configure/serverGroup.configure.titus.module.js b/serverGroup/configure/serverGroup.configure.titus.module.js
@@ -3,12 +3,12 @@
 const angular = require('angular');
 
 module.exports = angular.module('spinnaker.serverGroup.configure.titus', [
-  require('./wizard/deployInitializer.controller.js'),
-  require('./serverGroupConfiguration.service.js'),
-  require('./wizard/ServerGroupBasicSettings.controller.js'),
-  require('./wizard/ServerGroupResources.controller.js'),
-  require('./wizard/ServerGroupCapacity.controller.js'),
-  require('./wizard/ServerGroupParameters.controller.js'),
-  require('./serverGroupBasicSettingsSelector.directive.js'),
-  require('./serverGroupCapacitySelector.directive.js'),
+  require('./wizard/deployInitializer.controller.js').name,
+  require('./serverGroupConfiguration.service.js').name,
+  require('./wizard/ServerGroupBasicSettings.controller.js').name,
+  require('./wizard/ServerGroupResources.controller.js').name,
+  require('./wizard/ServerGroupCapacity.controller.js').name,
+  require('./wizard/ServerGroupParameters.controller.js').name,
+  require('./serverGroupBasicSettingsSelector.directive.js').name,
+  require('./serverGroupCapacitySelector.directive.js').name,
 ]);
diff --git a/serverGroup/configure/serverGroupAdvancedSettingsSelector.directive.spec.js b/serverGroup/configure/serverGroupAdvancedSettingsSelector.directive.spec.js
@@ -7,7 +7,7 @@ describe('Directive: Titus SG Advanced Settings Selector', function() {
 
   beforeEach(
     window.module(
-      require('./serverGroupAdvancedSettingsSelector.directive.js')
+      require('./serverGroupAdvancedSettingsSelector.directive.js').name
     )
   );
 

diff --git a/serverGroup/configure/serverGroupCapacitySelector.directive.spec.js b/serverGroup/configure/serverGroupCapacitySelector.directive.spec.js
@@ -7,7 +7,7 @@ describe('Directive: Titus Server Group Group Capacity Selector', function() {
 
   beforeEach(
     window.module(
-      require('./serverGroupCapacitySelector.directive.js')
+      require('./serverGroupCapacitySelector.directive.js').name
     )
   );
 

diff --git a/serverGroup/configure/serverGroupCommandBuilder.spec.js b/serverGroup/configure/serverGroupCommandBuilder.spec.js
@@ -5,7 +5,7 @@ import {TitusProviderSettings} from '../../titus.settings';
 describe('titusServerGroupCommandBuilder', function() {
   beforeEach(
     window.module(
-      require('./ServerGroupCommandBuilder.js')
+      require('./ServerGroupCommandBuilder.js').name
     )
   );
 

diff --git a/serverGroup/configure/wizard/deployInitializer.controller.js b/serverGroup/configure/wizard/deployInitializer.controller.js
@@ -7,7 +7,7 @@ import { SERVER_GROUP_READER } from '@spinnaker/core';
 
 module.exports = angular.module('spinnaker.serverGroup.configure.titus.deployInitialization.controller', [
   SERVER_GROUP_READER,
-  require('../ServerGroupCommandBuilder.js'),
+  require('../ServerGroupCommandBuilder.js').name,
 ])
   .controller('titusDeployInitializerCtrl', function($scope, titusServerGroupCommandBuilder, serverGroupReader) {
     var controller = this;

diff --git a/serverGroup/details/resize/resizeServerGroup.controller.spec.js b/serverGroup/details/resize/resizeServerGroup.controller.spec.js
@@ -9,7 +9,7 @@ describe('Controller: titusResizeServerGroupCtrl', function () {
 
   beforeEach(
     window.module(
-      require('./resizeServerGroup.controller')
+      require('./resizeServerGroup.controller').name
     )
   );
 

diff --git a/serverGroup/details/serverGroupDetails.titus.controller.js b/serverGroup/details/serverGroupDetails.titus.controller.js
@@ -15,12 +15,12 @@ import {
 module.exports = angular.module('spinnaker.serverGroup.details.titus.controller', [
   require('@uirouter/angularjs').default,
   ACCOUNT_SERVICE,
-  require('../configure/ServerGroupCommandBuilder.js'),
+  require('../configure/ServerGroupCommandBuilder.js').name,
   SERVER_GROUP_WARNING_MESSAGE_SERVICE,
   SERVER_GROUP_READER,
   CONFIRMATION_MODAL_SERVICE,
   SERVER_GROUP_WRITER,
-  require('./resize/resizeServerGroup.controller'),
+  require('./resize/resizeServerGroup.controller').name,
   CLUSTER_TARGET_BUILDER
 ])
   .controller('titusServerGroupDetailsCtrl', function ($scope, $state, $templateCache, $interpolate, app, serverGroup,

diff --git a/serverGroup/details/serverGroupDetails.titus.controller.spec.js b/serverGroup/details/serverGroupDetails.titus.controller.spec.js
@@ -8,7 +8,7 @@ describe('Controller: titusServerGroupDetailsCtrl', function () {
 
   beforeEach(
     window.module(
-      require('./serverGroupDetails.titus.controller')
+      require('./serverGroupDetails.titus.controller').name
     )
   );
 

diff --git a/titus.module.js b/titus.module.js
@@ -18,26 +18,26 @@ templates.keys().forEach(function(key) {
 
 module.exports = angular.module('spinnaker.titus', [
   CLOUD_PROVIDER_REGISTRY,
-  require('./securityGroup/securityGroup.read.service'),
-  require('./serverGroup/details/serverGroupDetails.titus.controller.js'),
-  require('./serverGroup/configure/ServerGroupCommandBuilder.js'),
-  require('./serverGroup/configure/wizard/CloneServerGroup.titus.controller.js'),
-  require('./serverGroup/configure/serverGroup.configure.titus.module.js'),
-  require('./serverGroup/serverGroup.transformer.js'),
-  require('./instance/details/instance.details.controller.js'),
+  require('./securityGroup/securityGroup.read.service').name,
+  require('./serverGroup/details/serverGroupDetails.titus.controller.js').name,
+  require('./serverGroup/configure/ServerGroupCommandBuilder.js').name,
+  require('./serverGroup/configure/wizard/CloneServerGroup.titus.controller.js').name,
+  require('./serverGroup/configure/serverGroup.configure.titus.module.js').name,
+  require('./serverGroup/serverGroup.transformer.js').name,
+  require('./instance/details/instance.details.controller.js').name,
   TITUS_APPLICATION_NAME_VALIDATOR,
   TITUS_HELP,
-  require('./pipeline/stages/findAmi/titusFindAmiStage.js'),
-  require('./pipeline/stages/runJob/titusRunJobStage.js'),
-  require('./pipeline/stages/enableAsg/titusEnableAsgStage.js'),
-  require('./pipeline/stages/disableAsg/titusDisableAsgStage.js'),
-  require('./pipeline/stages/destroyAsg/titusDestroyAsgStage.js'),
-  require('./pipeline/stages/resizeAsg/titusResizeAsgStage.js'),
-  require('./pipeline/stages/cloneServerGroup/titusCloneServerGroupStage.js'),
-  require('./pipeline/stages/bake/titusBakeStage.js'),
-  require('./pipeline/stages/disableCluster/titusDisableClusterStage.js'),
-  require('./pipeline/stages/shrinkCluster/titusShrinkClusterStage.js'),
-  require('./pipeline/stages/scaleDownCluster/titusScaleDownClusterStage.js'),
+  require('./pipeline/stages/findAmi/titusFindAmiStage.js').name,
+  require('./pipeline/stages/runJob/titusRunJobStage.js').name,
+  require('./pipeline/stages/enableAsg/titusEnableAsgStage.js').name,
+  require('./pipeline/stages/disableAsg/titusDisableAsgStage.js').name,
+  require('./pipeline/stages/destroyAsg/titusDestroyAsgStage.js').name,
+  require('./pipeline/stages/resizeAsg/titusResizeAsgStage.js').name,
+  require('./pipeline/stages/cloneServerGroup/titusCloneServerGroupStage.js').name,
+  require('./pipeline/stages/bake/titusBakeStage.js').name,
+  require('./pipeline/stages/disableCluster/titusDisableClusterStage.js').name,
+  require('./pipeline/stages/shrinkCluster/titusShrinkClusterStage.js').name,
+  require('./pipeline/stages/scaleDownCluster/titusScaleDownClusterStage.js').name,
   TITUS_MIGRATION_CONFIG_COMPONENT,
 ])
   .config(function(cloudProviderRegistryProvider) {