Merge pull request #626 from Shopify/dependabot/npm_and_yarn/jest-and…

…-types/jest-29.7.0 Bump jest and @types/jest
Shopify · Feb 23, 2024 · ab632da · ab632da
2 parents bb2c5ff + 8c24042
commit ab632da
Show file tree

Hide file tree

Showing 4 changed files with 655 additions and 1,132 deletions.
diff --git a/loom.config.ts b/loom.config.ts
@@ -26,81 +26,90 @@ function jestWorkspaceConfigPlugin() {
             '../../tests/setup/setup-jest.ts',
           ]);
           configure.jestConfig?.hook((config) => {
-            const projects = forkRemixProject(
-              config.projects as Config.InitialProjectOptions[],
-            );
-            return {...config, projects, testTimeout: 30000};
+            return {
+              ...config,
+              projects: configureProjects(
+                config.projects as Config.InitialProjectOptions[],
+              ),
+              testTimeout: 30000,
+            };
           });
         });
       });
     },
   );
 }
 
+function configureProjects(projects: Config.InitialProjectOptions[]) {
+  return setTransformIgnorePatterns(projects).reduce((acc, project) => {
+    if (
+      typeof project !== 'string' &&
+      project.displayName === 'shopify-app-remix'
+    ) {
+      return acc.concat(forkRemixProject(project));
+    }
+
+    return acc.concat(project);
+  }, [] as Config.InitialProjectOptions[]);
+}
+
+/**
+ * Some ESM-only packages need to be included in jest transforms for them to work. This function adds them to the
+ * transformIgnorePatterns array for each project.
+ */
+function setTransformIgnorePatterns(projects: Config.InitialProjectOptions[]) {
+  return projects.map((project) => {
+    return {
+      ...project,
+      transformIgnorePatterns: [
+        ...(project.transformIgnorePatterns || []),
+        'node_modules/(?!@web3-storage)',
+      ],
+    };
+  });
+}
+
 /**
  * The remix project is a bit of a special case because we need to run its tests in two different environments, one
  * using jsdom and the other, node.
  *
  * To achieve that, we create two separate projects which copy all of the settings from the original project, overriding
  * the test environment and making them mutually exclusive.
  */
-function forkRemixProject(projects: Config.InitialProjectOptions[]) {
-  return projects.reduce((acc, project) => {
-    if (
-      typeof project !== 'string' &&
-      project.displayName === 'shopify-app-remix'
-    ) {
-      return acc.concat(
-        [
-          {
-            ...project,
-            displayName: 'shopify-app-remix-react',
-            testEnvironment: 'jsdom',
-            testPathIgnorePatterns: ['src/server'],
-          },
-        ],
-        [
-          {
-            ...project,
-            setupFilesAfterEnv: [
-              ...(project.setupFilesAfterEnv ?? []),
-              '../../packages/shopify-app-remix/src/server/adapters/node/__tests__/setup-jest.ts',
-            ],
-            displayName: 'shopify-app-remix-server-node',
-            testEnvironment: 'node',
-            testPathIgnorePatterns: [
-              'src/react',
-              'src/server/adapters/__tests__',
-            ],
-          },
-        ],
-        [
-          {
-            ...project,
-            setupFilesAfterEnv: [
-              ...(project.setupFilesAfterEnv ?? []),
-              '../../packages/shopify-app-remix/src/server/adapters/vercel/__tests__/setup-jest.ts',
-            ],
-            displayName: 'shopify-app-remix-server-vercel',
-            testEnvironment: 'node',
-            testPathIgnorePatterns: [
-              'src/react',
-              'src/server/adapters/__tests__',
-            ],
-          },
-        ],
-        [
-          {
-            ...project,
-            testRegex: undefined,
-            displayName: 'shopify-app-remix-server-adapters',
-            testMatch: ['<rootDir>/src/server/adapters/__tests__/**/*'],
-            testEnvironment: 'node',
-          },
-        ],
-      );
-    } else {
-      return acc.concat(project);
-    }
-  }, [] as Config.InitialProjectOptions[]);
+function forkRemixProject(project: Config.InitialProjectOptions) {
+  return [
+    {
+      ...project,
+      displayName: 'shopify-app-remix-react',
+      testEnvironment: 'jsdom',
+      testPathIgnorePatterns: ['src/server'],
+    },
+    {
+      ...project,
+      setupFilesAfterEnv: [
+        ...(project.setupFilesAfterEnv ?? []),
+        '../../packages/shopify-app-remix/src/server/adapters/node/__tests__/setup-jest.ts',
+      ],
+      displayName: 'shopify-app-remix-server-node',
+      testEnvironment: 'node',
+      testPathIgnorePatterns: ['src/react', 'src/server/adapters/__tests__'],
+    },
+    {
+      ...project,
+      setupFilesAfterEnv: [
+        ...(project.setupFilesAfterEnv ?? []),
+        '../../packages/shopify-app-remix/src/server/adapters/vercel/__tests__/setup-jest.ts',
+      ],
+      displayName: 'shopify-app-remix-server-vercel',
+      testEnvironment: 'node',
+      testPathIgnorePatterns: ['src/react', 'src/server/adapters/__tests__'],
+    },
+    {
+      ...project,
+      testRegex: undefined,
+      displayName: 'shopify-app-remix-server-adapters',
+      testMatch: ['<rootDir>/src/server/adapters/__tests__/**/*'],
+      testEnvironment: 'node',
+    },
+  ];
 }
diff --git a/package.json b/package.json
@@ -22,10 +22,11 @@
     "@shopify/loom-plugin-prettier": "^2.0.1",
     "@shopify/prettier-config": "^1.1.2",
     "@shopify/typescript-configs": "^5.1.0",
-    "@types/jest": "^29.5.1",
+    "@types/jest": "^29.5.12",
     "eslint": "^8.55.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.1.0",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "jest-fetch-mock": "^3.0.3",
     "jest-runner-eslint": "^2.1.2",
     "prettier": "^3.2.5",
@@ -35,6 +36,11 @@
     "typescript": "5.3.3"
   },
   "dependencies": {},
+  "resolutions": {
+    "jest": "^29.7.0",
+    "jest-circus": "^29.7.0",
+    "ts-jest": "^29.1.2"
+  },
   "workspaces": [
     "packages/*"
   ]

diff --git a/packages/shopify-app-express/src/__tests__/redirect-to-auth.test.ts b/packages/shopify-app-express/src/__tests__/redirect-to-auth.test.ts
@@ -65,6 +65,7 @@ describe('redirectToAuth', () => {
       shop: TEST_SHOP,
       host: BASE64_HOST,
       embedded: '1',
+      redirectUri: `https://${shopify.api.config.hostName}/auth?shop=${TEST_SHOP}&host=${BASE64_HOST}`,
     });
     const response = await request(app)
       .get(`/redirect-to-auth?${expectedParams.toString()}`)
@@ -74,11 +75,10 @@ describe('redirectToAuth', () => {
       response.header.location,
       'http://not-a-real-host.myshopify.io',
     );
-    const params = Object.fromEntries(url.searchParams.entries());
 
     expect(url.host).toBe('not-a-real-host.myshopify.io');
     expect(url.pathname).toBe('/exitiframe');
-    expect(params).toMatchObject(expectedParams);
+    expect(url.searchParams.toString()).toEqual(expectedParams.toString());
   });
 
   it('fails with invalid shop', async () => {