some tsconfig tricks

epszaw · epszaw · commit ab980cf74d2a · 2024-03-19T11:13:10.000+01:00
diff --git a/packages/allure-js-commons/package.json b/packages/allure-js-commons/package.json
@@ -45,8 +45,8 @@
     "clean": "rimraf ./dist",
     "compile": "run-p 'compile:*'",
     "compile:esm": "tsc --project ./tsconfig.esm.json",
-    "compile:cjs": "tsc --project ./tsconfig.json",
-    "compile:fixup": "ts-node --project ./tsconfig.json ./scripts/fixup.ts",
+    "compile:cjs": "tsc --project ./tsconfig.cjs.json",
+    "compile:fixup": "ts-node --project ./tsconfig.cjs.json ./scripts/fixup.ts",
     "lint": "eslint ./src ./index.ts --ext .ts",
     "lint:fix": "eslint ./src ./index.ts --ext .ts --fix",
     "test": "ts-node --project test/tsconfig.json test/runner.ts"
diff --git a/packages/allure-js-commons/src/new/framework/index.ts b/packages/allure-js-commons/src/new/framework/index.ts
@@ -15,6 +15,6 @@ export {
   allureIdRegexp,
   allureLabelRegexp,
   allureLabelRegexpGlobal,
-  extractMetadataFromString
+  extractMetadataFromString,
 } from "./utils.js";
 export { AllureInMemoryAllureWriter } from "./writers/index.js";
diff --git a/packages/allure-js-commons/src/new/index.ts b/packages/allure-js-commons/src/new/index.ts
@@ -24,6 +24,6 @@ export {
   ContentType,
   LinkType,
   ImageDiffAttachment,
-  AllureResults
+  AllureResults,
 } from "./model";
 export * from "./framework/index.js";
diff --git a/packages/allure-js-commons/src/new/node/index.ts b/packages/allure-js-commons/src/new/node/index.ts
@@ -7,6 +7,6 @@ export {
   // TODO: replace with `strip-ansi` package (is already used for jest integration)
   stripAscii,
   allureReportFolder,
-  defaultReportFolder
+  defaultReportFolder,
 } from "./utils.js";
 export { AllureInMemoryWriter, FileSystemAllureWriter, MessageAllureWriter } from "./writers/index.js";
diff --git a/packages/allure-js-commons/tsconfig.cjs.json b/packages/allure-js-commons/tsconfig.cjs.json
@@ -0,0 +1,18 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "./src/**/*",
+    "index.ts",
+    "internal.ts",
+  ],
+  "compilerOptions": {
+    "declaration": true,
+    "lib": ["dom", "esnext"],
+    "types": [
+      "node"
+    ],
+    "target": "es2015",
+    "outDir": "./dist/cjs",
+    "module": "commonjs",
+  }
+}
diff --git a/packages/allure-js-commons/tsconfig.esm.json b/packages/allure-js-commons/tsconfig.esm.json
@@ -1,7 +1,8 @@
 {
   "extends": "./tsconfig.cjs.json",
   "compilerOptions": {
-    "module": "esnext",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "target": "es2022",
     "outDir": "./dist/esm"
   }
diff --git a/packages/allure-js-commons/tsconfig.json b/packages/allure-js-commons/tsconfig.json
@@ -11,6 +11,7 @@
     "types": [
       "node"
     ],
-    "outDir": "./dist/cjs"
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "./tsconfig.cjs.json",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "module": "esnext",`
	`4`	`+ "module": "nodenext",`
	`5`	`+ "moduleResolution": "nodenext",`
`5`	`6`	`"target": "es2022",`
`6`	`7`	`"outDir": "./dist/esm"`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`"types": [`
`12`	`12`	`"node"`
`13`	`13`	`],`
`14`		`- "outDir": "./dist/cjs"`
	`14`	`+ "module": "nodenext",`
	`15`	`+ "moduleResolution": "nodenext",`
`15`	`16`	`}`
`16`	`17`	`}`