Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove trailing commas in tsconfig.json files of all CodesandBox examples #4190

Merged
merged 7 commits into from
Feb 12, 2024
Merged

Remove trailing commas in tsconfig.json files of all CodesandBox examples #4190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1e058cd
Reformat all files
aryaemami59 Feb 12, 2024
6cd1d69
Add `overrides` in prettier config for tsconfig files in CSB examples
aryaemami59 Feb 12, 2024
c979069
Reformat files to remove trailing commas in tsconfig files
aryaemami59 Feb 12, 2024
554aac6
Add `pool: "forks"` to vitest config of codegen
aryaemami59 Feb 12, 2024
d09ab21
Change test timeout for codegen
aryaemami59 Feb 12, 2024
7a5b39a
Slightly modify prettier config
aryaemami59 Feb 12, 2024
5aa2594
Reformat all files one more time
aryaemami59 Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .prettierrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"semi": false,
"singleQuote": true,
"endOfLine": "auto"
"endOfLine": "auto",
"overrides": [
{
"files": ["examples/**/tsconfig*.json"],
"options": { "parser": "json" }
}
]
}
Binary file modified docs/virtual/petstore-api.generated/petstore-api.generated.ts
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions examples/action-listener/counter/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
"jsx": "react-jsx"
},
"include": ["src"],
"include": ["src"]
}
4 changes: 2 additions & 2 deletions examples/publish-ci/cra4/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
"jsx": "react-jsx"
},
"include": ["src"],
"include": ["src"]
}
4 changes: 2 additions & 2 deletions examples/publish-ci/cra5/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
"jsx": "react-jsx"
},
"include": ["src"],
"include": ["src"]
}
4 changes: 2 additions & 2 deletions examples/publish-ci/next/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
}
4 changes: 2 additions & 2 deletions examples/publish-ci/vite/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }]
}
4 changes: 2 additions & 2 deletions examples/query/react/advanced/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/authentication-with-extrareducers/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/authentication/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/basic/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/conditional-fetching/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/deduping-queries/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/graphql-codegen/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"baseUrl": "src",
},
"baseUrl": "src"
}
}
4 changes: 2 additions & 2 deletions examples/query/react/graphql/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/kitchen-sink/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/mutations/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/optimistic-update/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/pagination/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/polling/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/prefetching-automatic-waterfall/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/prefetching-automatic/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/prefetching/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
4 changes: 2 additions & 2 deletions examples/query/react/with-apiprovider/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
9 changes: 4 additions & 5 deletions packages/rtk-query-codegen-openapi/test/generateEndpoints.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions packages/rtk-query-codegen-openapi/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
}
2 changes: 2 additions & 0 deletions packages/rtk-query-codegen-openapi/vitest.config.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion packages/toolkit/src/query/core/buildInitiate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ You must add the middleware for RTK-Query to function correctly!`,
subscriptionOptions,
[forceQueryFnSymbol]: forceQueryFn,
...rest
} = {}
} = {},
) =>
(dispatch, getState) => {
const queryCacheKey = serializeQueryArgs({
Expand Down
Loading