Merge branch 'main' into react/feat/wrap

toss · Nov 6, 2023 · 8273979 · 8273979
2 parents 95cb71e + 3fc3249
commit 8273979
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 35 deletions.
diff --git a/configs/eslint-config-ts/noimport.js b/configs/eslint-config-ts/noimport.js
@@ -16,5 +16,7 @@ module.exports = {
     'jsdoc/require-returns': 'off',
     'jsdoc/require-jsdoc': 'off',
     'jsdoc/check-param-names': 'error',
+    'jsdoc/check-tag-names': 'off',
+    'jsdoc/no-types': 'off',
   },
 }
diff --git a/configs/tsup/.eslintrc.cjs b/configs/tsup/.eslintrc.cjs
@@ -2,5 +2,4 @@
 module.exports = {
   root: true,
   extends: ['@suspensive/eslint-config-ts'],
-  ignorePatterns: ['*.js*', 'dist', 'coverage'],
 }
diff --git a/configs/tsup/package.json b/configs/tsup/package.json
@@ -2,13 +2,10 @@
   "name": "@suspensive/tsup",
   "version": "0.0.0",
   "private": true,
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "type": "module",
+  "main": "src/index.js",
+  "types": "src/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "clean": "rimraf ./dist",
-    "lint": "eslint .",
-    "prepack": "pnpm build",
-    "type:check": "tsc --noEmit"
+    "lint": "eslint ."
   }
 }
diff --git a/configs/tsup/src/index.d.ts b/configs/tsup/src/index.d.ts
@@ -0,0 +1,2 @@
+import type { Options } from 'tsup'
+export declare const options: Options
diff --git a/configs/tsup/src/index.ts → configs/tsup/src/index.js b/configs/tsup/src/index.ts → configs/tsup/src/index.js
@@ -1,6 +1,5 @@
-import type { Options } from 'tsup'
-
-export const options: Options = {
+/** @type {import('tsup').Options} */
+export const options = {
   banner: { js: '"use client"' },
   format: ['cjs', 'esm'],
   entry: ['src/*.{ts,tsx}', '!**/*.{spec,test,test-d}.*'],

diff --git a/configs/tsup/tsconfig.json b/configs/tsup/tsconfig.json
diff --git a/configs/vitest/.eslintrc.cjs b/configs/vitest/.eslintrc.cjs
@@ -2,5 +2,4 @@
 module.exports = {
   root: true,
   extends: ['@suspensive/eslint-config-ts'],
-  ignorePatterns: ['*.js*', 'dist', 'coverage'],
 }
diff --git a/configs/vitest/package.json b/configs/vitest/package.json
@@ -2,13 +2,10 @@
   "name": "@suspensive/vitest",
   "version": "0.0.0",
   "private": true,
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "type": "module",
+  "main": "src/index.js",
+  "types": "src/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "clean": "rimraf ./dist",
-    "lint": "eslint .",
-    "prepack": "pnpm build",
-    "type:check": "tsc --noEmit"
+    "lint": "eslint ."
   }
 }
diff --git a/configs/vitest/src/index.d.ts b/configs/vitest/src/index.d.ts
@@ -0,0 +1,2 @@
+import type { UserConfig } from 'vitest/config'
+export declare const forPackage: (userConfig?: UserConfig) => UserConfig
diff --git a/configs/vitest/src/index.ts → configs/vitest/src/index.js b/configs/vitest/src/index.ts → configs/vitest/src/index.js
@@ -1,8 +1,11 @@
 import fs from 'fs'
 import path, { dirname } from 'path'
-import type { UserConfig } from 'vitest/config'
 
-export const forPackage = (userConfig?: UserConfig): UserConfig => {
+/**
+ * @param {import('vitest').UserConfig} userConfig
+ * @returns {import('vitest').UserConfig}
+ */
+export const forPackage = (userConfig) => {
   const packageJsonPath = path.resolve(dirname('.'), 'package.json')
   const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'))
 

diff --git a/configs/vitest/tsconfig.json b/configs/vitest/tsconfig.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		import type { Options } from 'tsup'
		export declare const options: Options
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		import type { UserConfig } from 'vitest/config'
		export declare const forPackage: (userConfig?: UserConfig) => UserConfig