build fixes

Author: arnoud-dv

packages/angular-query-experimental/.attw.json

@@ -1,3 +1,3 @@
 {
-  "ignoreRules": ["cjs-resolves-to-esm", "no-resolution"]
+  "ignoreRules": ["cjs-resolves-to-esm"]
 }

packages/angular-query-experimental/package.json

@@ -42,7 +42,7 @@
     "test:types:tscurrent": "tsc --build",
     "test:lib": "vitest",
     "test:lib:dev": "pnpm run test:lib --watch",
-    "test:build": "publint --strict && attw --pack",
+    "test:build": "pnpm pack && publint *.tgz --strict && attw *.tgz; premove *.tgz",
     "build": "vite build",
     "prepack": "node scripts/prepack.js",
     "postpack": "node scripts/postpack.js"
@@ -52,8 +52,8 @@
   "module": "dist/index.mjs",
   "exports": {
     ".": {
-      "@tanstack/custom-condition": "./src/index.ts",
       "types": "./dist/types/index.d.ts",
+      "@tanstack/custom-condition": "./src/index.ts",
       "default": "./dist/index.mjs"
     },
     "./package.json": {

packages/angular-query-experimental/scripts/prepack.js

@@ -33,8 +33,7 @@ to exactly match the subpath export as in the example above.
     },
 ```
 
-It's important to support `"moduleResolution": "node"` as many Angular applications are configured this way.
-Also, NX adds it to the out of box `tsconfig`
+It's important to support `"moduleResolution": "node"` as many Angular applications are still configured this way.
 
 In the `postpack` lifecycle script these links are removed to keep a clean development environment
  */

packages/angular-query-experimental/tsconfig.json

@@ -3,8 +3,6 @@
   "compilerOptions": {
     "outDir": "./dist-ts",
     "rootDir": ".",
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
     "noFallthroughCasesInSwitch": true,
     "useDefineForClassFields": false,
     "target": "ES2022"

packages/angular-query-experimental/tsconfig.prod.json

@@ -3,6 +3,7 @@
   "compilerOptions": {
     "incremental": false,
     "composite": false,
-    "rootDir": "../../"
+    "rootDir": "../../",
+    "customConditions": null
   }
 }

packages/angular-query-experimental/vite.config.ts

@@ -5,6 +5,27 @@ import dts from 'vite-plugin-dts'
 import packageJson from './package.json'
 import type { Options } from '@tanstack/config/vite'
 
+function ensureImportFileExtension({
+  content,
+  extension,
+}: {
+  content: string
+  extension: string
+}) {
+  // replace e.g. `import { foo } from './foo'` with `import { foo } from './foo.js'`
+  content = content.replace(
+    /(im|ex)port\s[\w{}/*\s,]+from\s['"](?:\.\.?\/)+?[^.'"]+(?=['"];?)/gm,
+    `$&.${extension}`,
+  )
+
+  // replace e.g. `import('./foo')` with `import('./foo.js')`
+  content = content.replace(
+    /import\(['"](?:\.\.?\/)+?[^.'"]+(?=['"];?)/gm,
+    `$&.${extension}`,
+  )
+  return content
+}
+
 const config = defineConfig({
   // fix from https://github.com/vitest-dev/vitest/issues/6992#issuecomment-2509408660
   resolve: {
@@ -31,8 +52,6 @@ const config = defineConfig({
 })
 
 // copy from @tanstack/config/vite with changes:
-// - dts removed ensureImportFileExtension
-// - dts removed dts beforeWriteFile
 // - dts outDir: dist/types
 // - build - lib - fileName: [name.mjs]
 // - rollup - output - preserveModulesRoot: src
@@ -56,6 +75,14 @@ export const tanstackViteConfig = (options: Options) => {
           module: 99, // ESNext
           declarationMap: false,
         },
+        beforeWriteFile: (filePath, content) => {
+          // content =
+          //   options.beforeWriteDeclarationFile?.(filePath, content) || content
+          return {
+            filePath,
+            content: ensureImportFileExtension({ content, extension: 'js' }),
+          }
+        },
         afterDiagnostic: (diagnostics) => {
           if (diagnostics.length > 0) {
             console.error('Please fix the above type errors')

packages/angular-query-persist-client/.attw.json

@@ -1,3 +1,3 @@
 {
-  "ignoreRules": ["cjs-resolves-to-esm", "no-resolution"]
+  "ignoreRules": ["cjs-resolves-to-esm"]
 }