From 7319a49dcbf0e86408fbbadd760b1e7dc88b6da1 Mon Sep 17 00:00:00 2001 From: Anton Jeppsson Date: Wed, 24 Apr 2024 16:45:34 +0200 Subject: [PATCH 1/4] bug(codemods): rename CommonJS files to .cjs Rename CommonJS files in codemods to distinguish them from ES module files otherwise used in this project. Resolve an issue occuring since package.json in codemods is removed when publishing causing module type data to be lost. Fix issue #7154 --- packages/query-codemods/src/utils/{index.js => index.cjs} | 0 .../{query-cache-transformer.js => query-cache-transformer.cjs} | 0 .../{query-client-transformer.js => query-client-transformer.cjs} | 0 ...e-query-like-transformer.js => use-query-like-transformer.cjs} | 0 .../{key-transformation.test.js => key-transformation.test.cjs} | 0 ...import-specifier.test.js => replace-import-specifier.test.cjs} | 0 .../src/v4/{key-transformation.js => key-transformation.cjs} | 0 .../{replace-import-specifier.js => replace-import-specifier.cjs} | 0 .../src/v4/utils/replacers/{key-replacer.js => key-replacer.cjs} | 0 .../__tests__/{is-loading.test.js => is-loading.test.cjs} | 0 .../src/v5/is-loading/{is-loading.js => is-loading.cjs} | 0 .../{keep-previous-data.test.js => keep-previous-data.test.cjs} | 0 .../{keep-previous-data.js => keep-previous-data.cjs} | 0 ...data-property.js => already-has-placeholder-data-property.cjs} | 0 .../{remove-overloads.test.js => remove-overloads.test.cjs} | 0 .../{remove-overloads.js => remove-overloads.cjs} | 0 ...re-usage-transformer.js => filter-aware-usage-transformer.cjs} | 0 ...-usage-transformer.js => query-fn-aware-usage-transformer.cjs} | 0 .../src/v5/remove-overloads/utils/{index.js => index.cjs} | 0 .../utils/{unknown-usage-error.js => unknown-usage-error.cjs} | 0 .../__tests__/{rename-hydrate.test.js => rename-hydrate.test.cjs} | 0 .../v5/rename-hydrate/{rename-hydrate.js => rename-hydrate.cjs} | 0 .../{rename-properties.test.js => rename-properties.test.cjs} | 0 .../{rename-properties.js => rename-properties.cjs} | 0 24 files changed, 0 insertions(+), 0 deletions(-) rename packages/query-codemods/src/utils/{index.js => index.cjs} (100%) rename packages/query-codemods/src/utils/transformers/{query-cache-transformer.js => query-cache-transformer.cjs} (100%) rename packages/query-codemods/src/utils/transformers/{query-client-transformer.js => query-client-transformer.cjs} (100%) rename packages/query-codemods/src/utils/transformers/{use-query-like-transformer.js => use-query-like-transformer.cjs} (100%) rename packages/query-codemods/src/v4/__tests__/{key-transformation.test.js => key-transformation.test.cjs} (100%) rename packages/query-codemods/src/v4/__tests__/{replace-import-specifier.test.js => replace-import-specifier.test.cjs} (100%) rename packages/query-codemods/src/v4/{key-transformation.js => key-transformation.cjs} (100%) rename packages/query-codemods/src/v4/{replace-import-specifier.js => replace-import-specifier.cjs} (100%) rename packages/query-codemods/src/v4/utils/replacers/{key-replacer.js => key-replacer.cjs} (100%) rename packages/query-codemods/src/v5/is-loading/__tests__/{is-loading.test.js => is-loading.test.cjs} (100%) rename packages/query-codemods/src/v5/is-loading/{is-loading.js => is-loading.cjs} (100%) rename packages/query-codemods/src/v5/keep-previous-data/__tests__/{keep-previous-data.test.js => keep-previous-data.test.cjs} (100%) rename packages/query-codemods/src/v5/keep-previous-data/{keep-previous-data.js => keep-previous-data.cjs} (100%) rename packages/query-codemods/src/v5/keep-previous-data/utils/{already-has-placeholder-data-property.js => already-has-placeholder-data-property.cjs} (100%) rename packages/query-codemods/src/v5/remove-overloads/__tests__/{remove-overloads.test.js => remove-overloads.test.cjs} (100%) rename packages/query-codemods/src/v5/remove-overloads/{remove-overloads.js => remove-overloads.cjs} (100%) rename packages/query-codemods/src/v5/remove-overloads/transformers/{filter-aware-usage-transformer.js => filter-aware-usage-transformer.cjs} (100%) rename packages/query-codemods/src/v5/remove-overloads/transformers/{query-fn-aware-usage-transformer.js => query-fn-aware-usage-transformer.cjs} (100%) rename packages/query-codemods/src/v5/remove-overloads/utils/{index.js => index.cjs} (100%) rename packages/query-codemods/src/v5/remove-overloads/utils/{unknown-usage-error.js => unknown-usage-error.cjs} (100%) rename packages/query-codemods/src/v5/rename-hydrate/__tests__/{rename-hydrate.test.js => rename-hydrate.test.cjs} (100%) rename packages/query-codemods/src/v5/rename-hydrate/{rename-hydrate.js => rename-hydrate.cjs} (100%) rename packages/query-codemods/src/v5/rename-properties/__tests__/{rename-properties.test.js => rename-properties.test.cjs} (100%) rename packages/query-codemods/src/v5/rename-properties/{rename-properties.js => rename-properties.cjs} (100%) diff --git a/packages/query-codemods/src/utils/index.js b/packages/query-codemods/src/utils/index.cjs similarity index 100% rename from packages/query-codemods/src/utils/index.js rename to packages/query-codemods/src/utils/index.cjs diff --git a/packages/query-codemods/src/utils/transformers/query-cache-transformer.js b/packages/query-codemods/src/utils/transformers/query-cache-transformer.cjs similarity index 100% rename from packages/query-codemods/src/utils/transformers/query-cache-transformer.js rename to packages/query-codemods/src/utils/transformers/query-cache-transformer.cjs diff --git a/packages/query-codemods/src/utils/transformers/query-client-transformer.js b/packages/query-codemods/src/utils/transformers/query-client-transformer.cjs similarity index 100% rename from packages/query-codemods/src/utils/transformers/query-client-transformer.js rename to packages/query-codemods/src/utils/transformers/query-client-transformer.cjs diff --git a/packages/query-codemods/src/utils/transformers/use-query-like-transformer.js b/packages/query-codemods/src/utils/transformers/use-query-like-transformer.cjs similarity index 100% rename from packages/query-codemods/src/utils/transformers/use-query-like-transformer.js rename to packages/query-codemods/src/utils/transformers/use-query-like-transformer.cjs diff --git a/packages/query-codemods/src/v4/__tests__/key-transformation.test.js b/packages/query-codemods/src/v4/__tests__/key-transformation.test.cjs similarity index 100% rename from packages/query-codemods/src/v4/__tests__/key-transformation.test.js rename to packages/query-codemods/src/v4/__tests__/key-transformation.test.cjs diff --git a/packages/query-codemods/src/v4/__tests__/replace-import-specifier.test.js b/packages/query-codemods/src/v4/__tests__/replace-import-specifier.test.cjs similarity index 100% rename from packages/query-codemods/src/v4/__tests__/replace-import-specifier.test.js rename to packages/query-codemods/src/v4/__tests__/replace-import-specifier.test.cjs diff --git a/packages/query-codemods/src/v4/key-transformation.js b/packages/query-codemods/src/v4/key-transformation.cjs similarity index 100% rename from packages/query-codemods/src/v4/key-transformation.js rename to packages/query-codemods/src/v4/key-transformation.cjs diff --git a/packages/query-codemods/src/v4/replace-import-specifier.js b/packages/query-codemods/src/v4/replace-import-specifier.cjs similarity index 100% rename from packages/query-codemods/src/v4/replace-import-specifier.js rename to packages/query-codemods/src/v4/replace-import-specifier.cjs diff --git a/packages/query-codemods/src/v4/utils/replacers/key-replacer.js b/packages/query-codemods/src/v4/utils/replacers/key-replacer.cjs similarity index 100% rename from packages/query-codemods/src/v4/utils/replacers/key-replacer.js rename to packages/query-codemods/src/v4/utils/replacers/key-replacer.cjs diff --git a/packages/query-codemods/src/v5/is-loading/__tests__/is-loading.test.js b/packages/query-codemods/src/v5/is-loading/__tests__/is-loading.test.cjs similarity index 100% rename from packages/query-codemods/src/v5/is-loading/__tests__/is-loading.test.js rename to packages/query-codemods/src/v5/is-loading/__tests__/is-loading.test.cjs diff --git a/packages/query-codemods/src/v5/is-loading/is-loading.js b/packages/query-codemods/src/v5/is-loading/is-loading.cjs similarity index 100% rename from packages/query-codemods/src/v5/is-loading/is-loading.js rename to packages/query-codemods/src/v5/is-loading/is-loading.cjs diff --git a/packages/query-codemods/src/v5/keep-previous-data/__tests__/keep-previous-data.test.js b/packages/query-codemods/src/v5/keep-previous-data/__tests__/keep-previous-data.test.cjs similarity index 100% rename from packages/query-codemods/src/v5/keep-previous-data/__tests__/keep-previous-data.test.js rename to packages/query-codemods/src/v5/keep-previous-data/__tests__/keep-previous-data.test.cjs diff --git a/packages/query-codemods/src/v5/keep-previous-data/keep-previous-data.js b/packages/query-codemods/src/v5/keep-previous-data/keep-previous-data.cjs similarity index 100% rename from packages/query-codemods/src/v5/keep-previous-data/keep-previous-data.js rename to packages/query-codemods/src/v5/keep-previous-data/keep-previous-data.cjs diff --git a/packages/query-codemods/src/v5/keep-previous-data/utils/already-has-placeholder-data-property.js b/packages/query-codemods/src/v5/keep-previous-data/utils/already-has-placeholder-data-property.cjs similarity index 100% rename from packages/query-codemods/src/v5/keep-previous-data/utils/already-has-placeholder-data-property.js rename to packages/query-codemods/src/v5/keep-previous-data/utils/already-has-placeholder-data-property.cjs diff --git a/packages/query-codemods/src/v5/remove-overloads/__tests__/remove-overloads.test.js b/packages/query-codemods/src/v5/remove-overloads/__tests__/remove-overloads.test.cjs similarity index 100% rename from packages/query-codemods/src/v5/remove-overloads/__tests__/remove-overloads.test.js rename to packages/query-codemods/src/v5/remove-overloads/__tests__/remove-overloads.test.cjs diff --git a/packages/query-codemods/src/v5/remove-overloads/remove-overloads.js b/packages/query-codemods/src/v5/remove-overloads/remove-overloads.cjs similarity index 100% rename from packages/query-codemods/src/v5/remove-overloads/remove-overloads.js rename to packages/query-codemods/src/v5/remove-overloads/remove-overloads.cjs diff --git a/packages/query-codemods/src/v5/remove-overloads/transformers/filter-aware-usage-transformer.js b/packages/query-codemods/src/v5/remove-overloads/transformers/filter-aware-usage-transformer.cjs similarity index 100% rename from packages/query-codemods/src/v5/remove-overloads/transformers/filter-aware-usage-transformer.js rename to packages/query-codemods/src/v5/remove-overloads/transformers/filter-aware-usage-transformer.cjs diff --git a/packages/query-codemods/src/v5/remove-overloads/transformers/query-fn-aware-usage-transformer.js b/packages/query-codemods/src/v5/remove-overloads/transformers/query-fn-aware-usage-transformer.cjs similarity index 100% rename from packages/query-codemods/src/v5/remove-overloads/transformers/query-fn-aware-usage-transformer.js rename to packages/query-codemods/src/v5/remove-overloads/transformers/query-fn-aware-usage-transformer.cjs diff --git a/packages/query-codemods/src/v5/remove-overloads/utils/index.js b/packages/query-codemods/src/v5/remove-overloads/utils/index.cjs similarity index 100% rename from packages/query-codemods/src/v5/remove-overloads/utils/index.js rename to packages/query-codemods/src/v5/remove-overloads/utils/index.cjs diff --git a/packages/query-codemods/src/v5/remove-overloads/utils/unknown-usage-error.js b/packages/query-codemods/src/v5/remove-overloads/utils/unknown-usage-error.cjs similarity index 100% rename from packages/query-codemods/src/v5/remove-overloads/utils/unknown-usage-error.js rename to packages/query-codemods/src/v5/remove-overloads/utils/unknown-usage-error.cjs diff --git a/packages/query-codemods/src/v5/rename-hydrate/__tests__/rename-hydrate.test.js b/packages/query-codemods/src/v5/rename-hydrate/__tests__/rename-hydrate.test.cjs similarity index 100% rename from packages/query-codemods/src/v5/rename-hydrate/__tests__/rename-hydrate.test.js rename to packages/query-codemods/src/v5/rename-hydrate/__tests__/rename-hydrate.test.cjs diff --git a/packages/query-codemods/src/v5/rename-hydrate/rename-hydrate.js b/packages/query-codemods/src/v5/rename-hydrate/rename-hydrate.cjs similarity index 100% rename from packages/query-codemods/src/v5/rename-hydrate/rename-hydrate.js rename to packages/query-codemods/src/v5/rename-hydrate/rename-hydrate.cjs diff --git a/packages/query-codemods/src/v5/rename-properties/__tests__/rename-properties.test.js b/packages/query-codemods/src/v5/rename-properties/__tests__/rename-properties.test.cjs similarity index 100% rename from packages/query-codemods/src/v5/rename-properties/__tests__/rename-properties.test.js rename to packages/query-codemods/src/v5/rename-properties/__tests__/rename-properties.test.cjs diff --git a/packages/query-codemods/src/v5/rename-properties/rename-properties.js b/packages/query-codemods/src/v5/rename-properties/rename-properties.cjs similarity index 100% rename from packages/query-codemods/src/v5/rename-properties/rename-properties.js rename to packages/query-codemods/src/v5/rename-properties/rename-properties.cjs From 4a6c15c60b5343424df8cb0019d6d0efac13f82f Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Thu, 25 Apr 2024 11:51:51 +1000 Subject: [PATCH 2/4] Fix knip errors --- knip.json | 2 +- packages/query-codemods/src/v4/key-transformation.cjs | 10 +++++----- .../query-codemods/src/v5/is-loading/is-loading.cjs | 6 +++--- .../src/v5/keep-previous-data/keep-previous-data.cjs | 8 ++++---- .../src/v5/remove-overloads/remove-overloads.cjs | 6 +++--- .../transformers/filter-aware-usage-transformer.cjs | 10 +++++----- .../transformers/query-fn-aware-usage-transformer.cjs | 6 +++--- .../src/v5/remove-overloads/utils/index.cjs | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/knip.json b/knip.json index b5c8fe09139..adf7dfcb9c3 100644 --- a/knip.json +++ b/knip.json @@ -3,7 +3,7 @@ "ignoreWorkspaces": ["examples/**", "integrations/**"], "workspaces": { "packages/query-codemods": { - "entry": ["src/v4/*.js", "src/v5/*/*.js"], + "entry": ["src/v4/**/*.cjs", "src/v5/**/*.cjs"], "ignore": ["**/__testfixtures__/**"] }, "packages/vue-query": { diff --git a/packages/query-codemods/src/v4/key-transformation.cjs b/packages/query-codemods/src/v4/key-transformation.cjs index e6c6766d430..cdb20625c4b 100644 --- a/packages/query-codemods/src/v4/key-transformation.cjs +++ b/packages/query-codemods/src/v4/key-transformation.cjs @@ -1,13 +1,13 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires -const createUtilsObject = require('../utils') +const createUtilsObject = require('../utils/index.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createKeyReplacer = require('./utils/replacers/key-replacer') +const createKeyReplacer = require('./utils/replacers/key-replacer.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createUseQueryLikeTransformer = require('../utils/transformers/use-query-like-transformer') +const createUseQueryLikeTransformer = require('../utils/transformers/use-query-like-transformer.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createQueryClientTransformer = require('../utils/transformers/query-client-transformer') +const createQueryClientTransformer = require('../utils/transformers/query-client-transformer.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createQueryCacheTransformer = require('../utils/transformers/query-cache-transformer') +const createQueryCacheTransformer = require('../utils/transformers/query-cache-transformer.cjs') const transformQueryClientUsages = ({ jscodeshift, diff --git a/packages/query-codemods/src/v5/is-loading/is-loading.cjs b/packages/query-codemods/src/v5/is-loading/is-loading.cjs index ca1e98f5d4d..acf7e3fa803 100644 --- a/packages/query-codemods/src/v5/is-loading/is-loading.cjs +++ b/packages/query-codemods/src/v5/is-loading/is-loading.cjs @@ -1,9 +1,9 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires -const createUtilsObject = require('../../utils') +const createUtilsObject = require('../../utils/index.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createUseQueryLikeTransformer = require('../../utils/transformers/use-query-like-transformer') +const createUseQueryLikeTransformer = require('../../utils/transformers/use-query-like-transformer.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createQueryClientTransformer = require('../../utils/transformers/query-client-transformer') +const createQueryClientTransformer = require('../../utils/transformers/query-client-transformer.cjs') const originalName = 'isLoading' const newName = 'isPending' diff --git a/packages/query-codemods/src/v5/keep-previous-data/keep-previous-data.cjs b/packages/query-codemods/src/v5/keep-previous-data/keep-previous-data.cjs index 5b2a9553a9e..7d438495ae2 100644 --- a/packages/query-codemods/src/v5/keep-previous-data/keep-previous-data.cjs +++ b/packages/query-codemods/src/v5/keep-previous-data/keep-previous-data.cjs @@ -1,11 +1,11 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires -const createUtilsObject = require('../../utils') +const createUtilsObject = require('../../utils/index.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createUseQueryLikeTransformer = require('../../utils/transformers/use-query-like-transformer') +const createUseQueryLikeTransformer = require('../../utils/transformers/use-query-like-transformer.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createQueryClientTransformer = require('../../utils/transformers/query-client-transformer') +const createQueryClientTransformer = require('../../utils/transformers/query-client-transformer.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const AlreadyHasPlaceholderDataProperty = require('./utils/already-has-placeholder-data-property') +const AlreadyHasPlaceholderDataProperty = require('./utils/already-has-placeholder-data-property.cjs') /** * @param {import('jscodeshift')} jscodeshift diff --git a/packages/query-codemods/src/v5/remove-overloads/remove-overloads.cjs b/packages/query-codemods/src/v5/remove-overloads/remove-overloads.cjs index 10ecd37dca2..9c3ce671660 100644 --- a/packages/query-codemods/src/v5/remove-overloads/remove-overloads.cjs +++ b/packages/query-codemods/src/v5/remove-overloads/remove-overloads.cjs @@ -1,9 +1,9 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires -const createUtilsObject = require('../../utils') +const createUtilsObject = require('../../utils/index.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const transformFilterAwareUsages = require('./transformers/filter-aware-usage-transformer') +const transformFilterAwareUsages = require('./transformers/filter-aware-usage-transformer.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const transformQueryFnAwareUsages = require('./transformers/query-fn-aware-usage-transformer') +const transformQueryFnAwareUsages = require('./transformers/query-fn-aware-usage-transformer.cjs') module.exports = (file, api) => { const jscodeshift = api.jscodeshift diff --git a/packages/query-codemods/src/v5/remove-overloads/transformers/filter-aware-usage-transformer.cjs b/packages/query-codemods/src/v5/remove-overloads/transformers/filter-aware-usage-transformer.cjs index 66e37b1e3fb..f7056f94b14 100644 --- a/packages/query-codemods/src/v5/remove-overloads/transformers/filter-aware-usage-transformer.cjs +++ b/packages/query-codemods/src/v5/remove-overloads/transformers/filter-aware-usage-transformer.cjs @@ -1,13 +1,13 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires -const createV5UtilsObject = require('../utils') +const createV5UtilsObject = require('../utils/index.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const UnknownUsageError = require('../utils/unknown-usage-error') +const UnknownUsageError = require('../utils/unknown-usage-error.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createQueryClientTransformer = require('../../../utils/transformers/query-client-transformer') +const createQueryClientTransformer = require('../../../utils/transformers/query-client-transformer.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createQueryCacheTransformer = require('../../../utils/transformers/query-cache-transformer') +const createQueryCacheTransformer = require('../../../utils/transformers/query-cache-transformer.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createUseQueryLikeTransformer = require('../../../utils/transformers/use-query-like-transformer') +const createUseQueryLikeTransformer = require('../../../utils/transformers/use-query-like-transformer.cjs') /** * @param {import('jscodeshift').api} jscodeshift diff --git a/packages/query-codemods/src/v5/remove-overloads/transformers/query-fn-aware-usage-transformer.cjs b/packages/query-codemods/src/v5/remove-overloads/transformers/query-fn-aware-usage-transformer.cjs index 77238d2caa3..d7fde1d4d7a 100644 --- a/packages/query-codemods/src/v5/remove-overloads/transformers/query-fn-aware-usage-transformer.cjs +++ b/packages/query-codemods/src/v5/remove-overloads/transformers/query-fn-aware-usage-transformer.cjs @@ -1,9 +1,9 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires -const createV5UtilsObject = require('../utils') +const createV5UtilsObject = require('../utils/index.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const UnknownUsageError = require('../utils/unknown-usage-error') +const UnknownUsageError = require('../utils/unknown-usage-error.cjs') // eslint-disable-next-line @typescript-eslint/no-var-requires -const createQueryClientTransformer = require('../../../utils/transformers/query-client-transformer') +const createQueryClientTransformer = require('../../../utils/transformers/query-client-transformer.cjs') /** * @param {import('jscodeshift').api} jscodeshift diff --git a/packages/query-codemods/src/v5/remove-overloads/utils/index.cjs b/packages/query-codemods/src/v5/remove-overloads/utils/index.cjs index 88512fd61e4..469964d1f4c 100644 --- a/packages/query-codemods/src/v5/remove-overloads/utils/index.cjs +++ b/packages/query-codemods/src/v5/remove-overloads/utils/index.cjs @@ -1,5 +1,5 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires -const UnknownUsageError = require('./unknown-usage-error') +const UnknownUsageError = require('./unknown-usage-error.cjs') module.exports = ({ jscodeshift, utils }) => { /** From 788728e91e883bc53653b80d4d927e89d6438f9c Mon Sep 17 00:00:00 2001 From: Anton Jeppsson Date: Thu, 25 Apr 2024 08:51:44 +0200 Subject: [PATCH 3/4] Add file extension to tests --- .../v4/__tests__/key-transformation.test.cjs | 22 ++++++++++++------- .../replace-import-specifier.test.cjs | 2 +- .../is-loading/__tests__/is-loading.test.cjs | 4 ++-- .../__tests__/keep-previous-data.test.cjs | 4 ++-- .../__tests__/remove-overloads.test.cjs | 4 ++-- .../__tests__/rename-hydrate.test.cjs | 4 ++-- .../__tests__/rename-properties.test.cjs | 14 ++++++++---- 7 files changed, 33 insertions(+), 21 deletions(-) diff --git a/packages/query-codemods/src/v4/__tests__/key-transformation.test.cjs b/packages/query-codemods/src/v4/__tests__/key-transformation.test.cjs index f66cd382048..5d5cdafa68f 100644 --- a/packages/query-codemods/src/v4/__tests__/key-transformation.test.cjs +++ b/packages/query-codemods/src/v4/__tests__/key-transformation.test.cjs @@ -1,25 +1,31 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires const defineTest = require('jscodeshift/dist/testUtils').defineTest -defineTest(__dirname, 'key-transformation', null, 'default-import', { +defineTest(__dirname, 'key-transformation.cjs', null, 'default-import', { parser: 'tsx', }) -defineTest(__dirname, 'key-transformation', null, 'named-import', { +defineTest(__dirname, 'key-transformation.cjs', null, 'named-import', { parser: 'tsx', }) -defineTest(__dirname, 'key-transformation', null, 'namespaced-import', { +defineTest(__dirname, 'key-transformation.cjs', null, 'namespaced-import', { parser: 'tsx', }) -defineTest(__dirname, 'key-transformation', null, 'parameter-is-identifier', { - parser: 'tsx', -}) +defineTest( + __dirname, + 'key-transformation.cjs', + null, + 'parameter-is-identifier', + { + parser: 'tsx', + }, +) defineTest( __dirname, - 'key-transformation', + 'key-transformation.cjs', null, 'parameter-is-object-expression', { @@ -27,6 +33,6 @@ defineTest( }, ) -defineTest(__dirname, 'key-transformation', null, 'type-arguments', { +defineTest(__dirname, 'key-transformation.cjs', null, 'type-arguments', { parser: 'tsx', }) diff --git a/packages/query-codemods/src/v4/__tests__/replace-import-specifier.test.cjs b/packages/query-codemods/src/v4/__tests__/replace-import-specifier.test.cjs index f51ac94ee4a..26b3418d68b 100644 --- a/packages/query-codemods/src/v4/__tests__/replace-import-specifier.test.cjs +++ b/packages/query-codemods/src/v4/__tests__/replace-import-specifier.test.cjs @@ -3,7 +3,7 @@ const defineTest = require('jscodeshift/dist/testUtils').defineTest defineTest( __dirname, - 'replace-import-specifier', + 'replace-import-specifier.cjs', null, 'replace-import-specifier', { diff --git a/packages/query-codemods/src/v5/is-loading/__tests__/is-loading.test.cjs b/packages/query-codemods/src/v5/is-loading/__tests__/is-loading.test.cjs index 0aaa7193d7f..b474bfa9a95 100644 --- a/packages/query-codemods/src/v5/is-loading/__tests__/is-loading.test.cjs +++ b/packages/query-codemods/src/v5/is-loading/__tests__/is-loading.test.cjs @@ -1,10 +1,10 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires const defineTest = require('jscodeshift/dist/testUtils').defineTest -defineTest(__dirname, 'is-loading', null, 'default-import', { +defineTest(__dirname, 'is-loading.cjs', null, 'default-import', { parser: 'tsx', }) -defineTest(__dirname, 'is-loading', null, 'named-import', { +defineTest(__dirname, 'is-loading.cjs', null, 'named-import', { parser: 'tsx', }) diff --git a/packages/query-codemods/src/v5/keep-previous-data/__tests__/keep-previous-data.test.cjs b/packages/query-codemods/src/v5/keep-previous-data/__tests__/keep-previous-data.test.cjs index 5394bb8cc61..433a46752e2 100644 --- a/packages/query-codemods/src/v5/keep-previous-data/__tests__/keep-previous-data.test.cjs +++ b/packages/query-codemods/src/v5/keep-previous-data/__tests__/keep-previous-data.test.cjs @@ -1,10 +1,10 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires const defineTest = require('jscodeshift/dist/testUtils').defineTest -defineTest(__dirname, 'keep-previous-data', null, 'default', { +defineTest(__dirname, 'keep-previous-data.cjs', null, 'default', { parser: 'tsx', }) -defineTest(__dirname, 'keep-previous-data', null, 'named', { +defineTest(__dirname, 'keep-previous-data.cjs', null, 'named', { parser: 'tsx', }) diff --git a/packages/query-codemods/src/v5/remove-overloads/__tests__/remove-overloads.test.cjs b/packages/query-codemods/src/v5/remove-overloads/__tests__/remove-overloads.test.cjs index c37eef718e0..bb83a140350 100644 --- a/packages/query-codemods/src/v5/remove-overloads/__tests__/remove-overloads.test.cjs +++ b/packages/query-codemods/src/v5/remove-overloads/__tests__/remove-overloads.test.cjs @@ -1,10 +1,10 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires const defineTest = require('jscodeshift/dist/testUtils').defineTest -defineTest(__dirname, 'remove-overloads', null, 'default-import', { +defineTest(__dirname, 'remove-overloads.cjs', null, 'default-import', { parser: 'tsx', }) -defineTest(__dirname, 'remove-overloads', null, 'bug-reports', { +defineTest(__dirname, 'remove-overloads.cjs', null, 'bug-reports', { parser: 'tsx', }) diff --git a/packages/query-codemods/src/v5/rename-hydrate/__tests__/rename-hydrate.test.cjs b/packages/query-codemods/src/v5/rename-hydrate/__tests__/rename-hydrate.test.cjs index 600e8525539..53ed74a496a 100644 --- a/packages/query-codemods/src/v5/rename-hydrate/__tests__/rename-hydrate.test.cjs +++ b/packages/query-codemods/src/v5/rename-hydrate/__tests__/rename-hydrate.test.cjs @@ -1,10 +1,10 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires const defineTest = require('jscodeshift/dist/testUtils').defineTest -defineTest(__dirname, 'rename-hydrate', null, 'default-import', { +defineTest(__dirname, 'rename-hydrate.cjs', null, 'default-import', { parser: 'tsx', }) -defineTest(__dirname, 'rename-hydrate', null, 'named-import', { +defineTest(__dirname, 'rename-hydrate.cjs', null, 'named-import', { parser: 'tsx', }) diff --git a/packages/query-codemods/src/v5/rename-properties/__tests__/rename-properties.test.cjs b/packages/query-codemods/src/v5/rename-properties/__tests__/rename-properties.test.cjs index 31a14fdfa27..8a214e85df3 100644 --- a/packages/query-codemods/src/v5/rename-properties/__tests__/rename-properties.test.cjs +++ b/packages/query-codemods/src/v5/rename-properties/__tests__/rename-properties.test.cjs @@ -1,10 +1,16 @@ // eslint-disable-next-line @typescript-eslint/no-var-requires const defineTest = require('jscodeshift/dist/testUtils').defineTest -defineTest(__dirname, 'rename-properties', null, 'rename-cache-time', { +defineTest(__dirname, 'rename-properties.cjs', null, 'rename-cache-time', { parser: 'tsx', }) -defineTest(__dirname, 'rename-properties', null, 'rename-use-error-boundary', { - parser: 'tsx', -}) +defineTest( + __dirname, + 'rename-properties.cjs', + null, + 'rename-use-error-boundary', + { + parser: 'tsx', + }, +) From 32477e8a27688b62ed1e22f23cba90ba9e5a1e08 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Thu, 25 Apr 2024 17:01:02 +1000 Subject: [PATCH 4/4] Update migration doc --- docs/framework/react/guides/migrating-to-v5.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/framework/react/guides/migrating-to-v5.md b/docs/framework/react/guides/migrating-to-v5.md index b2ffc37db99..aa6ea1a7418 100644 --- a/docs/framework/react/guides/migrating-to-v5.md +++ b/docs/framework/react/guides/migrating-to-v5.md @@ -91,7 +91,7 @@ If you want to run it against `.js` or `.jsx` files, please use the command belo ``` npx jscodeshift@latest ./path/to/src/ \ --extensions=js,jsx \ - --transform=./node_modules/@tanstack/react-query/build/codemods/src/v5/remove-overloads/remove-overloads.js + --transform=./node_modules/@tanstack/react-query/build/codemods/src/v5/remove-overloads/remove-overloads.cjs ``` If you want to run it against `.ts` or `.tsx` files, please use the command below: @@ -100,7 +100,7 @@ If you want to run it against `.ts` or `.tsx` files, please use the command belo npx jscodeshift@latest ./path/to/src/ \ --extensions=ts,tsx \ --parser=tsx \ - --transform=./node_modules/@tanstack/react-query/build/codemods/src/v5/remove-overloads/remove-overloads.js + --transform=./node_modules/@tanstack/react-query/build/codemods/src/v5/remove-overloads/remove-overloads.cjs ``` Please note in the case of `TypeScript` you need to use `tsx` as the parser; otherwise, the codemod won't be applied properly!