chore: Simplify type generation (#23)

eslint · May 22, 2024 · 5f0d2e2 · 5f0d2e2
1 parent d5a0496
commit 5f0d2e2
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 69 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -51,3 +51,21 @@ jobs:
                   npm test
               env:
                   CI: true
+
+    jsr_test:
+        name: Verify JSR Publish
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: "lts/*"
+
+            - name: Install Packages
+              run: npm install
+
+            - name: Run --dry-run
+              run: |
+                  npm run build
+                  npm run test:jsr
diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "fmt": "prettier --write .",
-    "fmt:check": "prettier --check ."
+    "fmt:check": "prettier --check .",
+    "test:jsr": "npm run test:jsr --workspaces --if-present"
   },
   "workspaces": [
     "packages/*"

diff --git a/packages/compat/package.json b/packages/compat/package.json
@@ -23,8 +23,9 @@
     "test": "tests"
   },
   "scripts": {
-    "build:prepend-type-ref": "node ../../tools/prepend-type-ref.js dist/esm/index.js",
-    "build": "rollup -c && tsc -p tsconfig.esm.json && tsc -p tsconfig.cjs.json && npm run build:prepend-type-ref",
+    "build:cts": "node -e \"fs.copyFileSync('dist/esm/index.d.ts', 'dist/cjs/index.d.cts')\"",
+    "build": "rollup -c && tsc -p tsconfig.esm.json && npm run build:cts",
+    "test:jsr": "npx jsr@latest publish --dry-run",
     "test": "mocha tests/*.js"
   },
   "repository": {

diff --git a/packages/compat/rollup.config.js b/packages/compat/rollup.config.js
@@ -10,6 +10,7 @@ export default {
 		{
 			file: "dist/esm/index.js",
 			format: "esm",
+			banner: '// @ts-self-types="./index.d.ts"',
 		},
 	],
 	plugins: [

diff --git a/packages/compat/tsconfig.cjs.json b/packages/compat/tsconfig.cjs.json
diff --git a/packages/config-array/package.json b/packages/config-array/package.json
@@ -30,8 +30,9 @@
   "homepage": "https://github.com/eslint/rewrite#readme",
   "scripts": {
     "build:dedupe-types": "node ../../tools/dedupe-types.js dist/cjs/index.cjs dist/esm/index.js",
-    "build:prepend-type-ref": "node ../../tools/prepend-type-ref.js dist/esm/index.js",
-    "build": "rollup -c && npm run build:dedupe-types && tsc -p tsconfig.esm.json && tsc -p tsconfig.cjs.json && npm run build:prepend-type-ref",
+    "build:cts": "node -e \"fs.copyFileSync('dist/esm/index.d.ts', 'dist/cjs/index.d.cts')\"",
+    "build": "rollup -c && npm run build:dedupe-types && tsc -p tsconfig.esm.json && npm run build:cts",
+    "test:jsr": "npx jsr@latest publish --dry-run",
     "pretest": "npm run build",
     "test": "mocha tests/"
   },

diff --git a/packages/config-array/rollup.config.js b/packages/config-array/rollup.config.js
@@ -10,6 +10,7 @@ export default {
 		{
 			file: "dist/esm/index.js",
 			format: "esm",
+			banner: '// @ts-self-types="./index.d.ts"',
 		},
 	],
 	plugins: [

diff --git a/packages/config-array/tsconfig.cjs.json b/packages/config-array/tsconfig.cjs.json
diff --git a/packages/object-schema/package.json b/packages/object-schema/package.json
@@ -23,8 +23,9 @@
     "test": "tests"
   },
   "scripts": {
-    "build:prepend-type-ref": "node ../../tools/prepend-type-ref.js dist/esm/index.js",
-    "build": "rollup -c && tsc -p tsconfig.esm.json && tsc -p tsconfig.cjs.json && npm run build:prepend-type-ref",
+    "build:cts": "node -e \"fs.copyFileSync('dist/esm/index.d.ts', 'dist/cjs/index.d.cts')\"",
+    "build": "rollup -c && tsc -p tsconfig.esm.json && npm run build:cts",
+    "test:jsr": "npx jsr@latest publish --dry-run",
     "test": "mocha tests/"
   },
   "repository": {

diff --git a/packages/object-schema/rollup.config.js b/packages/object-schema/rollup.config.js
@@ -10,6 +10,7 @@ export default {
 		{
 			file: "dist/esm/index.js",
 			format: "esm",
+			banner: '// @ts-self-types="./index.d.ts"',
 		},
 	],
 	plugins: [

diff --git a/packages/object-schema/tsconfig.cjs.json b/packages/object-schema/tsconfig.cjs.json
diff --git a/tools/prepend-type-ref.js b/tools/prepend-type-ref.js