Fix TextEncoder workaround

kamilkisiela · May 26, 2024 · b3fdba2 · b3fdba2
1 parent 51f9739
commit b3fdba2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,7 @@
 /.changeset/
 /.devcontainer/
 /packages/apollo-angular/CHANGELOG.md
+
+# Needed because TextEncoder workaround must happen before importing @angular-devkit/schematics
+/packages/apollo-angular/schematics/tests/ng-add.spec.ts
+/packages/apollo-angular/schematics/tests/utils.spec.ts
diff --git a/packages/apollo-angular/schematics/tests/ng-add.spec.ts b/packages/apollo-angular/schematics/tests/ng-add.spec.ts
@@ -1,12 +1,12 @@
+import { TextDecoder, TextEncoder } from 'util';
+global.TextEncoder = TextEncoder;
+global.TextDecoder = TextDecoder as any;
+
 import { CompilerOptions } from 'typescript';
 import { UnitTestTree } from '@angular-devkit/schematics/testing';
 import { createDependenciesMap } from '../install';
 import { getFileContent, getJsonFile, runNgAdd } from '../utils';
 
-const { TextEncoder, TextDecoder } = require('util');
-global.TextEncoder = TextEncoder;
-global.TextDecoder = TextDecoder;
-
 describe('ng-add with module', () => {
   let tree: UnitTestTree;
 

diff --git a/packages/apollo-angular/schematics/tests/utils.spec.ts b/packages/apollo-angular/schematics/tests/utils.spec.ts
@@ -1,8 +1,8 @@
-import { parseJSON } from '../utils';
-
-const { TextEncoder, TextDecoder } = require('util');
+import { TextDecoder, TextEncoder } from 'util';
 global.TextEncoder = TextEncoder;
-global.TextDecoder = TextDecoder;
+global.TextDecoder = TextDecoder as any;
+
+import { parseJSON } from '../utils';
 
 test('support // comments', () => {
   expect(