Skip to content

Commit

Permalink
refactor(*): Don't use js or ts file extension in require()
Browse files Browse the repository at this point in the history
  • Loading branch information
christopherthielen committed Jan 24, 2019
1 parent a87b938 commit 35be1f0
Show file tree
Hide file tree
Showing 258 changed files with 632 additions and 654 deletions.
4 changes: 2 additions & 2 deletions app/scripts/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ module('netflix.spinnaker', [
GOOGLE_MODULE,
ECS_MODULE,
CLOUD_FOUNDRY_MODULE,
require('./modules/azure/azure.module.js').name,
require('./modules/azure/azure.module').name,
KUBERNETES_V1_MODULE,
OPENSTACK_MODULE,
DOCKER_MODULE,
ORACLE_MODULE,
require('./modules/dcos/dcos.module.js').name,
require('./modules/dcos/dcos.module').name,
APPENGINE_MODULE,
CANARY_MODULE,
KUBERNETES_V2_MODULE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = angular
require('@uirouter/angularjs').default,
require('angular-ui-bootstrap'),
AMAZON_INSTANCE_WRITE_SERVICE,
require('../../vpc/vpcTag.directive.js').name,
require('../../vpc/vpcTag.directive').name,
CONFIRMATION_MODAL_SERVICE,
])
.controller('awsInstanceDetailsCtrl', function(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { AWSProviderSettings } from 'amazon/aws.settings';
import { PipelineTemplates, BakeExecutionLabel, BakeryReader, Registry, SETTINGS } from '@spinnaker/core';

module.exports = angular
.module('spinnaker.amazon.pipeline.stage.bakeStage', [require('./bakeExecutionDetails.controller.js').name])
.module('spinnaker.amazon.pipeline.stage.bakeStage', [require('./bakeExecutionDetails.controller').name])
.config(function() {
Registry.pipeline.registerStage({
provides: 'bake',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { AccountService, FirewallLabels } from '@spinnaker/core';

module.exports = angular
.module('spinnaker.amazon.securityGroup.clone.controller', [
require('../configure/configSecurityGroup.mixin.controller.js').name,
require('../configure/configSecurityGroup.mixin.controller').name,
])
.controller('awsCloneSecurityGroupController', function(
$scope,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ import { VpcReader } from 'amazon/vpc';

describe('Controller: CreateSecurityGroup', function() {
beforeEach(
window.module(
require('./CreateSecurityGroupCtrl.js').name,
require('./configSecurityGroup.mixin.controller.js').name,
),
window.module(require('./CreateSecurityGroupCtrl').name, require('./configSecurityGroup.mixin.controller').name),
);

afterEach(AWSProviderSettings.resetToOriginal);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = angular
require('@uirouter/angularjs').default,
SECURITY_GROUP_READER,
CONFIRMATION_MODAL_SERVICE,
require('../clone/cloneSecurityGroup.controller.js').name,
require('../clone/cloneSecurityGroup.controller').name,
])
.controller('awsSecurityGroupDetailsCtrl', function(
$scope,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { AccountService, SubnetReader } from '@spinnaker/core';
import { AWSProviderSettings } from 'amazon/aws.settings';

describe('Service: awsServerGroup', function() {
beforeEach(window.module(require('./serverGroupCommandBuilder.service.js').name));
beforeEach(window.module(require('./serverGroupCommandBuilder.service').name));

beforeEach(
window.inject(function(_$httpBackend_, awsServerGroupCommandBuilder, _instanceTypeService_, _$q_, $rootScope) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { AWSProviderSettings } from 'amazon/aws.settings';
describe('awsServerGroupCommandBuilder', function() {
const AccountServiceFixture = require('./AccountServiceFixtures');

beforeEach(window.module(require('./serverGroupCommandBuilder.service.js').name));
beforeEach(window.module(require('./serverGroupCommandBuilder.service').name));

beforeEach(
window.inject(function(awsServerGroupCommandBuilder, $q, $rootScope, instanceTypeService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ export class AwsServerGroupConfigurationService {
export const AWS_SERVER_GROUP_CONFIGURATION_SERVICE = 'spinnaker.amazon.serverGroup.configure.service';
module(AWS_SERVER_GROUP_CONFIGURATION_SERVICE, [
SECURITY_GROUP_READER,
require('amazon/instance/awsInstanceType.service.js').name,
require('amazon/instance/awsInstanceType.service').name,
LOAD_BALANCER_READ_SERVICE,
CACHE_INITIALIZER_SERVICE,
SERVER_GROUP_COMMAND_REGISTRY_PROVIDER,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { TaskExecutor, TaskMonitor } from '@spinnaker/core';

module.exports = angular
.module('spinnaker.amazon.serverGroup.editAsgAdvancedSettings.modal.controller', [
require('../../configure/serverGroupCommandBuilder.service.js').name,
require('../../configure/serverGroupCommandBuilder.service').name,
])
.controller('EditAsgAdvancedSettingsCtrl', function(
$scope,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import './metricAlarmChart.component.less';

module.exports = angular
.module('spinnaker.amazon.serverGroup.details.scalingPolicy.metricAlarmChart.component', [
require('exports-loader?"n3-line-chart"!n3-charts/build/LineChart.js'),
require('exports-loader?"n3-line-chart"!n3-charts/build/LineChart'),
])
.component('metricAlarmChart', {
bindings: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const scalingPolicyPopover: IComponentOptions = {
};

export const SCALING_POLICY_POPOVER = 'spinnaker.amazon.serverGroup.details.scalingPolicy.popover.component';
module(SCALING_POLICY_POPOVER, [require('../chart/metricAlarmChart.component.js').name]).component(
module(SCALING_POLICY_POPOVER, [require('../chart/metricAlarmChart.component').name]).component(
'awsScalingPolicyPopover',
scalingPolicyPopover,
);
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import './upsertScalingPolicy.modal.less';

module.exports = angular
.module('spinnaker.amazon.serverGroup.details.scalingPolicy.upsertScalingPolicy.controller', [
require('exports-loader?"n3-line-chart"!n3-charts/build/LineChart.js'),
require('./simple/simplePolicyAction.component.js').name,
require('exports-loader?"n3-line-chart"!n3-charts/build/LineChart'),
require('./simple/simplePolicyAction.component').name,
STEP_POLICY_ACTION,
require('./alarm/alarmConfigurer.component.js').name,
require('./alarm/alarmConfigurer.component').name,
])
.controller('awsUpsertScalingPolicyCtrl', function($uibModalInstance, serverGroup, application, policy) {
this.serverGroup = serverGroup;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { TaskExecutor } from '@spinnaker/core';
describe('Controller: modifyScalingProcesses', function() {
const angular = require('angular');

beforeEach(window.module(require('./modifyScalingProcesses.controller.js').name));
beforeEach(window.module(require('./modifyScalingProcesses.controller').name));

beforeEach(
window.inject(function($controller, $rootScope, $q) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { SCALING_POLICY_MODULE } from './scalingPolicy/scalingPolicy.module';
export const SERVER_GROUP_DETAILS_MODULE = 'spinnaker.amazon.serverGroup.details';
module(SERVER_GROUP_DETAILS_MODULE, [
SCALING_POLICY_MODULE,
require('./securityGroup/editSecurityGroups.modal.controller.js').name,
require('./scalingProcesses/modifyScalingProcesses.controller.js').name,
require('./scheduledAction/editScheduledActions.modal.controller.js').name,
require('./advancedSettings/editAsgAdvancedSettings.modal.controller.js').name,
require('./rollback/rollbackServerGroup.controller.js').name,
require('./securityGroup/editSecurityGroups.modal.controller').name,
require('./scalingProcesses/modifyScalingProcesses.controller').name,
require('./scheduledAction/editScheduledActions.modal.controller').name,
require('./advancedSettings/editAsgAdvancedSettings.modal.controller').name,
require('./rollback/rollbackServerGroup.controller').name,
]);
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { VpcReader } from '../vpc/VpcReader';
describe('Directives: vpcTag', function() {
var $q;

beforeEach(window.module(require('./vpcTag.directive.js').name));
beforeEach(window.module(require('./vpcTag.directive').name));

beforeEach(
window.inject(function($rootScope, $compile, _$q_) {
Expand Down
40 changes: 20 additions & 20 deletions app/scripts/modules/azure/azure.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@ templates.keys().forEach(function(key) {

module.exports = angular
.module('spinnaker.azure', [
require('./pipeline/stages/destroyAsg/azureDestroyAsgStage.js').name,
require('./pipeline/stages/enableAsg/azureEnableAsgStage.js').name,
require('./pipeline/stages/disableAsg/azureDisableAsgStage.js').name,
require('./pipeline/stages/bake/azureBakeStage.js').name,
require('./serverGroup/details/serverGroup.details.module.js').name,
require('./serverGroup/serverGroup.transformer.js').name,
require('./serverGroup/configure/wizard/CloneServerGroup.azure.controller.js').name,
require('./serverGroup/configure/serverGroup.configure.azure.module.js').name,
require('./instance/azureInstanceType.service.js').name,
require('./loadBalancer/loadBalancer.transformer.js').name,
require('./loadBalancer/details/loadBalancerDetail.controller.js').name,
require('./loadBalancer/configure/createLoadBalancer.controller.js').name,
require('./instance/details/instance.details.controller.js').name,
require('./securityGroup/details/securityGroupDetail.controller.js').name,
require('./securityGroup/configure/CreateSecurityGroupCtrl.js').name,
require('./securityGroup/configure/EditSecurityGroupCtrl.js').name,
require('./securityGroup/securityGroup.transformer.js').name,
require('./securityGroup/securityGroup.reader.js').name,
require('./image/image.reader.js').name,
require('./cache/cacheConfigurer.service.js').name,
require('./pipeline/stages/destroyAsg/azureDestroyAsgStage').name,
require('./pipeline/stages/enableAsg/azureEnableAsgStage').name,
require('./pipeline/stages/disableAsg/azureDisableAsgStage').name,
require('./pipeline/stages/bake/azureBakeStage').name,
require('./serverGroup/details/serverGroup.details.module').name,
require('./serverGroup/serverGroup.transformer').name,
require('./serverGroup/configure/wizard/CloneServerGroup.azure.controller').name,
require('./serverGroup/configure/serverGroup.configure.azure.module').name,
require('./instance/azureInstanceType.service').name,
require('./loadBalancer/loadBalancer.transformer').name,
require('./loadBalancer/details/loadBalancerDetail.controller').name,
require('./loadBalancer/configure/createLoadBalancer.controller').name,
require('./instance/details/instance.details.controller').name,
require('./securityGroup/details/securityGroupDetail.controller').name,
require('./securityGroup/configure/CreateSecurityGroupCtrl').name,
require('./securityGroup/configure/EditSecurityGroupCtrl').name,
require('./securityGroup/securityGroup.transformer').name,
require('./securityGroup/securityGroup.reader').name,
require('./image/image.reader').name,
require('./cache/cacheConfigurer.service').name,
])
.config(function() {
CloudProviderRegistry.registerProvider('azure', {
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/azure/image/image.reader.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { API } from '@spinnaker/core';
describe('Service: Azure Image Reader', function() {
var service, $http;

beforeEach(window.module(require('./image.reader.js').name));
beforeEach(window.module(require('./image.reader').name));

beforeEach(
window.inject(function(azureImageReader, $httpBackend) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
module.exports = angular
.module('spinnaker.azure.loadBalancer.create.controller', [
require('@uirouter/angularjs').default,
require('../loadBalancer.transformer.js').name,
require('../loadBalancer.transformer').name,
])
.controller('azureCreateLoadBalancerCtrl', function(
$scope,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '@spinnaker/core';

module.exports = angular
.module('spinnaker.azure.pipeline.stage.bakeStage', [require('./bakeExecutionDetails.controller.js').name])
.module('spinnaker.azure.pipeline.stage.bakeStage', [require('./bakeExecutionDetails.controller').name])
.config(function() {
Registry.pipeline.registerStage({
provides: 'bake',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { AccountService, TaskMonitor, FirewallLabels } from '@spinnaker/core';

module.exports = angular
.module('spinnaker.azure.securityGroup.clone.controller', [
require('../securityGroup.write.service.js').name,
require('../configure/CreateSecurityGroupCtrl.js').name,
require('../securityGroup.write.service').name,
require('../configure/CreateSecurityGroupCtrl').name,
])
.controller('azureCloneSecurityGroupController', function(
$scope,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { AccountService, SECURITY_GROUP_READER } from '@spinnaker/core';

describe('Controller: Azure.CreateSecurityGroup', function() {
beforeEach(window.module(SECURITY_GROUP_READER, require('./CreateSecurityGroupCtrl.js').name));
beforeEach(window.module(SECURITY_GROUP_READER, require('./CreateSecurityGroupCtrl').name));

describe('filtering', function() {
// Initialize the controller and a mock scope
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { AccountService, TaskMonitor, FirewallLabels } from '@spinnaker/core';
module.exports = angular
.module('spinnaker.azure.securityGroup.create.controller', [
require('@uirouter/angularjs').default,
require('../securityGroup.write.service.js').name,
require('../securityGroup.write.service').name,
])

.controller('azureCreateSecurityGroupCtrl', function(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = angular
require('@uirouter/angularjs').default,
CACHE_INITIALIZER_SERVICE,
SECURITY_GROUP_READER,
require('../securityGroup.write.service.js').name,
require('../securityGroup.write.service').name,
])
.controller('azureEditSecurityGroupCtrl', function(
$scope,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ module.exports = angular
.module('spinnaker.azure.securityGroup.azure.details.controller', [
require('@uirouter/angularjs').default,
SECURITY_GROUP_READER,
require('../securityGroup.write.service.js').name,
require('../securityGroup.write.service').name,
CONFIRMATION_MODAL_SERVICE,
require('../clone/cloneSecurityGroup.controller.js').name,
require('../clone/cloneSecurityGroup.controller').name,
])
.controller('azureSecurityGroupDetailsCtrl', function(
$scope,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
const angular = require('angular');

module.exports = angular.module('spinnaker.azure.serverGroup.configure', [
require('./wizard/basicSettings/ServerGroupBasicSettings.controller.js').name,
require('./wizard/loadBalancers/ServerGroupLoadBalancers.controller.js').name,
require('./wizard/ServerGroupInstanceArchetype.controller.js').name,
require('./wizard/ServerGroupInstanceType.controller.js').name,
require('./wizard/securityGroup/ServerGroupSecurityGroups.controller.js').name,
require('./wizard/advancedSettings/ServerGroupAdvancedSettings.controller.js').name,
require('./wizard/loadBalancers/serverGroupLoadBalancersSelector.directive.js').name,
require('./wizard/capacity/capacitySelector.directive.js').name,
require('./wizard/securityGroup/serverGroupSecurityGroupsSelector.directive.js').name,
require('../serverGroup.transformer.js').name,
require('./wizard/advancedSettings/advancedSettingsSelector.directive.js').name,
require('./wizard/networkSettings/ServerGroupNetworkSettings.controller.js').name,
require('./wizard/networkSettings/ServerGroupNetworkSettingsSelector.directive.js').name,
require('./wizard/basicSettings/ServerGroupBasicSettings.controller').name,
require('./wizard/loadBalancers/ServerGroupLoadBalancers.controller').name,
require('./wizard/ServerGroupInstanceArchetype.controller').name,
require('./wizard/ServerGroupInstanceType.controller').name,
require('./wizard/securityGroup/ServerGroupSecurityGroups.controller').name,
require('./wizard/advancedSettings/ServerGroupAdvancedSettings.controller').name,
require('./wizard/loadBalancers/serverGroupLoadBalancersSelector.directive').name,
require('./wizard/capacity/capacitySelector.directive').name,
require('./wizard/securityGroup/serverGroupSecurityGroupsSelector.directive').name,
require('../serverGroup.transformer').name,
require('./wizard/advancedSettings/advancedSettingsSelector.directive').name,
require('./wizard/networkSettings/ServerGroupNetworkSettings.controller').name,
require('./wizard/networkSettings/ServerGroupNetworkSettingsSelector.directive').name,
]);
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const angular = require('angular');
import { NameUtils } from '@spinnaker/core';

module.exports = angular
.module('spinnaker.azure.serverGroupCommandBuilder.service', [require('../../image/image.reader.js').name])
.module('spinnaker.azure.serverGroupCommandBuilder.service', [require('../../image/image.reader').name])
.factory('azureServerGroupCommandBuilder', function($q, azureImageReader) {
function buildNewServerGroupCommand(application, defaults) {
defaults = defaults || {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {

module.exports = angular
.module('spinnaker.azure.serverGroup.configure.service', [
require('../../image/image.reader.js').name,
require('../../image/image.reader').name,
LOAD_BALANCER_READ_SERVICE,
SECURITY_GROUP_READER,
CACHE_INITIALIZER_SERVICE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
describe('Service: azureServerGroupConfiguration', function() {
var service;

beforeEach(window.module(require('./serverGroupConfiguration.service.js').name));
beforeEach(window.module(require('./serverGroupConfiguration.service').name));

beforeEach(
window.inject(function(_azureServerGroupConfigurationService_) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { SERVER_GROUP_WRITER, TaskMonitor, ModalWizard, FirewallLabels } from '@
module.exports = angular
.module('spinnaker.azure.cloneServerGroup.controller', [
require('@uirouter/angularjs').default,
require('../serverGroupConfiguration.service.js').name,
require('../../serverGroup.transformer.js').name,
require('../serverGroupConfiguration.service').name,
require('../../serverGroup.transformer').name,
SERVER_GROUP_WRITER,
])
.controller('azureCloneServerGroupCtrl', function(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module.exports = angular
.module('spinnaker.azure.serverGroup.configure.basicSettings', [
require('@uirouter/angularjs').default,
require('angular-ui-bootstrap'),
require('./image.regional.filter.js').name,
require('./image.regional.filter').name,
IMAGE_READER,
])
.controller('azureServerGroupBasicSettingsCtrl', function($scope, $controller, $uibModalStack, $state, imageReader) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

describe('Filter: regional', function() {
beforeEach(window.module(require('./image.regional.filter.js').name));
beforeEach(window.module(require('./image.regional.filter').name));

beforeEach(
window.inject(function(_regionalFilter_) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
const angular = require('angular');

module.exports = angular.module('spinnaker.azure.serverGroup.details.azure', [
require('./serverGroupDetails.azure.controller.js').name,
require('./serverGroupDetails.azure.controller').name,
]);
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import {
FirewallLabels,
} from '@spinnaker/core';

require('../configure/serverGroup.configure.azure.module.js');
require('../configure/serverGroup.configure.azure.module');

module.exports = angular
.module('spinnaker.azure.serverGroup.details.controller', [
require('@uirouter/angularjs').default,
require('../configure/serverGroupCommandBuilder.service.js').name,
require('../configure/serverGroupCommandBuilder.service').name,
CONFIRMATION_MODAL_SERVICE,
SERVER_GROUP_WRITER,
])
Expand Down
Loading

0 comments on commit 35be1f0

Please sign in to comment.