fix: update exports, fix rollup/tsc declaration conflict, dedupe tsconfig

- Update exports for 7 packages (babel-preset, postcss-syntax, jest-serializer,
  webpack-loader, webpack-extraction-plugin, next-extraction-plugin, eslint-plugin)
  to point to ./dist/ files, enabling @nx/js/typescript build target inference
- Add cleanDeclarations rollup plugin to remove .d.ts files and .tsbuildinfo
  generated by rollup's TypeScript plugin, preventing conflicts with tsc --build
- Remove duplicate compilerOptions entries in tsconfig.base.json (from merge)
- Simplify packLocalPackage to pack from package root directory

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: layershifter

e2e/utils/src/packLocalPackage.ts

@@ -1,40 +1,21 @@
 import * as path from 'path';
-import * as fs from 'fs';
 import * as logSymbols from 'log-symbols';
 
 import { sh } from './sh';
 
-/**
- * Rewrites paths in package.json to be relative to the dist directory.
- * e.g. "./dist/index.esm.js" becomes "./index.esm.js"
- */
-function rewritePackageJsonForDist(packageJsonContent: string): string {
-  return packageJsonContent.replace(/"\.\/(dist)\//g, '"./');
-}
-
 export async function packLocalPackage(rootDir: string, tempDir: string, packageName: string) {
   const packagePath = path.resolve(rootDir, 'packages', packageName.split('/')[1]);
-  const distPath = path.resolve(packagePath, 'dist');
-  const distPathExists = !!(await fs.promises.stat(distPath).catch(() => false));
 
-  if (!distPathExists) {
-    throw new Error(`A directory with artifacts (${distPath}) does not exist`);
+  if (!packagePath) {
+    throw new Error(`A package directory (${packageName}) does not exist`);
   }
 
-  // Copy package.json into dist with paths rewritten to be relative to dist.
-  // The old @nx/rollup:rollup executor did this automatically; with plain rollup we do it manually.
-  const packageJsonContent = await fs.promises.readFile(path.resolve(packagePath, 'package.json'), 'utf-8');
-  await fs.promises.writeFile(path.resolve(distPath, 'package.json'), rewritePackageJsonForDist(packageJsonContent));
-
   // Use `npm pack` because `yarn pack` incorrectly calculates the included files when the
   // files to include/exclude are specified by .npmignore rather than package.json `files`.
   // (--quiet outputs only the .tgz filename, not all the included files)
-  const packFile = (await sh(`npm pack --quiet ${distPath}`, tempDir, true)).trim();
+  const packFile = (await sh(`npm pack --quiet ${packagePath}`, tempDir, true)).trim();
   console.log(logSymbols.success, `Package "${packageName}" was packed`);
 
-  // Clean up the temporary package.json in dist
-  await fs.promises.unlink(path.resolve(distPath, 'package.json'));
-
   return {
     packageName,
     file: packFile,

packages/babel-preset/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griffel/babel-preset",
   "version": "1.8.0",
-  "types": "./src/index.ts",
+  "types": "./dist/index.d.ts",
   "description": "Babel preset with build time transforms for Griffel",
   "license": "MIT",
   "repository": {
@@ -12,8 +12,8 @@
     "./package.json": "./package.json",
     ".": {
       "@griffel/source": "./src/index.ts",
-      "types": "./src/index.ts",
-      "default": "./src/index.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "devDependencies": {

packages/eslint-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griffel/eslint-plugin",
   "version": "2.0.2",
-  "types": "./src/index.ts",
+  "types": "./dist/index.d.ts",
   "description": "ESLint plugin with lint rules for Griffel",
   "license": "MIT",
   "repository": {
@@ -12,8 +12,8 @@
     "./package.json": "./package.json",
     ".": {
       "@griffel/source": "./src/index.ts",
-      "types": "./src/index.ts",
-      "default": "./src/index.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "devDependencies": {

packages/jest-serializer/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griffel/jest-serializer",
   "version": "1.1.35",
-  "types": "./src/index.ts",
+  "types": "./dist/index.d.ts",
   "description": "Jest serializer for Griffel",
   "license": "MIT",
   "repository": {
@@ -12,8 +12,8 @@
     "./package.json": "./package.json",
     ".": {
       "@griffel/source": "./src/index.ts",
-      "types": "./src/index.ts",
-      "default": "./src/index.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "devDependencies": {

packages/next-extraction-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griffel/next-extraction-plugin",
   "version": "0.1.14",
-  "types": "./src/index.ts",
+  "types": "./dist/index.d.ts",
   "description": "NextJS plugin that add Griffel's CSS extraction to webpack loaders pipeline",
   "license": "MIT",
   "repository": {
@@ -12,8 +12,8 @@
     "./package.json": "./package.json",
     ".": {
       "@griffel/source": "./src/index.ts",
-      "types": "./src/index.ts",
-      "default": "./src/index.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "dependencies": {

packages/postcss-syntax/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griffel/postcss-syntax",
   "version": "1.3.5",
-  "types": "./src/index.ts",
+  "types": "./dist/index.d.ts",
   "description": "postcss syntax for Griffel",
   "license": "MIT",
   "repository": {
@@ -21,9 +21,9 @@
     "./package.json": "./package.json",
     ".": {
       "@griffel/source": "./src/index.ts",
-      "types": "./src/index.ts",
-      "default": "./src/index.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
-  "main": "./src/index.js"
+  "main": "./dist/index.js"
 }

packages/webpack-extraction-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griffel/webpack-extraction-plugin",
   "version": "0.5.13",
-  "types": "./src/index.ts",
+  "types": "./dist/index.d.ts",
   "description": "Webpack plugin that performs CSS extraction for Griffel",
   "license": "MIT",
   "repository": {
@@ -12,8 +12,8 @@
     "./package.json": "./package.json",
     ".": {
       "@griffel/source": "./src/index.ts",
-      "types": "./src/index.ts",
-      "default": "./src/index.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "devDependencies": {

packages/webpack-loader/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griffel/webpack-loader",
   "version": "2.2.22",
-  "types": "./src/index.ts",
+  "types": "./dist/index.d.ts",
   "description": "Webpack loader that performs build time transforms for Griffel",
   "license": "MIT",
   "repository": {
@@ -12,8 +12,8 @@
     "./package.json": "./package.json",
     ".": {
       "@griffel/source": "./src/index.ts",
-      "types": "./src/index.ts",
-      "default": "./src/index.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "devDependencies": {

tools/getRollupOptions.js

@@ -1,4 +1,41 @@
 const { preserveDirectives } = require('rollup-plugin-preserve-directives');
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * Rollup plugin that removes declaration files (.d.ts, .d.ts.map) generated by
+ * @rollup/plugin-typescript. These are incompatible with tsc --build project references
+ * (different directory layout), so tsc handles declarations via the type-check target instead.
+ */
+function cleanDeclarations() {
+  return {
+    name: 'clean-declarations',
+    async writeBundle(outputOptions) {
+      const dir = outputOptions.dir;
+      if (!dir) return;
+
+      const srcDir = path.join(dir, 'src');
+      if (fs.existsSync(srcDir)) {
+        fs.rmSync(srcDir, { recursive: true });
+      }
+
+      // Remove the barrel index.d.ts and stale .tsbuildinfo generated by rollup
+      for (const file of fs.readdirSync(dir)) {
+        if (file.endsWith('.d.ts') || file.endsWith('.d.ts.map')) {
+          fs.unlinkSync(path.join(dir, file));
+        }
+      }
+
+      // Remove stale .tsbuildinfo from the package root (rollup's tsc pass creates it)
+      const pkgRoot = path.dirname(dir);
+      for (const file of fs.readdirSync(pkgRoot)) {
+        if (file.endsWith('.tsbuildinfo')) {
+          fs.unlinkSync(path.join(pkgRoot, file));
+        }
+      }
+    },
+  };
+}
 
 function getRollupOptions(/** @type {import('rollup').RollupOptions} */ options) {
   if (Array.isArray(options.output)) {
@@ -14,6 +51,7 @@ function getRollupOptions(/** @type {import('rollup').RollupOptions} */ options)
     // Add plugin to preserve 'use client' directives in the output files
     options.plugins = options.plugins || [];
     options.plugins.push(preserveDirectives());
+    options.plugins.push(cleanDeclarations());
 
     return options;
   }

tsconfig.base.json

@@ -1,12 +1,6 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
     "composite": true,
     "sourceMap": true,
     "declarationMap": true,