Merge branch 'nathan/sw-decompression-streams' into 'master'

feat: use native decompression streams in service worker See merge request dfinity-lab/public/ic!14063
dfinity · Aug 9, 2023 · 65f1d51 · 65f1d51
2 parents 1d3420e + a0e1773
commit 65f1d51
Show file tree

Hide file tree

Showing 11 changed files with 3,396 additions and 3,253 deletions.
diff --git a/typescript/service-worker/BUILD.bazel b/typescript/service-worker/BUILD.bazel
@@ -53,6 +53,7 @@ jest_test(
         "test-setup.ts",
         "@sw_npm//:node_modules",
         "tsconfig.json",
+        "tsconfig.test.json",
         "test/html-loader.js",
         "test_utils/fixtures.json",
     ],

diff --git a/typescript/service-worker/jest.config.ts b/typescript/service-worker/jest.config.ts
@@ -4,24 +4,15 @@ module.exports = {
   testEnvironment: 'jsdom',
   roots: ['src/'],
   testMatch: ['**/src/**/?(*.)+(spec|test).[jt]s?(x)'],
-  setupFiles: [`<rootDir>/test-setup.ts`, 'fake-indexeddb/auto'],
+  setupFiles: ['<rootDir>/test-setup.ts', 'fake-indexeddb/auto'],
   moduleDirectories: ['node_modules'],
   moduleFileExtensions: ['js', 'ts', 'html'],
   moduleNameMapper: {
     '^html-loader.+!(.*)$': '$1',
   },
   transform: {
     '^.+\\.html$': '<rootDir>/test/html-loader.js',
-    '^.+\\.[tj]s$': 'ts-jest',
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.test.json' }],
   },
-  timers: 'fake',
   reporters: ['default', 'jest-junit'],
-  globals: {
-    'ts-jest': {
-      tsconfig: {
-        allowJs: true,
-        types: ["jest", "node"],
-      },
-    },
-  },
 };