Merge pull request #4190 from aryaemami59/reformat-files

EskiMojo14 · web-flow · commit 6f4194dff4c7 · 2024-02-12T20:25:04.000Z
Remove trailing commas in `tsconfig.json` files of all CodesandBox examples
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,5 +1,11 @@
 {
   "semi": false,
   "singleQuote": true,
-  "endOfLine": "auto"
+  "endOfLine": "auto",
+  "overrides": [
+    {
+      "files": ["examples/**/tsconfig*.json"],
+      "options": { "parser": "json" }
+    }
+  ]
 }
diff --git a/docs/virtual/petstore-api.generated/petstore-api.generated.ts b/docs/virtual/petstore-api.generated/petstore-api.generated.ts
diff --git a/examples/action-listener/counter/tsconfig.json b/examples/action-listener/counter/tsconfig.json
@@ -14,7 +14,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx",
+    "jsx": "react-jsx"
   },
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/examples/publish-ci/cra4/tsconfig.json b/examples/publish-ci/cra4/tsconfig.json
@@ -14,7 +14,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx",
+    "jsx": "react-jsx"
   },
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/examples/publish-ci/cra5/tsconfig.json b/examples/publish-ci/cra5/tsconfig.json
@@ -14,7 +14,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx",
+    "jsx": "react-jsx"
   },
-  "include": ["src"],
+  "include": ["src"]
 }
diff --git a/examples/publish-ci/next/tsconfig.json b/examples/publish-ci/next/tsconfig.json
@@ -13,8 +13,8 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true,
+    "incremental": true
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"],
+  "exclude": ["node_modules"]
 }
diff --git a/examples/publish-ci/vite/tsconfig.json b/examples/publish-ci/vite/tsconfig.json
@@ -14,8 +14,8 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx",
+    "jsx": "react-jsx"
   },
   "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/examples/query/react/advanced/tsconfig.json b/examples/query/react/advanced/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/authentication-with-extrareducers/tsconfig.json b/examples/query/react/authentication-with-extrareducers/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/authentication/tsconfig.json b/examples/query/react/authentication/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/basic/tsconfig.json b/examples/query/react/basic/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/conditional-fetching/tsconfig.json b/examples/query/react/conditional-fetching/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/deduping-queries/tsconfig.json b/examples/query/react/deduping-queries/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/graphql-codegen/tsconfig.json b/examples/query/react/graphql-codegen/tsconfig.json
@@ -16,6 +16,6 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "baseUrl": "src",
-  },
+    "baseUrl": "src"
+  }
 }
diff --git a/examples/query/react/graphql/tsconfig.json b/examples/query/react/graphql/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/kitchen-sink/tsconfig.json b/examples/query/react/kitchen-sink/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/mutations/tsconfig.json b/examples/query/react/mutations/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/optimistic-update/tsconfig.json b/examples/query/react/optimistic-update/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/pagination/tsconfig.json b/examples/query/react/pagination/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/polling/tsconfig.json b/examples/query/react/polling/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/prefetching-automatic-waterfall/tsconfig.json b/examples/query/react/prefetching-automatic-waterfall/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/prefetching-automatic/tsconfig.json b/examples/query/react/prefetching-automatic/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/prefetching/tsconfig.json b/examples/query/react/prefetching/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/examples/query/react/with-apiprovider/tsconfig.json b/examples/query/react/with-apiprovider/tsconfig.json
@@ -15,6 +15,6 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "noEmit": true,
-  },
+    "noEmit": true
+  }
 }
diff --git a/packages/rtk-query-codegen-openapi/test/generateEndpoints.test.ts b/packages/rtk-query-codegen-openapi/test/generateEndpoints.test.ts
@@ -273,14 +273,13 @@ describe('import paths', () => {
       hooks: true,
       tag: true,
     });
-    expect(await fs.promises.readFile('./test/tmp/out.ts', 'utf8')).toContain("import { api } from '../../fixtures/emptyApi'");
+    expect(await fs.promises.readFile('./test/tmp/out.ts', 'utf8')).toContain(
+      "import { api } from '../../fixtures/emptyApi'"
+    );
   });
 
   test('should create paths relative to `outFile` when `apiFile` is relative (same folder)', async () => {
-    await fs.promises.writeFile(
-      './test/tmp/emptyApi.ts',
-      await fs.promises.readFile('./test/fixtures/emptyApi.ts')
-    );
+    await fs.promises.writeFile('./test/tmp/emptyApi.ts', await fs.promises.readFile('./test/fixtures/emptyApi.ts'));
 
     await generateEndpoints({
       unionUndefined: true,
diff --git a/packages/rtk-query-codegen-openapi/tsconfig.json b/packages/rtk-query-codegen-openapi/tsconfig.json
@@ -13,7 +13,7 @@
     "types": ["vitest/globals", "vitest/importMeta"],
     "esModuleInterop": true,
     "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true
+    "forceConsistentCasingInFileNames": true,
   },
-  "exclude": ["test", "lib", "vitest.config.mts"]
+  "exclude": ["test", "lib", "vitest.config.mts"],
 }
diff --git a/packages/rtk-query-codegen-openapi/vitest.config.mts b/packages/rtk-query-codegen-openapi/vitest.config.mts
@@ -8,6 +8,8 @@ const __dirname = path.dirname(__filename);
 
 export default defineConfig({
   test: {
+    testTimeout: 10_000,
+    pool: 'forks',
     globals: true,
     setupFiles: ['./test/vitest.setup.ts'],
     alias: {
diff --git a/packages/toolkit/src/query/core/buildInitiate.ts b/packages/toolkit/src/query/core/buildInitiate.ts
@@ -302,7 +302,7 @@ You must add the middleware for RTK-Query to function correctly!`,
           subscriptionOptions,
           [forceQueryFnSymbol]: forceQueryFn,
           ...rest
-        } = {}
+        } = {},
       ) =>
       (dispatch, getState) => {
         const queryCacheKey = serializeQueryArgs({

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"semi": false,`
`3`	`3`	`"singleQuote": true,`
`4`		`- "endOfLine": "auto"`
	`4`	`+ "endOfLine": "auto",`
	`5`	`+ "overrides": [`
	`6`	`+ {`
	`7`	`+ "files": ["examples/*/tsconfig.json"],`
	`8`	`+ "options": { "parser": "json" }`
	`9`	`+ }`
	`10`	`+ ]`
`5`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@`
`15`	`15`	`"moduleResolution": "node",`
`16`	`16`	`"resolveJsonModule": true,`
`17`	`17`	`"isolatedModules": true,`
`18`		`- "noEmit": true,`
`19`		`- },`
	`18`	`+ "noEmit": true`
	`19`	`+ }`
`20`	`20`	`}`