Merge pull request #1055 from Shopify/ml-graphql-client-testing-serve…

…r-env [GraphQL Client] Enable server and browser testing in graphql-client package
Shopify · Nov 13, 2023 · 4fe9ebf · 4fe9ebf
2 parents 6c2274a + 3e0f6bb
commit 4fe9ebf
Showing 14 changed files with 174 additions and 184 deletions.
diff --git a/.changeset/breezy-hotels-glow.md b/.changeset/breezy-hotels-glow.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/graphql-client/package.json b/packages/graphql-client/package.json
@@ -41,7 +41,27 @@
     "release": "yarn build && changeset publish"
   },
   "jest": {
-    "testEnvironment": "jsdom",
+    "projects": [
+      {
+        "displayName": {
+          "name": "test:browser",
+          "color": "blue"
+        },
+        "testEnvironment": "jsdom",
+        "testPathIgnorePatterns": [
+          "(/__tests__/.*|(\\.|/)server(\\.|/)(test|spec))\\.[jt]sx?$"
+        ]
+      },
+      {
+        "displayName": {
+          "name": "test:server",
+          "color": "yellow"
+        },
+        "testPathIgnorePatterns": [
+          "(/__tests__/.*|(\\.|/)browser(\\.|/)(test|spec))\\.[jt]sx?$"
+        ]
+      }
+    ],
     "setupFilesAfterEnv": [
       "./src/tests/setupTests.ts"
     ],
@@ -60,12 +80,7 @@
     "Storefront API"
   ],
   "files": [
-    "**/*.d.ts",
-    "**/*.d.ts.map",
-    "**/*.js",
-    "**/*.js.map",
-    "**/*.mjs",
-    "**/*.mjs.map",
+    "dist/**/*.*",
     "!node_modules"
   ],
   "dependencies": {},

diff --git a/packages/graphql-client/rollup.config.cjs b/packages/graphql-client/rollup.config.cjs
@@ -19,7 +19,7 @@ export function getPlugins({ tsconfig, minify } = {}) {
     resolve(),
     commonjs(),
     typescript({
-      tsconfig: tsconfig ? tsconfig : "./tsconfig.build.json",
+      tsconfig: tsconfig ? tsconfig : "./tsconfig.json",
       outDir: "./dist/ts",
     }),
     ...(minify === true ? [terser({ keep_fnames: new RegExp("fetch") })] : []),
@@ -36,7 +36,7 @@ const config = [
     input: clientSrcInput,
     plugins: getPlugins({
       minify: true,
-      tsconfig: "./tsconfig.build.umd.json",
+      tsconfig: "./tsconfig.umd.json",
     }),
     output: [
       {
@@ -51,7 +51,7 @@ const config = [
   {
     input: clientSrcInput,
     plugins: getPlugins({
-      tsconfig: "./tsconfig.build.umd.json",
+      tsconfig: "./tsconfig.umd.json",
     }),
     output: [
       {

diff --git a/packages/graphql-client/src/api-client-utilities/tests/api-versions.test.ts b/packages/graphql-client/src/api-client-utilities/tests/api-versions.test.ts
@@ -7,7 +7,7 @@ const mockDate = new Date("2023-10-15");
 
 describe("getCurrentApiVersion()", () => {
   beforeEach(() => {
-    jest.spyOn(window, "Date").mockImplementation(() => mockDate);
+    jest.spyOn(global, "Date").mockImplementation(() => mockDate);
   });
 
   afterEach(() => {
@@ -27,7 +27,7 @@ describe("getCurrentApiVersion()", () => {
 
 describe("getCurrentSupportedApiVersions()", () => {
   beforeEach(() => {
-    jest.spyOn(window, "Date").mockImplementation(() => mockDate);
+    jest.spyOn(global, "Date").mockImplementation(() => mockDate);
   });
 
   afterEach(() => {

diff --git a/packages/graphql-client/src/api-client-utilities/tests/validation.test.ts b/packages/graphql-client/src/api-client-utilities/tests/validation.test.ts
@@ -88,7 +88,7 @@ describe("validateRequiredApiVersion()", () => {
 
   beforeEach(() => {
     consoleWarnSpy = jest
-      .spyOn(window.console, "warn")
+      .spyOn(global.console, "warn")
       .mockImplementation(jest.fn());
   });
 

diff --git a/packages/graphql-client/src/graphql-client/tests/graphql-client.test.ts b/packages/graphql-client/src/graphql-client/tests/graphql-client.test.ts
diff --git a/packages/graphql-client/tsconfig.build.json b/packages/graphql-client/tsconfig.build.json
diff --git a/packages/graphql-client/tsconfig.json b/packages/graphql-client/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "include": ["./src/**/*.ts"],
-  "exclude": ["./node_modules"],
+  "exclude": ["./node_modules", "./src/**/tests/**/*.ts"],
   "compilerOptions": {
     "declaration": true,
     "declarationMap": true,

diff --git a/...es/graphql-client/tsconfig.build.umd.json → packages/graphql-client/tsconfig.umd.json b/...es/graphql-client/tsconfig.build.umd.json → packages/graphql-client/tsconfig.umd.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.build.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "declaration": false,
     "declarationMap": false

diff --git a/packages/storefront-api-client/package.json b/packages/storefront-api-client/package.json
@@ -49,7 +49,6 @@
         },
         "testEnvironment": "jsdom",
         "testPathIgnorePatterns": [
-          ".rollup.cache/",
           "(/__tests__/.*|(\\.|/)server(\\.|/)(test|spec))\\.[jt]sx?$"
         ]
       },
@@ -59,7 +58,6 @@
           "color": "yellow"
         },
         "testPathIgnorePatterns": [
-          ".rollup.cache/",
           "(/__tests__/.*|(\\.|/)browser(\\.|/)(test|spec))\\.[jt]sx?$"
         ]
       }

diff --git a/packages/storefront-api-client/rollup.config.cjs b/packages/storefront-api-client/rollup.config.cjs
@@ -18,7 +18,7 @@ export function getPlugins({ tsconfig, minify } = {}) {
     resolve(),
     commonjs(),
     typescript({
-      tsconfig: tsconfig ? tsconfig : "./tsconfig.build.json",
+      tsconfig: tsconfig ? tsconfig : "./tsconfig.json",
       outDir: "./dist/ts",
     }),
     ...(minify === true ? [terser({ keep_fnames: new RegExp("fetch") })] : []),
@@ -35,7 +35,7 @@ const config = [
     input: mainSrcInput,
     plugins: getPlugins({
       minify: true,
-      tsconfig: "./tsconfig.build.umd.json",
+      tsconfig: "./tsconfig.umd.json",
     }),
     output: [
       {
@@ -50,7 +50,7 @@ const config = [
   {
     input: mainSrcInput,
     plugins: getPlugins({
-      tsconfig: "./tsconfig.build.umd.json",
+      tsconfig: "./tsconfig.umd.json",
     }),
     output: [
       {

diff --git a/packages/storefront-api-client/tsconfig.build.json b/packages/storefront-api-client/tsconfig.build.json
diff --git a/packages/storefront-api-client/tsconfig.json b/packages/storefront-api-client/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "include": ["./src/**/*.ts"],
-  "exclude": ["./node_modules"],
+  "exclude": ["./node_modules", "./src/**/tests/**/*.ts"],
   "compilerOptions": {
     "declaration": true,
     "declarationMap": true,

diff --git a/...efront-api-client/tsconfig.build.umd.json → ...s/storefront-api-client/tsconfig.umd.json b/...efront-api-client/tsconfig.build.umd.json → ...s/storefront-api-client/tsconfig.umd.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.build.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "declaration": false,
     "declarationMap": false