Merge branch 'main' into docs/main-code-transition

toss · Nov 23, 2024 · 62e5169 · 62e5169
2 parents 297c919 + e4af4a2
commit 62e5169
Show file tree

Hide file tree

Showing 30 changed files with 72 additions and 39 deletions.
diff --git a/configs/tsup/src/index.ts b/configs/tsup/src/index.ts
@@ -11,9 +11,8 @@ export const options: Options = {
 }
 
 export const scriptOptions: Options = {
-  format: ['cjs'],
-  target: ['chrome51', 'firefox53', 'edge18', 'safari11', 'ios11', 'opera38', 'es6', 'node14'],
-  entry: ['src/scripts/*.{ts,tsx}', '!**/*.{spec,test,test-d,bench}.*'],
-  outDir: 'dist/scripts',
-  sourcemap: true,
+  format: 'cjs',
+  target: ['node18'],
+  entry: ['src/bin/*.{ts,tsx}', '!**/*.{spec,test,test-d,bench}.*'],
+  outDir: 'dist/bin',
 }
diff --git a/packages/codemods/CHANGELOG.md b/packages/codemods/CHANGELOG.md
@@ -0,0 +1,7 @@
+# @suspensive/codemods
+
+## 0.1.1
+
+### Patch Changes
+
+- [#1370](https://github.com/toss/suspensive/pull/1370) [`390e82d`](https://github.com/toss/suspensive/commit/390e82d57c30e05201d92aaad3a2bd16b9f57bfe) Thanks [@gwansikk](https://github.com/gwansikk)! - refactor(tsup): update script options
diff --git a/packages/codemods/package.json b/packages/codemods/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/codemods",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Codemods for @suspensive.",
   "keywords": [
     "suspensive",
@@ -42,6 +42,7 @@
   "devDependencies": {
     "@suspensive/eslint-config": "workspace:*",
     "@suspensive/tsconfig": "workspace:*",
+    "@suspensive/tsup": "workspace:*",
     "@types/jscodeshift": "^0.12.0",
     "@types/prompts": "^2.4.9"
   },

diff --git a/packages/codemods/src/transforms/tanstack-query-import.ts b/packages/codemods/src/transforms/tanstack-query-import.ts
@@ -1,5 +1,5 @@
 import type { FileInfo } from 'jscodeshift'
-import { createParserFromPath } from '../utils/createParserFromPath'
+import { createParserFromPath } from './utils/createParserFromPath'
 
 const IMPORT_TO_CHANGE = [
   'useSuspenseQuery',

diff --git a/...ds/src/utils/createParserFromPath.spec.ts → ...sforms/utils/createParserFromPath.spec.ts b/...ds/src/utils/createParserFromPath.spec.ts → ...sforms/utils/createParserFromPath.spec.ts
diff --git a/...odemods/src/utils/createParserFromPath.ts → .../transforms/utils/createParserFromPath.ts b/...odemods/src/utils/createParserFromPath.ts → .../transforms/utils/createParserFromPath.ts
diff --git a/packages/codemods/tsup.config.ts b/packages/codemods/tsup.config.ts
@@ -1,16 +1,13 @@
+import { scriptOptions } from '@suspensive/tsup'
 import { defineConfig } from 'tsup'
 
 export default defineConfig([
   {
-    format: 'cjs',
-    target: ['node18'],
-    entry: ['src/bin/*.{ts,tsx}', '!**/*.{spec,test,test-d,bench}.*'],
-    outDir: 'dist/bin',
+    ...scriptOptions,
     external: ['.bin/jscodeshift'],
   },
   {
-    format: 'cjs',
-    target: ['node18'],
+    ...scriptOptions,
     entry: ['src/transforms/*.{ts,tsx}', '!**/*.{spec,test,test-d,bench}.*'],
     outDir: 'dist/transforms',
   },

diff --git a/packages/jotai/CHANGELOG.md b/packages/jotai/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @suspensive/jotai
 
+## 2.18.7
+
 ## 2.18.6
 
 ### Patch Changes

diff --git a/packages/jotai/package.json b/packages/jotai/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/jotai",
-  "version": "2.18.6",
+  "version": "2.18.7",
   "description": "Suspensive interfaces for jotai",
   "keywords": [
     "suspensive",

diff --git a/packages/react-query-4/CHANGELOG.md b/packages/react-query-4/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @suspensive/react-query-4
 
+## 2.18.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @suspensive/react@2.18.7
+
 ## 2.18.6
 
 ### Patch Changes

diff --git a/packages/react-query-4/package.json b/packages/react-query-4/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/react-query-4",
-  "version": "2.18.6",
+  "version": "2.18.7",
   "description": "Suspensive interfaces for @tanstack/react-query@4",
   "keywords": [
     "suspensive",
@@ -59,7 +59,7 @@
     "react": "catalog:react18"
   },
   "peerDependencies": {
-    "@suspensive/react": "workspace:^2.18.6",
+    "@suspensive/react": "workspace:^2.18.7",
     "@tanstack/react-query": "^4",
     "react": "^18"
   },

diff --git a/packages/react-query-5/CHANGELOG.md b/packages/react-query-5/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @suspensive/react-query-5
 
+## 2.18.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @suspensive/react@2.18.7
+
 ## 2.18.6
 
 ### Patch Changes

diff --git a/packages/react-query-5/package.json b/packages/react-query-5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/react-query-5",
-  "version": "2.18.6",
+  "version": "2.18.7",
   "description": "Suspensive interfaces for @tanstack/react-query@5",
   "keywords": [
     "suspensive",
@@ -59,7 +59,7 @@
     "react": "catalog:react18"
   },
   "peerDependencies": {
-    "@suspensive/react": "workspace:^2.18.6",
+    "@suspensive/react": "workspace:^2.18.7",
     "@tanstack/react-query": "^5",
     "react": "^18"
   },

diff --git a/packages/react-query/CHANGELOG.md b/packages/react-query/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @suspensive/react-query
 
+## 2.18.7
+
+### Patch Changes
+
+- [#1370](https://github.com/toss/suspensive/pull/1370) [`390e82d`](https://github.com/toss/suspensive/commit/390e82d57c30e05201d92aaad3a2bd16b9f57bfe) Thanks [@gwansikk](https://github.com/gwansikk)! - refactor(tsup): update script options
+
+- Updated dependencies []:
+  - @suspensive/react@2.18.7
+  - @suspensive/react-query-4@2.18.7
+  - @suspensive/react-query-5@2.18.7
+
 ## 2.18.6
 
 ### Patch Changes

diff --git a/packages/react-query/package.json b/packages/react-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/react-query",
-  "version": "2.18.6",
+  "version": "2.18.7",
   "description": "Suspensive interfaces for @tanstack/react-query",
   "keywords": [
     "suspensive",
@@ -35,8 +35,8 @@
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
-    "suspensive-react-query": "dist/scripts/cli.cjs",
-    "srq": "dist/scripts/cli.cjs"
+    "suspensive-react-query": "dist/bin/cli.cjs",
+    "srq": "dist/bin/cli.cjs"
   },
   "files": [
     "dist",
@@ -50,14 +50,14 @@
     "ci:test": "vitest run --coverage --typecheck",
     "ci:type": "tsc --noEmit",
     "clean": "rimraf ./dist && rimraf ./coverage",
-    "postinstall": "node -e \"import('./dist/scripts/postinstall.cjs').catch(e => console.error(e))\"",
+    "postinstall": "node ./dist/bin/postinstall.cjs || echo 'please reinstall @suspensive/react-query'",
     "prepack": "pnpm build",
     "test:ui": "vitest --ui --coverage --typecheck"
   },
   "dependencies": {
     "@commander-js/extra-typings": "^12.1.0",
-    "@suspensive/react-query-4": "workspace:^2.18.6",
-    "@suspensive/react-query-5": "workspace:^2.18.6",
+    "@suspensive/react-query-4": "workspace:^2.18.7",
+    "@suspensive/react-query-5": "workspace:^2.18.7",
     "cli-table3": "^0.6.5",
     "commander": "^12.1.0"
   },
@@ -66,12 +66,11 @@
     "@suspensive/react": "workspace:*",
     "@suspensive/tsconfig": "workspace:*",
     "@suspensive/tsup": "workspace:*",
-    "@tanstack/react-query": "catalog:react-query4",
     "@types/react": "catalog:react18",
     "react": "catalog:react18"
   },
   "peerDependencies": {
-    "@suspensive/react": "workspace:^2.18.6",
+    "@suspensive/react": "workspace:^2.18.7",
     "@tanstack/react-query": "^4 || ^5",
     "react": "^18"
   },

diff --git a/packages/react-query/src/scripts/cli.spec.ts → packages/react-query/src/bin/cli.spec.ts b/packages/react-query/src/scripts/cli.spec.ts → packages/react-query/src/bin/cli.spec.ts
@@ -4,7 +4,7 @@ import packageJson from '../../package.json'
 import { getTanStackReactQueryPackageJson } from './utils/package'
 import { getStatusTable } from './utils/table'
 
-const cliPath = path.resolve(__dirname, '../../dist/scripts/cli.cjs')
+const cliPath = path.resolve(__dirname, '../../dist/bin/cli.cjs')
 
 describe('cli', () => {
   it('should display the correct version when using the -v flag', () => {

diff --git a/packages/react-query/src/scripts/cli.ts → packages/react-query/src/bin/cli.ts b/packages/react-query/src/scripts/cli.ts → packages/react-query/src/bin/cli.ts
@@ -1,22 +1,20 @@
 #!/usr/bin/env node
-'use strict'
 
 import { Command } from '@commander-js/extra-typings'
 import { fixAction, statusAction, switchAction } from './utils/commands'
 import { getPackageJson } from './utils/package'
 
 const packageJson = getPackageJson()
-const program = new Command()
+const program = new Command(packageJson.name)
 
 program
-  .name(packageJson.name)
   .description(packageJson.description)
   .version(packageJson.version, '-v, --version', 'Displays the currently installed version of @suspensive/react-query')
 
 program
   .command('status')
   .description('Checks compatibility with the currently used version of @tanstack/react-query')
-  .action(() => statusAction())
+  .action(statusAction)
 
 program
   .command('switch')
@@ -34,6 +32,6 @@ program
   .description(
     "Automatically switch @suspensive/react-query's exports to use compatible Suspensive interfaces for @tanstack/react-query"
   )
-  .action(() => fixAction())
+  .action(fixAction)
 
-program.parse()
+program.parse(process.argv)
diff --git a/...es/react-query/src/scripts/postinstall.ts → packages/react-query/src/bin/postinstall.ts b/...es/react-query/src/scripts/postinstall.ts → packages/react-query/src/bin/postinstall.ts
diff --git a/...-query/src/scripts/utils/commands.spec.ts → ...eact-query/src/bin/utils/commands.spec.ts b/...-query/src/scripts/utils/commands.spec.ts → ...eact-query/src/bin/utils/commands.spec.ts
diff --git a/...react-query/src/scripts/utils/commands.ts → ...ges/react-query/src/bin/utils/commands.ts b/...react-query/src/scripts/utils/commands.ts → ...ges/react-query/src/bin/utils/commands.ts
diff --git a/...eact-query/src/scripts/utils/copy.spec.ts → ...es/react-query/src/bin/utils/copy.spec.ts b/...eact-query/src/scripts/utils/copy.spec.ts → ...es/react-query/src/bin/utils/copy.spec.ts
diff --git a/...ges/react-query/src/scripts/utils/copy.ts → packages/react-query/src/bin/utils/copy.ts b/...ges/react-query/src/scripts/utils/copy.ts → packages/react-query/src/bin/utils/copy.ts
diff --git a/...t-query/src/scripts/utils/package.spec.ts → ...react-query/src/bin/utils/package.spec.ts b/...t-query/src/scripts/utils/package.spec.ts → ...react-query/src/bin/utils/package.spec.ts
diff --git a/.../react-query/src/scripts/utils/package.ts → ...ages/react-query/src/bin/utils/package.ts b/.../react-query/src/scripts/utils/package.ts → ...ages/react-query/src/bin/utils/package.ts
diff --git a/...y/src/scripts/utils/switchVersion.spec.ts → ...query/src/bin/utils/switchVersion.spec.ts b/...y/src/scripts/utils/switchVersion.spec.ts → ...query/src/bin/utils/switchVersion.spec.ts
diff --git a/...-query/src/scripts/utils/switchVersion.ts → ...eact-query/src/bin/utils/switchVersion.ts b/...-query/src/scripts/utils/switchVersion.ts → ...eact-query/src/bin/utils/switchVersion.ts
diff --git a/...es/react-query/src/scripts/utils/table.ts → packages/react-query/src/bin/utils/table.ts b/...es/react-query/src/scripts/utils/table.ts → packages/react-query/src/bin/utils/table.ts
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @suspensive/react
 
+## 2.18.7
+
 ## 2.18.6
 
 ### Patch Changes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@suspensive/react",
-  "version": "2.18.6",
+  "version": "2.18.7",
   "description": "Suspensive interface for react",
   "keywords": [
     "suspensive",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml