Skip to content

Commit

Permalink
Merge pull request #4190 from aryaemami59/reformat-files
Browse files Browse the repository at this point in the history
Remove trailing commas in `tsconfig.json` files of all CodesandBox examples
  • Loading branch information
EskiMojo14 committed Feb 12, 2024
2 parents 8eff730 + 5aa2594 commit 6f4194d
Show file tree
Hide file tree
Showing 28 changed files with 60 additions and 53 deletions.
8 changes: 7 additions & 1 deletion .prettierrc.json
@@ -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
Binary file not shown.
4 changes: 2 additions & 2 deletions examples/action-listener/counter/tsconfig.json
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
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
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
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
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
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
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
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
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
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
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
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
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
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
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
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
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
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
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
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
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
Expand Up @@ -15,6 +15,6 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
},
"noEmit": true
}
}
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
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
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
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

0 comments on commit 6f4194d

Please sign in to comment.