chore: update import sort rules

aws-spot-price.code-workspace

@@ -12,29 +12,21 @@
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
 
-    // importSorter
-    "importSorter.generalConfiguration.sortOnBeforeSave": true,
-    "importSorter.importStringConfiguration.maximumNumberOfImportExpressionsPerLine.count": 100,
-    "importSorter.importStringConfiguration.maximumNumberOfImportExpressionsPerLine.type": "newLineEachExpressionAfterCountLimitExceptIfOnlyOne",
-    "importSorter.importStringConfiguration.quoteMark": "single",
-    "importSorter.importStringConfiguration.tabSize": 2,
-    "importSorter.importStringConfiguration.trailingComma": "multiLine",
-    "importSorter.sortConfiguration.removeUnusedDefaultImports": true,
-    "importSorter.sortConfiguration.removeUnusedImports": true,
-
     // eslint
     "eslint.validate": ["javascript", "typescript"],
     "eslint.run": "onType",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+    "[javascript]": {
+      "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[typescript]": {
+      "editor.defaultFormatter": "esbenp.prettier-vscode"
     }
   },
 
   "extensions": {
     "recommendations": [
       "dbaeumer.vscode-eslint",
       "esbenp.prettier-vscode",
-      "mike-co.import-sorter",
       "KnisterPeter.vscode-commitizen"
     ]
   },

package.json

@@ -59,6 +59,12 @@
     "singleQuote": true,
     "arrowParens": "avoid"
   },
+  "importSort": {
+    ".js, .ts": {
+      "style": "module",
+      "parser": "typescript"
+    }
+  },
   "jest": {
     "preset": "ts-jest",
     "testEnvironment": "node",
@@ -116,31 +122,33 @@
     "commitizen": "4.2.2",
     "conventional-changelog-cli": "2.1.0",
     "cz-conventional-changelog": "3.3.0",
+    "eslint": "7.12.1",
     "eslint-config-airbnb-typescript": "12.0.0",
     "eslint-config-prettier": "6.15.0",
     "eslint-import-resolver-typescript": "2.3.0",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jest": "24.1.0",
     "eslint-plugin-prettier": "3.1.4",
-    "eslint": "7.12.1",
     "husky": "4.3.0",
+    "import-sort-style-module": "^6.0.0",
+    "jest": "26.6.1",
     "jest-junit": "12.0.0",
     "jest-mock-console": "1.0.1",
-    "jest": "26.6.1",
     "lodash": "4.17.20",
     "nock": "13.0.4",
     "ora": "5.1.0",
     "patch-package": "6.2.2",
     "prettier": "2.1.2",
+    "prettier-plugin-import-sort": "^0.0.6",
     "prompts": "2.4.0",
     "semantic-release": "17.2.2",
     "table": "6.0.3",
     "ts-jest": "26.4.3",
     "ts-loader": "8.0.7",
     "ts-node": "9.0.0",
     "typescript": "4.0.5",
-    "webpack-cli": "4.1.0",
     "webpack": "5.3.2",
+    "webpack-cli": "4.1.0",
     "yargs": "16.1.0"
   }
 }

scripts/generate-ec2-types.ts

@@ -1,5 +1,6 @@
 import { writeFileSync } from 'fs';
 import { resolve } from 'path';
+
 import prettier from 'prettier';
 
 import { getGlobalSpotPrices } from '../src/lib/core';

scripts/generate-spot-prices-mock-data.ts

@@ -1,10 +1,11 @@
-import EC2 from 'aws-sdk/clients/ec2';
 import { readFileSync, writeFileSync } from 'fs';
-import { find, uniqWith, xorWith } from 'lodash';
 import { resolve } from 'path';
+
+import EC2 from 'aws-sdk/clients/ec2';
+import { find, uniqWith, xorWith } from 'lodash';
 import yargs from 'yargs';
 
-import { defaultRegions, Region } from '../src/constants/regions';
+import { Region, defaultRegions } from '../src/constants/regions';
 
 let allPrices: EC2.SpotPrice[] = [];
 

src/cli.spec.ts

@@ -1,7 +1,8 @@
 import { spawnSync } from 'child_process';
-import mockConsole, { RestoreConsole } from 'jest-mock-console';
 import { resolve } from 'path';
 
+import mockConsole, { RestoreConsole } from 'jest-mock-console';
+
 import { mockAwsCredentials, mockAwsCredentialsClear } from '../test/mock-credential-endpoints';
 import {
   mockDefaultRegionEndpoints,
@@ -163,6 +164,7 @@ describe('cli', () => {
     const cliJsPath = resolve(__dirname, '../dist/cli.js');
     it('should stdout help screen', () => {
       const s = spawnSync('node', [cliJsPath, '--help'], { encoding: 'utf-8' });
+      console.log(s.stdout);
       expect(s.stdout).toMatchSnapshot();
     });
   });

src/cli.ts

@@ -1,31 +1,32 @@
-import ora from 'ora';
 import { sep } from 'path';
+
+import ora from 'ora';
 import { table } from 'table';
 import yargs from 'yargs';
 
 import { ui } from './lib/ui';
 import {
+  AuthError,
+  Ec2SpotPriceError,
+  InstanceFamily,
+  InstanceFamilyType,
+  InstanceSize,
+  InstanceType,
+  ProductDescription,
+  ProductDescriptionWildcards,
+  Region,
   allInstances,
   allProductDescriptions,
   allRegions,
-  AuthError,
   awsCredentialsCheck,
   defaults,
-  Ec2SpotPriceError,
   generateTypeSizeSetsFromFamily,
   getGlobalSpotPrices,
   instanceFamily,
-  InstanceFamily,
-  InstanceFamilyType,
   instanceFamilyTypes,
   instanceOfProductDescription,
-  InstanceSize,
   instanceSizes,
-  InstanceType,
-  ProductDescription,
   productDescriptionWildcards,
-  ProductDescriptionWildcards,
-  Region,
   regionNames,
 } from './module';
 

src/lib/core.ts

@@ -2,7 +2,7 @@ import EC2 from 'aws-sdk/clients/ec2';
 
 import { InstanceFamilyType, InstanceSize, InstanceType } from '../constants/ec2-types';
 import { ProductDescription } from '../constants/product-description';
-import { defaultRegions, Region } from '../constants/regions';
+import { Region, defaultRegions } from '../constants/regions';
 import { generateInstantTypesFromFamilyTypeSize } from './utils';
 
 const sortSpotPrice = (p1: EC2.SpotPrice, p2: EC2.SpotPrice): number => {

src/lib/ui.spec.ts

@@ -1,10 +1,10 @@
 import {
+  InstanceSize,
   allInstances,
   instanceFamily,
   instanceFamilyCompute,
   instanceFamilyGeneral,
   instanceFamilyMemory,
-  InstanceSize,
 } from '../constants/ec2-types';
 import { ui } from './ui';
 

src/lib/ui.ts

@@ -1,15 +1,15 @@
 import { Choice, prompt } from 'prompts';
 
 import {
-  instanceFamily,
   InstanceFamily,
   InstanceFamilyType,
-  instanceFamilyTypes,
   InstanceSize,
+  instanceFamily,
+  instanceFamilyTypes,
   instanceSizes,
 } from '../constants/ec2-types';
-import { allProductDescriptions, ProductDescription } from '../constants/product-description';
-import { allRegions, Region, regionNames } from '../constants/regions';
+import { ProductDescription, allProductDescriptions } from '../constants/product-description';
+import { Region, allRegions, regionNames } from '../constants/regions';
 import { generateTypeSizeSetsFromFamily } from './utils';
 
 type Answer1 = { region: Region[]; family: InstanceFamily[] };

src/lib/utils.ts

@@ -1,10 +1,10 @@
 import {
-  allInstances,
-  instanceFamily,
   InstanceFamily,
   InstanceFamilyType,
   InstanceSize,
   InstanceType,
+  allInstances,
+  instanceFamily,
 } from '../constants/ec2-types';
 
 export const generateTypeSizeSetsFromFamily = (

test/mock-credential-endpoints.ts

@@ -1,8 +1,9 @@
-import { config } from 'aws-sdk';
 import fs from 'fs';
-import nock from 'nock';
 import { sep } from 'path';
 
+import { config } from 'aws-sdk';
+import nock from 'nock';
+
 let readFileSyncMock: jest.SpyInstance;
 
 export const mockAwsCredentials = (

test/mock-ec2-endpoints.ts

@@ -1,11 +1,12 @@
-import { SpotPrice } from 'aws-sdk/clients/ec2';
 import { readFileSync } from 'fs';
-import { filter } from 'lodash';
-import nock from 'nock';
 import { resolve } from 'path';
 import { parse } from 'querystring';
 
-import { allRegions, defaultRegions, Region } from '../src/constants/regions';
+import { SpotPrice } from 'aws-sdk/clients/ec2';
+import { filter } from 'lodash';
+import nock from 'nock';
+
+import { Region, allRegions, defaultRegions } from '../src/constants/regions';
 import { mockAwsCredentials, mockAwsCredentialsClear } from './mock-credential-endpoints';
 
 const data = JSON.parse(