Merge branch 'main' into add-output-folder-option

package.json

@@ -39,7 +39,7 @@
     "@swc/core": "^1.5.7",
     "@swc/jest": "^0.2.36",
     "@types/dedent": "^0.7.2",
-    "@types/eslint": "^8.37.0",
+    "@types/eslint": "^9.6.0",
     "@types/glob": "^8.1.0",
     "@types/jest": "^29.5.12",
     "@types/less": "^3.0.6",
@@ -54,7 +54,7 @@
     "jest": "^29.7.0",
     "less": "^4.2.0",
     "line-column": "^1.0.2",
-    "npm-run-all2": "^5.0.0",
+    "npm-run-all2": "^6.2.0",
     "patch-package": "^8.0.0",
     "postcss-import": "^16.1.0",
     "postcss-less": "^6.0.0",

packages/happy-css-modules/src/emitter/dts.ts

@@ -1,7 +1,7 @@
 import { EOL } from 'os';
 import path, { basename, parse, join } from 'path';
 import camelcase from 'camelcase';
-import { SourceNode, type CodeWithSourceMap } from '../library/source-map/index.js';
+import { SourceNode, type CodeWithSourceMap } from 'source-map';
 import { type Token } from '../locator/index.js';
 import { type LocalsConvention } from '../runner.js';
 import { getRelativePath } from './index.js';
@@ -73,9 +73,9 @@ function generateTokenDeclarations(
   tokens: Token[],
   dtsFormatOptions: DtsFormatOptions | undefined,
   isExternalFile: (filePath: string) => boolean,
-): (typeof SourceNode)[] {
+): SourceNode[] {
   const formattedTokens = formatTokens(tokens, dtsFormatOptions?.localsConvention);
-  const result: (typeof SourceNode)[] = [];
+  const result: SourceNode[] = [];
 
   for (const token of formattedTokens) {
     // Only one original position can be associated with one generated position.
@@ -152,13 +152,13 @@ export function generateDtsContentWithSourceMap(
     isExternalFile,
   );
 
-  let sourceNode: typeof SourceNode;
+  let sourceNode: SourceNode;
   if (!tokenDeclarations || !tokenDeclarations.length) {
     sourceNode = new SourceNode(null, null, null, '');
   } else {
     sourceNode = new SourceNode(1, 0, getRelativePath(sourceMapFilePath, filePath), [
       `declare const styles:${EOL}`,
-      ...tokenDeclarations.map((tokenDeclaration) => ['  ', tokenDeclaration, EOL]),
+      ...tokenDeclarations.map((tokenDeclaration) => ['  ', tokenDeclaration, EOL]).flat(),
       `;${EOL}`,
       `export default styles;${EOL}`,
     ]);