include json (other than package.json)

Fix: #73
isaacs · Jun 25, 2024 · 64e138e · 64e138e
1 parent ef27862
commit 64e138e
Show file tree

Hide file tree

Showing 13 changed files with 108 additions and 43 deletions.
diff --git a/.tshy/esm.json b/.tshy/esm.json
@@ -3,9 +3,12 @@
   "include": [
     "../src/**/*.ts",
     "../src/**/*.mts",
-    "../src/**/*.tsx"
+    "../src/**/*.tsx",
+    "../src/**/*.json"
+  ],
+  "exclude": [
+    "../src/package.json"
   ],
-  "exclude": [],
   "compilerOptions": {
     "outDir": "../.tshy-build/esm"
   }

diff --git a/src/tsconfig.ts b/src/tsconfig.ts
@@ -23,7 +23,7 @@ const {
   exclude = [],
 } = config
 
-const relativeExclude = exclude.map(e => `../${e}`)
+const relativeExclude = exclude.map(e => `../${e.replace(/^\.\//, '')}`)
 
 const recommended: Record<string, any> = {
   compilerOptions: {
@@ -61,7 +61,11 @@ const build = (): Record<string, any> => ({
 })
 
 const commonjs = (dialect: string): Record<string, any> => {
-  const exclude = [...relativeExclude, '../src/**/*.mts']
+  const exclude = [
+    ...relativeExclude,
+    '../src/**/*.mts',
+    '../src/package.json',
+  ]
   for (const [d, pf] of polyfills) {
     if (d === dialect) continue
     for (const f of pf.map.keys()) {
@@ -70,7 +74,12 @@ const commonjs = (dialect: string): Record<string, any> => {
   }
   return {
     extends: './build.json',
-    include: ['../src/**/*.ts', '../src/**/*.cts', '../src/**/*.tsx'],
+    include: [
+      '../src/**/*.ts',
+      '../src/**/*.cts',
+      '../src/**/*.tsx',
+      '../src/**/*.json',
+    ],
     exclude,
     compilerOptions: {
       outDir:
@@ -81,17 +90,25 @@ const commonjs = (dialect: string): Record<string, any> => {
 }
 
 const esm = (dialect: string): Record<string, any> => {
-  const exclude: string[] = [...relativeExclude]
+  const exclude: string[] = [
+    ...relativeExclude,
+    '../src/package.json',
+  ]
   for (const [d, pf] of polyfills) {
     if (d === dialect) continue
     for (const f of pf.map.keys()) {
-      exclude.push(`../${f}`)
+      exclude.push(`../${f.replace(/^\.\//, '')}`)
     }
   }
   return {
     extends: './build.json',
-    include: ['../src/**/*.ts', '../src/**/*.mts', '../src/**/*.tsx'],
-    exclude: exclude,
+    include: [
+      '../src/**/*.ts',
+      '../src/**/*.mts',
+      '../src/**/*.tsx',
+      '../src/**/*.json',
+    ],
+    exclude,
     compilerOptions: {
       outDir: '../.tshy-build/' + dialect,
     },

diff --git a/tap-snapshots/test/tsconfig.ts.test.cjs b/tap-snapshots/test/tsconfig.ts.test.cjs
@@ -24,13 +24,15 @@ Object {
   },
   "exclude": Array [
     "../src/**/*.mts",
+    "../src/package.json",
     "../src/index-deno.mts",
   ],
   "extends": "./build.json",
   "include": Array [
     "../src/**/*.ts",
     "../src/**/*.cts",
     "../src/**/*.tsx",
+    "../src/**/*.json",
   ],
 }
 `
@@ -41,13 +43,15 @@ Object {
     "outDir": "../.tshy-build/deno",
   },
   "exclude": Array [
-    ".././src/index-cjs.cts",
+    "../src/package.json",
+    "../src/index-cjs.cts",
   ],
   "extends": "./build.json",
   "include": Array [
     "../src/**/*.ts",
     "../src/**/*.mts",
     "../src/**/*.tsx",
+    "../src/**/*.json",
   ],
 }
 `
@@ -58,14 +62,16 @@ Object {
     "outDir": "../.tshy-build/esm",
   },
   "exclude": Array [
-    ".././src/index-cjs.cts",
-    ".././src/index-deno.mts",
+    "../src/package.json",
+    "../src/index-cjs.cts",
+    "../src/index-deno.mts",
   ],
   "extends": "./build.json",
   "include": Array [
     "../src/**/*.ts",
     "../src/**/*.mts",
     "../src/**/*.tsx",
+    "../src/**/*.json",
   ],
 }
 `
@@ -77,6 +83,7 @@ Object {
   },
   "exclude": Array [
     "../src/**/*.mts",
+    "../src/package.json",
     "../src/index-cjs.cts",
     "../src/index-deno.mts",
   ],
@@ -85,6 +92,7 @@ Object {
     "../src/**/*.ts",
     "../src/**/*.cts",
     "../src/**/*.tsx",
+    "../src/**/*.json",
   ],
 }
 `
@@ -127,15 +135,17 @@ Object {
     "outDir": "../.tshy-build/commonjs",
   },
   "exclude": Array [
-    ".././src/**/*.test.ts",
+    "../src/**/*.test.ts",
     "../src/**/*.mts",
+    "../src/package.json",
     "../src/index-deno.mts",
   ],
   "extends": "./build.json",
   "include": Array [
     "../src/**/*.ts",
     "../src/**/*.cts",
     "../src/**/*.tsx",
+    "../src/**/*.json",
   ],
 }
 `
@@ -146,15 +156,17 @@ Object {
     "outDir": "../.tshy-build/commonjs",
   },
   "exclude": Array [
-    ".././src/**/*.test.ts",
+    "../src/**/*.test.ts",
     "../src/**/*.mts",
+    "../src/package.json",
     "../src/index-deno.mts",
   ],
   "extends": "./build.json",
   "include": Array [
     "../src/**/*.ts",
     "../src/**/*.cts",
     "../src/**/*.tsx",
+    "../src/**/*.json",
   ],
 }
 `
@@ -165,14 +177,16 @@ Object {
     "outDir": "../.tshy-build/deno",
   },
   "exclude": Array [
-    ".././src/**/*.test.ts",
-    ".././src/index-cjs.cts",
+    "../src/**/*.test.ts",
+    "../src/package.json",
+    "../src/index-cjs.cts",
   ],
   "extends": "./build.json",
   "include": Array [
     "../src/**/*.ts",
     "../src/**/*.mts",
     "../src/**/*.tsx",
+    "../src/**/*.json",
   ],
 }
 `
@@ -183,15 +197,17 @@ Object {
     "outDir": "../.tshy-build/esm",
   },
   "exclude": Array [
-    ".././src/**/*.test.ts",
-    ".././src/index-cjs.cts",
-    ".././src/index-deno.mts",
+    "../src/**/*.test.ts",
+    "../src/package.json",
+    "../src/index-cjs.cts",
+    "../src/index-deno.mts",
   ],
   "extends": "./build.json",
   "include": Array [
     "../src/**/*.ts",
     "../src/**/*.mts",
     "../src/**/*.tsx",
+    "../src/**/*.json",
   ],
 }
 `
@@ -202,15 +218,17 @@ Object {
     "outDir": "../.tshy-build/esm",
   },
   "exclude": Array [
-    ".././src/**/*.test.ts",
-    ".././src/index-cjs.cts",
-    ".././src/index-deno.mts",
+    "../src/**/*.test.ts",
+    "../src/package.json",
+    "../src/index-cjs.cts",
+    "../src/index-deno.mts",
   ],
   "extends": "./build.json",
   "include": Array [
     "../src/**/*.ts",
     "../src/**/*.mts",
     "../src/**/*.tsx",
+    "../src/**/*.json",
   ],
 }
 `
@@ -221,8 +239,9 @@ Object {
     "outDir": "../.tshy-build/webpack",
   },
   "exclude": Array [
-    ".././src/**/*.test.ts",
+    "../src/**/*.test.ts",
     "../src/**/*.mts",
+    "../src/package.json",
     "../src/index-cjs.cts",
     "../src/index-deno.mts",
   ],
@@ -231,6 +250,7 @@ Object {
     "../src/**/*.ts",
     "../src/**/*.cts",
     "../src/**/*.tsx",
+    "../src/**/*.json",
   ],
 }
 `

diff --git a/test/fixtures/basic-custom-project/.tshy/commonjs.json b/test/fixtures/basic-custom-project/.tshy/commonjs.json
@@ -3,10 +3,12 @@
   "include": [
     "../src/**/*.ts",
     "../src/**/*.cts",
-    "../src/**/*.tsx"
+    "../src/**/*.tsx",
+    "../src/**/*.json"
   ],
   "exclude": [
-    "../src/**/*.mts"
+    "../src/**/*.mts",
+    "../src/package.json"
   ],
   "compilerOptions": {
     "outDir": "../.tshy-build/commonjs"

diff --git a/test/fixtures/basic-custom-project/.tshy/esm.json b/test/fixtures/basic-custom-project/.tshy/esm.json
@@ -3,9 +3,12 @@
   "include": [
     "../src/**/*.ts",
     "../src/**/*.mts",
-    "../src/**/*.tsx"
+    "../src/**/*.tsx",
+    "../src/**/*.json"
+  ],
+  "exclude": [
+    "../src/package.json"
   ],
-  "exclude": [],
   "compilerOptions": {
     "outDir": "../.tshy-build/esm"
   }

diff --git a/test/fixtures/basic-imports-only-deps/.tshy/commonjs.json b/test/fixtures/basic-imports-only-deps/.tshy/commonjs.json
@@ -3,10 +3,12 @@
   "include": [
     "../src/**/*.ts",
     "../src/**/*.cts",
-    "../src/**/*.tsx"
+    "../src/**/*.tsx",
+    "../src/**/*.json"
   ],
   "exclude": [
-    "../src/**/*.mts"
+    "../src/**/*.mts",
+    "../src/package.json"
   ],
   "compilerOptions": {
     "outDir": "../.tshy-build/commonjs"

diff --git a/test/fixtures/basic-imports-only-deps/.tshy/esm.json b/test/fixtures/basic-imports-only-deps/.tshy/esm.json
@@ -3,9 +3,12 @@
   "include": [
     "../src/**/*.ts",
     "../src/**/*.mts",
-    "../src/**/*.tsx"
+    "../src/**/*.tsx",
+    "../src/**/*.json"
+  ],
+  "exclude": [
+    "../src/package.json"
   ],
-  "exclude": [],
   "compilerOptions": {
     "outDir": "../.tshy-build/esm"
   }

diff --git a/test/fixtures/basic/.tshy/commonjs.json b/test/fixtures/basic/.tshy/commonjs.json
@@ -3,10 +3,12 @@
   "include": [
     "../src/**/*.ts",
     "../src/**/*.cts",
-    "../src/**/*.tsx"
+    "../src/**/*.tsx",
+    "../src/**/*.json"
   ],
   "exclude": [
-    "../src/**/*.mts"
+    "../src/**/*.mts",
+    "../src/package.json"
   ],
   "compilerOptions": {
     "outDir": "../.tshy-build/commonjs"

diff --git a/test/fixtures/basic/.tshy/esm.json b/test/fixtures/basic/.tshy/esm.json
@@ -3,9 +3,12 @@
   "include": [
     "../src/**/*.ts",
     "../src/**/*.mts",
-    "../src/**/*.tsx"
+    "../src/**/*.tsx",
+    "../src/**/*.json"
+  ],
+  "exclude": [
+    "../src/package.json"
   ],
-  "exclude": [],
   "compilerOptions": {
     "outDir": "../.tshy-build/esm"
   }

diff --git a/test/fixtures/imports-with-star/.tshy/commonjs.json b/test/fixtures/imports-with-star/.tshy/commonjs.json
@@ -3,10 +3,12 @@
   "include": [
     "../src/**/*.ts",
     "../src/**/*.cts",
-    "../src/**/*.tsx"
+    "../src/**/*.tsx",
+    "../src/**/*.json"
   ],
   "exclude": [
-    "../src/**/*.mts"
+    "../src/**/*.mts",
+    "../src/package.json"
   ],
   "compilerOptions": {
     "outDir": "../.tshy-build/commonjs"

diff --git a/test/fixtures/imports-with-star/.tshy/esm.json b/test/fixtures/imports-with-star/.tshy/esm.json
@@ -3,9 +3,12 @@
   "include": [
     "../src/**/*.ts",
     "../src/**/*.mts",
-    "../src/**/*.tsx"
+    "../src/**/*.tsx",
+    "../src/**/*.json"
+  ],
+  "exclude": [
+    "../src/package.json"
   ],
-  "exclude": [],
   "compilerOptions": {
     "outDir": "../.tshy-build/esm"
   }