Typescript declarations in cts and mts formats

.gitignore

@@ -3,6 +3,7 @@ dist
 node_modules
 .nyc_output
 .DS_Store
+tsconfig.tsbuildinfo
 
 bench/dataset/chromedriver
 bench/dataset/ext.zip
@@ -11,3 +12,4 @@ bench/.bench.json
 
 .changelog/
 .yarn/
+.rollup.cache/

packages/adblocker-content/.npmignore

@@ -1,2 +1 @@
-dist/cjs/tsconfig.cjs.tsbuildinfo
-dist/es6/tsconfig.es6.tsbuildinfo
+tsconfig.tsbuildinfo

packages/adblocker-content/package.json

@@ -9,13 +9,18 @@
   "license": "MPL-2.0",
   "type": "module",
   "exports": {
-    "require": "./dist/cjs/adblocker.cjs",
-    "import": "./dist/esm/adblocker.js",
-    "types": "./dist/types/adblocker.d.ts"
+    "require": {
+      "default": "./dist/adblocker.cjs",
+      "types": "./dist/types/adblocker.d.cts"
+    },
+    "import": {
+      "default": "./dist/adblocker.js",
+      "types": "./dist/types/adblocker.d.ts"
+    }
   },
-  "main": "dist/cjs/adblocker.cjs",
-  "module": "dist/esm/adblocker.js",
-  "types": "dist/types/adblocker.d.ts",
+  "main": "./dist/adblocker.cjs",
+  "module": "./dist/adblocker.js",
+  "types": "./dist/types/adblocker.d.ts",
   "files": [
     "LICENSE",
     "dist"
@@ -31,7 +36,7 @@
   "scripts": {
     "clean": "rimraf dist coverage",
     "lint": "eslint adblocker.ts",
-    "build": "tsc --build ./tsconfig.json && rollup --config ./rollup.config.ts --configPlugin typescript"
+    "build": "rollup --config ./rollup.config.ts --configPlugin typescript"
   },
   "bugs": {
     "url": "https://github.com/ghostery/adblocker/issues"
@@ -42,11 +47,12 @@
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.2.1",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^11.1.3",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@types/node": "^20.6.2",
     "eslint": "^9.3.0",
     "rimraf": "^5.0.1",
     "rollup": "^4.0.2",
+    "rollup-plugin-copy": "^3.5.0",
     "typescript": "^5.5.2"
   },
   "contributors": [

packages/adblocker-content/rollup.config.ts

@@ -8,17 +8,20 @@
 
 import resolve from '@rollup/plugin-node-resolve';
 import terser from '@rollup/plugin-terser';
+import typescript from '@rollup/plugin-typescript';
+import copy from 'rollup-plugin-copy';
 
 export default [
   {
-    input: './dist/src/adblocker.js',
+    input: './adblocker.ts',
     output: {
       file: './dist/adblocker.umd.min.js',
       format: 'umd',
       name: 'adblocker',
       sourcemap: true,
     },
     plugins: [
+      typescript(),
       resolve(),
       terser({
         output: {
@@ -28,22 +31,32 @@ export default [
     ],
   },
   {
-    input: './dist/src/adblocker.js',
+    input: './adblocker.ts',
     output: [
       {
-        dir: './dist/esm',
+        dir: './dist',
         format: 'esm',
         preserveModules: true,
         entryFileNames: '[name].js',
         sourcemap: true,
       },
       {
-        dir: './dist/cjs',
+        dir: './dist',
         format: 'cjs',
         preserveModules: true,
         entryFileNames: '[name].cjs',
         sourcemap: true,
       },
     ],
+    plugins: [
+      // compilerOptions are here a workaround for @rollup/plugin-typescript not being able to emit declarations
+      typescript({ compilerOptions: { declarationDir: './dist/types' } }),
+      copy({
+        targets: [
+          { src: './dist/types/adblocker.d.ts', dest: './dist/types', rename: 'adblocker.d.cts' },
+        ],
+        hook: 'writeBundle',
+      }),
+    ],
   },
 ];

packages/adblocker-content/tsconfig.json

@@ -1,11 +1,12 @@
 {
   "extends": "../../tsconfig",
   "compilerOptions": {
-    "outDir": "./dist/src",
-    "declarationDir": "./dist/types",
+    "outDir": "./dist"
   },
   "references": [
     { "path": "../adblocker-extended-selectors/tsconfig.json" },
   ],
-  "include": ["./adblocker.ts"]
+  "include": [
+    "./adblocker.ts"
+  ]
 }

packages/adblocker-electron-example/tsconfig.json

@@ -1,9 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "module": "commonjs",
-    "noEmit": true,
-    "composite": true
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "noEmit": true
   },
   "references": [
     { "path": "../adblocker-electron/tsconfig.json" }

packages/adblocker-electron-preload/.npmignore

@@ -1,2 +1 @@
-dist/cjs/tsconfig.cjs.tsbuildinfo
-dist/es6/tsconfig.es6.tsbuildinfo
+tsconfig.tsbuildinfo

packages/adblocker-electron-preload/package.json

@@ -9,13 +9,18 @@
   "license": "MPL-2.0",
   "type": "module",
   "exports": {
-    "require": "./dist/cjs/preload.cjs",
-    "import": "./dist/esm/preload.js",
-    "types": "./dist/types/preload.d.ts"
+    "require": {
+      "default": "./dist/preload.cjs",
+      "types": "./dist/types/preload.d.cts"
+    },
+    "import": {
+      "default": "./dist/preload.js",
+      "types": "./dist/types/preload.d.ts"
+    }
   },
-  "main": "dist/preload.cjs",
-  "module": "dist/esm/preload.js",
-  "types": "dist/types/preload.d.ts",
+  "main": "./dist/preload.cjs",
+  "module": "./dist/preload.js",
+  "types": "./dist/types/preload.d.ts",
   "files": [
     "LICENSE",
     "dist"
@@ -34,7 +39,7 @@
   "scripts": {
     "clean": "rimraf dist coverage",
     "lint": "eslint preload.ts",
-    "build": "tsc --build ./tsconfig.json && rollup --config ./rollup.config.ts --configPlugin typescript"
+    "build": "rollup --config ./rollup.config.ts --configPlugin typescript"
   },
   "peerDependencies": {
     "electron": ">11"
@@ -45,12 +50,13 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.1",
-    "@rollup/plugin-typescript": "^11.1.3",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@types/chrome": "^0.0.268",
     "electron": "^31.0.0",
     "eslint": "^9.3.0",
     "rimraf": "^5.0.1",
     "rollup": "^4.0.2",
+    "rollup-plugin-copy": "^3.5.0",
     "typescript": "^5.5.2"
   },
   "contributors": [

packages/adblocker-electron-preload/rollup.config.ts

@@ -8,19 +8,21 @@
 
 import resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
+import typescript from '@rollup/plugin-typescript';
+import copy from 'rollup-plugin-copy';
 
 export default {
-  input: './dist/src/preload.js',
+  input: './preload.ts',
   external: ['electron'],
   output: [
     {
-      file: './dist/cjs/preload.cjs',
-      format: 'commonjs',
+      file: './dist/preload.js',
+      format: 'esm',
       sourcemap: true,
     },
     {
-      file: './dist/esm/preload.cjs',
-      format: 'esm',
+      file: './dist/preload.cjs',
+      format: 'cjs',
       sourcemap: true,
     },
   ],
@@ -29,5 +31,13 @@ export default {
       mainFields: ['main'],
     }),
     commonjs(),
+    // compilerOptions are here a workaround for @rollup/plugin-typescript not being able to emit declarations
+    typescript({ compilerOptions: { declarationDir: './dist/types' } }),
+    copy({
+      targets: [
+        { src: './dist/types/preload.d.ts', dest: './dist/types', rename: 'preload.d.cts' },
+      ],
+      hook: 'writeBundle',
+    }),
   ],
 };

packages/adblocker-electron-preload/tsconfig.json

@@ -1,8 +1,7 @@
 {
   "extends": "../../tsconfig",
   "compilerOptions": {
-    "outDir": "./dist/src",
-    "declarationDir": "./dist/types",
+    "outDir": "./dist"
   },
   "references": [
     { "path": "../adblocker-content/tsconfig.json" }

packages/adblocker-electron/.npmignore

@@ -1,2 +1 @@
-dist/cjs/tsconfig.cjs.tsbuildinfo
-dist/es6/tsconfig.es6.tsbuildinfo
+tsconfig.tsbuildinfo

packages/adblocker-electron/package.json

@@ -9,13 +9,18 @@
   "license": "MPL-2.0",
   "type": "module",
   "exports": {
-    "require": "./dist/cjs/adblocker.cjs",
-    "import": "./dist/esm/adblocker.js",
-    "types": "./dist/types/adblocker.d.ts"
+    "require": {
+      "default": "./dist/adblocker.cjs",
+      "types": "./dist/types/adblocker.d.cts"
+    },
+    "import": {
+      "default": "./dist/adblocker.js",
+      "types": "./dist/types/adblocker.d.ts"
+    }
   },
-  "main": "dist/cjs/adblocker.cjs",
-  "module": "dist/esm/adblocker.js",
-  "types": "dist/types/adblocker.d.ts",
+  "main": "./dist/adblocker.cjs",
+  "module": "./dist/adblocker.js",
+  "types": "./dist/types/adblocker.d.ts",
   "files": [
     "LICENSE",
     "dist"
@@ -34,7 +39,7 @@
   "scripts": {
     "clean": "rimraf dist coverage",
     "lint": "eslint adblocker.ts",
-    "build": "tsc --build ./tsconfig.json && rollup --config ./rollup.config.ts --configPlugin typescript",
+    "build": "rollup --config ./rollup.config.ts --configPlugin typescript",
     "test": "nyc mocha --config ../../.mocharc.json"
   },
   "peerDependencies": {
@@ -48,6 +53,7 @@
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@types/chai": "^4.3.6",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.12.12",
@@ -58,6 +64,7 @@
     "nyc": "^17.0.0",
     "rimraf": "^5.0.1",
     "rollup": "^4.17.2",
+    "rollup-plugin-copy": "^3.5.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.5.2"
   },

packages/adblocker-electron/rollup.config.ts

@@ -8,17 +8,20 @@
 
 import resolve from '@rollup/plugin-node-resolve';
 import terser from '@rollup/plugin-terser';
+import typescript from '@rollup/plugin-typescript';
+import copy from 'rollup-plugin-copy';
 
 export default [
   {
-    input: './dist/src/adblocker.js',
+    input: './adblocker.ts',
     output: {
       file: './dist/adblocker.umd.min.js',
       format: 'umd',
       name: 'adblocker',
       sourcemap: true,
     },
     plugins: [
+      typescript(),
       resolve(),
       terser({
         output: {
@@ -28,22 +31,32 @@ export default [
     ],
   },
   {
-    input: './dist/src/adblocker.js',
+    input: './adblocker.ts',
     output: [
       {
-        dir: './dist/esm',
+        dir: './dist',
         format: 'esm',
         preserveModules: true,
         entryFileNames: '[name].js',
         sourcemap: true,
       },
       {
-        dir: './dist/cjs',
+        dir: './dist',
         format: 'cjs',
         preserveModules: true,
         entryFileNames: '[name].cjs',
         sourcemap: true,
       },
     ],
+    plugins: [
+      // compilerOptions are here a workaround for @rollup/plugin-typescript not being able to emit declarations
+      typescript({ compilerOptions: { declarationDir: './dist/types' } }),
+      copy({
+        targets: [
+          { src: './dist/types/adblocker.d.ts', dest: './dist/types', rename: 'adblocker.d.cts' },
+        ],
+        hook: 'writeBundle',
+      }),
+    ],
   },
 ];

packages/adblocker-electron/tsconfig.json

@@ -1,8 +1,7 @@
 {
   "extends": "../../tsconfig",
   "compilerOptions": {
-    "outDir": "./dist/src",
-    "declarationDir": "./dist/types",
+    "outDir": "./dist"
   },
   "references": [
     { "path": "../adblocker/tsconfig.json" },

packages/adblocker-extended-selectors/.npmignore

@@ -0,0 +1 @@
+tsconfig.tsbuildinfo