test: update code fixes spec to work with esm-cjs interop lint (#48731)

devversion · devversion · commit 13f10de40e25 · 2023-01-13T14:10:39.000Z
The TSLint rule for ESM/CJS interop was apparently not working for a short period of time due to diverging TypeScript versions. This commit fixes the lint warning to replace the type-only import with a default import. Even thoughn not striclty needed for types- the rule enforces a default import as that is the safer approach for runtime imported symbols. Also the rule is updated to not disallow `cluster` anymore. The types for cluster do no allow for e.g. `cluster.Worker` if cluster refers to the default import. The whole lint rule is not strictly needed anymore since we build & test with ESM in this repo now! PR Close #48731
diff --git a/packages/language-service/test/code_fixes_spec.ts b/packages/language-service/test/code_fixes_spec.ts
@@ -8,7 +8,7 @@
 
 import {initMockFileSystem} from '@angular/compiler-cli/src/ngtsc/file_system/testing';
 import {spawn} from 'child_process';
-import {CodeAction} from 'typescript';
+import ts from 'typescript';
 
 import {FixIdForCodeFixesAll} from '../src/codefixes/utils';
 import {createModuleAndProjectWithDeclarations, LanguageServiceTestEnv} from '../testing';
@@ -24,7 +24,7 @@ describe('code fixes', () => {
     const files = {
       'app.ts': `
        import {Component, NgModule} from '@angular/core';
- 
+
        @Component({
          templateUrl: './app.html'
        })
@@ -59,7 +59,7 @@ describe('code fixes', () => {
     const files = {
       'app.ts': `
        import {Component, NgModule} from '@angular/core';
- 
+
        @Component({
          templateUrl: './app.html'
        })
@@ -91,7 +91,7 @@ describe('code fixes', () => {
        const files = {
          'app.ts': `
          import {Component, NgModule} from '@angular/core';
-   
+
          @Component({
            templateUrl: './app.html'
          })
@@ -115,7 +115,7 @@ describe('code fixes', () => {
     const files = {
       'app.ts': `
        import {Component, NgModule} from '@angular/core';
- 
+
        @Component({
          template: '{{tite}}{{bannr}}',
        })
@@ -165,7 +165,7 @@ describe('code fixes', () => {
     const files = {
       'app.ts': `
        import {Component, NgModule} from '@angular/core';
- 
+
        @Component({
          templateUrl: './app.html'
        })
@@ -197,7 +197,7 @@ describe('code fixes', () => {
     const files = {
       'app.ts': `
        import {Component, NgModule} from '@angular/core';
- 
+
        @Component({
          template: '<input ([ngModel])="title"><input ([value])="title">',
        })
@@ -493,7 +493,7 @@ function actionChangesMatch(
 // Returns the ActionChanges for all changes in the given code actions, collapsing whitespace into a
 // single space and trimming at the ends.
 function allChangesForCodeActions(
-    fileContents: string, codeActions: readonly CodeAction[]): ActionChanges {
+    fileContents: string, codeActions: readonly ts.CodeAction[]): ActionChanges {
   // Replace all whitespace characters with a single space, then deduplicate spaces and trim.
   const collapse = (s: string) => s.replace(/\s/g, ' ').replace(/\s{2,}/g, ' ').trim();
   let allActionChanges: ActionChanges = {};
diff --git a/tslint.json b/tslint.json
@@ -28,7 +28,6 @@
           "semver",
           "yargs",
           "glob",
-          "cluster",
           "convert-source-map"
         ],
         // The following CommonJS modules appear to have a default export available (due to the `esModuleInterop` flag),
