fix(all): Convert requires to imports

spinnaker · Jul 16, 2021 · abf4c75 · abf4c75
1 parent b9cb82c
commit abf4c75
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/app/scripts/modules/app/src/canary/canary/canaryScore.component.less b/app/scripts/modules/app/src/canary/canary/canaryScore.component.less
@@ -1,4 +1,4 @@
-@import (reference) '~coreImports';
+@import (reference) 'coreImports';
 
 .score.label {
   font-size: 110%;

diff --git a/packages/core/src/config/VersionChecker.tsx b/packages/core/src/config/VersionChecker.tsx
@@ -4,14 +4,16 @@ import React from 'react';
 import { IScheduler, SchedulerFactory } from '../scheduler/SchedulerFactory';
 import { timestamp } from '../utils/timeFormatters';
 import { NotifierService } from '../widgets/notifier/notifier.service';
+// @ts-ignore
+import version from 'root/version.json';
 
 export interface IDeckVersion {
   version: string;
   created: number;
 }
 
 export class VersionChecker {
-  private static currentVersion: IDeckVersion = require('root/version.json');
+  private static currentVersion: IDeckVersion = version;
   private static newVersionSeenCount = 0;
   private static scheduler: IScheduler;
 

diff --git a/packages/core/src/modal/modalPage.directive.js b/packages/core/src/modal/modalPage.directive.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import { module } from 'angular';
-const $ = require('jquery');
+import $ from 'jquery';
 
 export const CORE_MODAL_MODALPAGE_DIRECTIVE = 'spinnaker.core.modal.modalPage.directive';
 export const name = CORE_MODAL_MODALPAGE_DIRECTIVE; // for backwards compatibility

diff --git a/packages/core/src/pipeline/config/stages/deploy/deployExecutionDetails.controller.js b/packages/core/src/pipeline/config/stages/deploy/deployExecutionDetails.controller.js
@@ -1,6 +1,7 @@
 'use strict';
 
 import UIROUTER_ANGULARJS from '@uirouter/angularjs';
+import angular from 'angular';
 import _ from 'lodash';
 import { Duration } from 'luxon';
 
@@ -12,8 +13,6 @@ import { UrlBuilder } from '../../../../navigation';
 import { ServerGroupReader } from '../../../../serverGroup/serverGroupReader.service';
 import { ClusterState } from '../../../../state';
 
-const angular = require('angular');
-
 export const CORE_PIPELINE_CONFIG_STAGES_DEPLOY_DEPLOYEXECUTIONDETAILS_CONTROLLER =
   'spinnaker.core.pipeline.stage.deploy.details.controller';
 export const name = CORE_PIPELINE_CONFIG_STAGES_DEPLOY_DEPLOYEXECUTIONDETAILS_CONTROLLER; // for backwards compatibility

diff --git a/packages/core/src/utils/json/JsonUtils.ts b/packages/core/src/utils/json/JsonUtils.ts
@@ -1,6 +1,6 @@
 import { isArray, isNumber, isPlainObject, isString } from 'lodash';
-
-const DiffMatchPatch = require('expose-loader?diff_match_patch!diff-match-patch');
+// @ts-ignore
+import DiffMatchPatch from 'diff-match-patch';
 
 export interface IDiffDetails {
   type: string;

diff --git a/packages/core/src/widgets/spelText/spelText.decorator.js b/packages/core/src/widgets/spelText/spelText.decorator.js
@@ -1,13 +1,12 @@
 'use strict';
 
 import { module } from 'angular';
+import 'jquery-textcomplete';
 
 import { CORE_WIDGETS_SPELTEXT_SPELAUTOCOMPLETE_SERVICE } from './spelAutocomplete.service';
 
 import './spel.less';
 
-require('jquery-textcomplete');
-
 decorateFn.$inject = ['$delegate', 'spelAutocomplete'];
 function decorateFn($delegate, spelAutocomplete) {
   const directive = $delegate[0];

diff --git a/packages/dcos/src/search/resultFormatter.js b/packages/dcos/src/search/resultFormatter.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const angular = require('angular');
+import angular from 'angular';
 
 export const DCOS_SEARCH_RESULTFORMATTER = 'spinnaker.dcos.search.formatter';
 export const name = DCOS_SEARCH_RESULTFORMATTER; // for backwards compatibility

diff --git a/packages/oracle/src/pipeline/disableAsg/disableAsgStage.js b/packages/oracle/src/pipeline/disableAsg/disableAsgStage.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const angular = require('angular');
+import angular from 'angular';
 
 import { AccountService, Registry, StageConstants } from '@spinnaker/core';