diff --git a/.gitignore b/.gitignore index 9edf8100bf..73bbb42645 100644 --- a/.gitignore +++ b/.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/ diff --git a/packages/adblocker-content/.npmignore b/packages/adblocker-content/.npmignore index 3dbcba493d..cc1b7f1642 100644 --- a/packages/adblocker-content/.npmignore +++ b/packages/adblocker-content/.npmignore @@ -1,2 +1 @@ -dist/cjs/tsconfig.cjs.tsbuildinfo -dist/es6/tsconfig.es6.tsbuildinfo +tsconfig.tsbuildinfo diff --git a/packages/adblocker-content/package.json b/packages/adblocker-content/package.json index 60e26ae508..655bb1f83f 100644 --- a/packages/adblocker-content/package.json +++ b/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": [ diff --git a/packages/adblocker-content/rollup.config.ts b/packages/adblocker-content/rollup.config.ts index 20debe5407..3db0fc3b83 100644 --- a/packages/adblocker-content/rollup.config.ts +++ b/packages/adblocker-content/rollup.config.ts @@ -8,10 +8,12 @@ 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', @@ -19,6 +21,7 @@ export default [ 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', + }), + ], }, ]; diff --git a/packages/adblocker-content/tsconfig.json b/packages/adblocker-content/tsconfig.json index 4c8d2eb2c2..2589707fba 100644 --- a/packages/adblocker-content/tsconfig.json +++ b/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" + ] } diff --git a/packages/adblocker-electron-example/index.js b/packages/adblocker-electron-example/index.js deleted file mode 100644 index d461d3070f..0000000000 --- a/packages/adblocker-electron-example/index.js +++ /dev/null @@ -1,2 +0,0 @@ -require('ts-node').register(); -require('./index.ts'); diff --git a/packages/adblocker-electron-example/tsconfig.json b/packages/adblocker-electron-example/tsconfig.json index 7a264ed83d..5b76cccafd 100644 --- a/packages/adblocker-electron-example/tsconfig.json +++ b/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" } diff --git a/packages/adblocker-electron-preload/.npmignore b/packages/adblocker-electron-preload/.npmignore index 3dbcba493d..cc1b7f1642 100644 --- a/packages/adblocker-electron-preload/.npmignore +++ b/packages/adblocker-electron-preload/.npmignore @@ -1,2 +1 @@ -dist/cjs/tsconfig.cjs.tsbuildinfo -dist/es6/tsconfig.es6.tsbuildinfo +tsconfig.tsbuildinfo diff --git a/packages/adblocker-electron-preload/package.json b/packages/adblocker-electron-preload/package.json index 1b88cef277..0fe44e1e8e 100644 --- a/packages/adblocker-electron-preload/package.json +++ b/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": [ diff --git a/packages/adblocker-electron-preload/rollup.config.ts b/packages/adblocker-electron-preload/rollup.config.ts index 4b2b49d230..f4c98868bf 100644 --- a/packages/adblocker-electron-preload/rollup.config.ts +++ b/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', + }), ], }; diff --git a/packages/adblocker-electron-preload/tsconfig.json b/packages/adblocker-electron-preload/tsconfig.json index cf63441456..0edfdd0f79 100644 --- a/packages/adblocker-electron-preload/tsconfig.json +++ b/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" } diff --git a/packages/adblocker-electron/.npmignore b/packages/adblocker-electron/.npmignore index 3dbcba493d..cc1b7f1642 100644 --- a/packages/adblocker-electron/.npmignore +++ b/packages/adblocker-electron/.npmignore @@ -1,2 +1 @@ -dist/cjs/tsconfig.cjs.tsbuildinfo -dist/es6/tsconfig.es6.tsbuildinfo +tsconfig.tsbuildinfo diff --git a/packages/adblocker-electron/package.json b/packages/adblocker-electron/package.json index a7c211d29b..b2d4bc9cf7 100644 --- a/packages/adblocker-electron/package.json +++ b/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" }, diff --git a/packages/adblocker-electron/rollup.config.ts b/packages/adblocker-electron/rollup.config.ts index 20debe5407..3db0fc3b83 100644 --- a/packages/adblocker-electron/rollup.config.ts +++ b/packages/adblocker-electron/rollup.config.ts @@ -8,10 +8,12 @@ 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', @@ -19,6 +21,7 @@ export default [ 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', + }), + ], }, ]; diff --git a/packages/adblocker-electron/tsconfig.json b/packages/adblocker-electron/tsconfig.json index 3a54b75cd0..f7576c90b8 100644 --- a/packages/adblocker-electron/tsconfig.json +++ b/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" }, diff --git a/packages/adblocker-extended-selectors/.npmignore b/packages/adblocker-extended-selectors/.npmignore new file mode 100644 index 0000000000..cc1b7f1642 --- /dev/null +++ b/packages/adblocker-extended-selectors/.npmignore @@ -0,0 +1 @@ +tsconfig.tsbuildinfo diff --git a/packages/adblocker-extended-selectors/package.json b/packages/adblocker-extended-selectors/package.json index 4a3de37f2f..0b57ad1d73 100644 --- a/packages/adblocker-extended-selectors/package.json +++ b/packages/adblocker-extended-selectors/package.json @@ -18,9 +18,9 @@ "types": "./dist/types/adblocker.d.ts" } }, - "main": "dist/adblocker.cjs", - "module": "dist/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" diff --git a/packages/adblocker-extended-selectors/rollup.config.ts b/packages/adblocker-extended-selectors/rollup.config.ts index f914c95494..3db0fc3b83 100644 --- a/packages/adblocker-extended-selectors/rollup.config.ts +++ b/packages/adblocker-extended-selectors/rollup.config.ts @@ -53,7 +53,7 @@ export default [ typescript({ compilerOptions: { declarationDir: './dist/types' } }), copy({ targets: [ - { src: 'dist/types/adblocker.d.ts', dest: 'dist/types', rename: 'adblocker.d.cts' }, + { src: './dist/types/adblocker.d.ts', dest: './dist/types', rename: 'adblocker.d.cts' }, ], hook: 'writeBundle', }), diff --git a/packages/adblocker-extended-selectors/tsconfig.json b/packages/adblocker-extended-selectors/tsconfig.json index 527cc378d7..ab1019374a 100644 --- a/packages/adblocker-extended-selectors/tsconfig.json +++ b/packages/adblocker-extended-selectors/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../../tsconfig", "compilerOptions": { - "declarationDir": "./dist", + "outDir": "./dist" }, "include": [ - "./adblocker.ts", "./src/*.ts", + "./adblocker.ts" ] } diff --git a/packages/adblocker-playwright-example/tsconfig.json b/packages/adblocker-playwright-example/tsconfig.json index ac5ab03ae2..58098a714c 100644 --- a/packages/adblocker-playwright-example/tsconfig.json +++ b/packages/adblocker-playwright-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-playwright/tsconfig.json" } diff --git a/packages/adblocker-playwright/.npmignore b/packages/adblocker-playwright/.npmignore index 3dbcba493d..cc1b7f1642 100644 --- a/packages/adblocker-playwright/.npmignore +++ b/packages/adblocker-playwright/.npmignore @@ -1,2 +1 @@ -dist/cjs/tsconfig.cjs.tsbuildinfo -dist/es6/tsconfig.es6.tsbuildinfo +tsconfig.tsbuildinfo diff --git a/packages/adblocker-playwright/package.json b/packages/adblocker-playwright/package.json index 89341004c5..4555f45df2 100644 --- a/packages/adblocker-playwright/package.json +++ b/packages/adblocker-playwright/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", "test": "nyc mocha --config ../../.mocharc.json" }, "bugs": { @@ -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", "chai": "^5.1.0", @@ -57,6 +63,7 @@ "playwright": "^1.38.0", "rimraf": "^5.0.1", "rollup": "^4.17.2", + "rollup-plugin-copy": "^3.5.0", "typescript": "^5.5.2" }, "contributors": [ diff --git a/packages/adblocker-playwright/rollup.config.ts b/packages/adblocker-playwright/rollup.config.ts index 20debe5407..3db0fc3b83 100644 --- a/packages/adblocker-playwright/rollup.config.ts +++ b/packages/adblocker-playwright/rollup.config.ts @@ -8,10 +8,12 @@ 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', @@ -19,6 +21,7 @@ export default [ 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', + }), + ], }, ]; diff --git a/packages/adblocker-playwright/tsconfig.json b/packages/adblocker-playwright/tsconfig.json index 4c9fb92f2e..f39344e5a5 100644 --- a/packages/adblocker-playwright/tsconfig.json +++ b/packages/adblocker-playwright/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "./dist/src", - "declarationDir": "./dist/types", + "outDir": "./dist" }, "references": [ { "path": "../adblocker/tsconfig.json" }, diff --git a/packages/adblocker-puppeteer-example/tsconfig.json b/packages/adblocker-puppeteer-example/tsconfig.json index a00a764208..f81b6090e8 100644 --- a/packages/adblocker-puppeteer-example/tsconfig.json +++ b/packages/adblocker-puppeteer-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-puppeteer/tsconfig.json" } diff --git a/packages/adblocker-puppeteer/.npmignore b/packages/adblocker-puppeteer/.npmignore index 3dbcba493d..cc1b7f1642 100644 --- a/packages/adblocker-puppeteer/.npmignore +++ b/packages/adblocker-puppeteer/.npmignore @@ -1,2 +1 @@ -dist/cjs/tsconfig.cjs.tsbuildinfo -dist/es6/tsconfig.es6.tsbuildinfo +tsconfig.tsbuildinfo diff --git a/packages/adblocker-puppeteer/package.json b/packages/adblocker-puppeteer/package.json index 876c674bee..8eac572a5e 100644 --- a/packages/adblocker-puppeteer/package.json +++ b/packages/adblocker-puppeteer/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", "test": "nyc mocha --config ../../.mocharc.json" }, "bugs": { @@ -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 @@ "puppeteer": "22.12.1", "rimraf": "^5.0.1", "rollup": "^4.17.2", + "rollup-plugin-copy": "^3.5.0", "ts-node": "^10.9.1", "typescript": "^5.5.2" }, diff --git a/packages/adblocker-puppeteer/rollup.config.ts b/packages/adblocker-puppeteer/rollup.config.ts index 20debe5407..3db0fc3b83 100644 --- a/packages/adblocker-puppeteer/rollup.config.ts +++ b/packages/adblocker-puppeteer/rollup.config.ts @@ -8,10 +8,12 @@ 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', @@ -19,6 +21,7 @@ export default [ 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', + }), + ], }, ]; diff --git a/packages/adblocker-puppeteer/tsconfig.json b/packages/adblocker-puppeteer/tsconfig.json index 4c9fb92f2e..f39344e5a5 100644 --- a/packages/adblocker-puppeteer/tsconfig.json +++ b/packages/adblocker-puppeteer/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "./dist/src", - "declarationDir": "./dist/types", + "outDir": "./dist" }, "references": [ { "path": "../adblocker/tsconfig.json" }, diff --git a/packages/adblocker-webextension-cosmetics/.npmignore b/packages/adblocker-webextension-cosmetics/.npmignore index 3dbcba493d..cc1b7f1642 100644 --- a/packages/adblocker-webextension-cosmetics/.npmignore +++ b/packages/adblocker-webextension-cosmetics/.npmignore @@ -1,2 +1 @@ -dist/cjs/tsconfig.cjs.tsbuildinfo -dist/es6/tsconfig.es6.tsbuildinfo +tsconfig.tsbuildinfo diff --git a/packages/adblocker-webextension-cosmetics/package.json b/packages/adblocker-webextension-cosmetics/package.json index 266de22104..cff0d7a50f 100644 --- a/packages/adblocker-webextension-cosmetics/package.json +++ b/packages/adblocker-webextension-cosmetics/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", "test": "nyc mocha --config ../../.mocharc.json" }, "bugs": { @@ -73,7 +78,7 @@ ], "devDependencies": { "@rollup/plugin-node-resolve": "^15.2.3", - "@rollup/plugin-typescript": "^11.1.3", + "@rollup/plugin-typescript": "^11.1.6", "@types/chai": "^4.3.6", "@types/chrome": "^0.0.268", "@types/jsdom": "^21.1.3", @@ -87,6 +92,7 @@ "nyc": "^17.0.0", "rimraf": "^5.0.1", "rollup": "^4.0.2", + "rollup-plugin-copy": "^3.5.0", "sinon": "^18.0.0", "ts-node": "^10.9.1", "typescript": "^5.5.2" diff --git a/packages/adblocker-webextension-cosmetics/rollup.config.ts b/packages/adblocker-webextension-cosmetics/rollup.config.ts index 20debe5407..3db0fc3b83 100644 --- a/packages/adblocker-webextension-cosmetics/rollup.config.ts +++ b/packages/adblocker-webextension-cosmetics/rollup.config.ts @@ -8,10 +8,12 @@ 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', @@ -19,6 +21,7 @@ export default [ 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', + }), + ], }, ]; diff --git a/packages/adblocker-webextension-cosmetics/tsconfig.json b/packages/adblocker-webextension-cosmetics/tsconfig.json index 77c94d7efc..c868484e7c 100644 --- a/packages/adblocker-webextension-cosmetics/tsconfig.json +++ b/packages/adblocker-webextension-cosmetics/tsconfig.json @@ -1,14 +1,13 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "./dist/src", - "declarationDir": "./dist/types", + "outDir": "./dist" }, "references": [ { "path": "../adblocker-content/tsconfig.json" }, { "path": "../adblocker-extended-selectors/tsconfig.json" } ], "files": [ - "adblocker.ts" + "./adblocker.ts" ] } diff --git a/packages/adblocker-webextension-example/package.json b/packages/adblocker-webextension-example/package.json index 7e488eab57..adcc51aeeb 100644 --- a/packages/adblocker-webextension-example/package.json +++ b/packages/adblocker-webextension-example/package.json @@ -21,7 +21,7 @@ "scripts": { "clean": "rimraf dist coverage", "lint": "eslint background.ts content-script.ts", - "build": "tsc --build ./tsconfig.json && rollup --config ./rollup.config.ts --configPlugin typescript", + "build": "rollup --config ./rollup.config.ts --configPlugin typescript", "watch": "rollup --config ./rollup.config.ts --configPlugin typescript --watch", "start:firefox": "npx web-ext run --source-dir='.'", "start:chromium": "npx web-ext run --source-dir='.' --target chromium" @@ -37,7 +37,7 @@ "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", "eslint": "^9.3.0", "rimraf": "^5.0.1", diff --git a/packages/adblocker-webextension-example/rollup.config.ts b/packages/adblocker-webextension-example/rollup.config.ts index 8e085790d3..6c49cc9c0d 100644 --- a/packages/adblocker-webextension-example/rollup.config.ts +++ b/packages/adblocker-webextension-example/rollup.config.ts @@ -8,10 +8,11 @@ import commonjs from '@rollup/plugin-commonjs'; import resolve from '@rollup/plugin-node-resolve'; +import typescript from '@rollup/plugin-typescript'; export default [ { - input: './dist/src/background.js', + input: './background.ts', output: { file: './dist/background.iife.js', format: 'iife', @@ -23,10 +24,11 @@ export default [ mainFields: ['main'], }), commonjs(), + typescript(), ], }, { - input: './dist/src/content-script.js', + input: './content-script.ts', output: { file: './dist/content-script.iife.js', format: 'iife', @@ -38,6 +40,7 @@ export default [ mainFields: ['main'], }), commonjs(), + typescript(), ], }, ]; diff --git a/packages/adblocker-webextension-example/tsconfig.json b/packages/adblocker-webextension-example/tsconfig.json index 2d3ea4d904..a63281a49d 100644 --- a/packages/adblocker-webextension-example/tsconfig.json +++ b/packages/adblocker-webextension-example/tsconfig.json @@ -1,9 +1,7 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig", "compilerOptions": { - "composite": true, - "outDir": "dist/src/", - "declarationDir": "dist/types" + "outDir": "./dist" }, "references": [ { "path": "../adblocker-webextension/tsconfig.json" }, diff --git a/packages/adblocker-webextension/.npmignore b/packages/adblocker-webextension/.npmignore index 3dbcba493d..cc1b7f1642 100644 --- a/packages/adblocker-webextension/.npmignore +++ b/packages/adblocker-webextension/.npmignore @@ -1,2 +1 @@ -dist/cjs/tsconfig.cjs.tsbuildinfo -dist/es6/tsconfig.es6.tsbuildinfo +tsconfig.tsbuildinfo diff --git a/packages/adblocker-webextension/package.json b/packages/adblocker-webextension/package.json index 917395914b..52fe7d3eb0 100644 --- a/packages/adblocker-webextension/package.json +++ b/packages/adblocker-webextension/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" @@ -28,7 +33,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" }, "publishConfig": { @@ -39,7 +44,7 @@ }, "devDependencies": { "@rollup/plugin-node-resolve": "^15.2.1", - "@rollup/plugin-typescript": "^11.1.3", + "@rollup/plugin-typescript": "^11.1.6", "@types/chai": "^4.3.6", "@types/mocha": "^10.0.1", "@types/node": "^20.12.12", @@ -49,6 +54,7 @@ "nyc": "^17.0.0", "rimraf": "^5.0.1", "rollup": "^4.0.2", + "rollup-plugin-copy": "^3.5.0", "ts-node": "^10.9.1", "typescript": "^5.5.2" }, diff --git a/packages/adblocker-webextension/rollup.config.ts b/packages/adblocker-webextension/rollup.config.ts index 20debe5407..3db0fc3b83 100644 --- a/packages/adblocker-webextension/rollup.config.ts +++ b/packages/adblocker-webextension/rollup.config.ts @@ -8,10 +8,12 @@ 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', @@ -19,6 +21,7 @@ export default [ 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', + }), + ], }, ]; diff --git a/packages/adblocker-webextension/tsconfig.json b/packages/adblocker-webextension/tsconfig.json index d96d3119a7..66bb062838 100644 --- a/packages/adblocker-webextension/tsconfig.json +++ b/packages/adblocker-webextension/tsconfig.json @@ -1,15 +1,13 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "./dist/src", - "declarationDir": "./dist/types", + "outDir": "./dist" }, "references": [ { "path": "../adblocker/tsconfig.json" }, { "path": "../adblocker-content/tsconfig.json" } ], "include": [ - "./src/**/*.ts", "./adblocker.ts" ] } diff --git a/packages/adblocker/.npmignore b/packages/adblocker/.npmignore index 3dbcba493d..d6233ad7b1 100644 --- a/packages/adblocker/.npmignore +++ b/packages/adblocker/.npmignore @@ -1,2 +1,4 @@ -dist/cjs/tsconfig.cjs.tsbuildinfo -dist/es6/tsconfig.es6.tsbuildinfo +tsconfig.tsbuildinfo + +dist/types/test/ +dist/types/tools/ diff --git a/packages/adblocker/package.json b/packages/adblocker/package.json index 3d9633a3a3..365793bc11 100644 --- a/packages/adblocker/package.json +++ b/packages/adblocker/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 src tools 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", "dev": "mocha --config ../../.mocharc.json --watch", "bench-metadata": "ts-node --project ./tools/tsconfig.json ./tools/bench-metadata.ts", @@ -86,7 +91,7 @@ "@remusao/smaz-generate": "^1.9.1", "@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/chai": "^4.3.6", "@types/mocha": "^10.0.1", "@types/node": "^20.6.2", @@ -98,6 +103,7 @@ "nyc": "^17.0.0", "rimraf": "^5.0.1", "rollup": "^4.0.2", + "rollup-plugin-copy": "^3.5.0", "ts-node": "^10.9.1", "typescript": "^5.5.2" }, diff --git a/packages/adblocker/rollup.config.ts b/packages/adblocker/rollup.config.ts index 20debe5407..3db0fc3b83 100644 --- a/packages/adblocker/rollup.config.ts +++ b/packages/adblocker/rollup.config.ts @@ -8,10 +8,12 @@ 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', @@ -19,6 +21,7 @@ export default [ 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', + }), + ], }, ]; diff --git a/packages/adblocker/tsconfig.json b/packages/adblocker/tsconfig.json index 8887eae88f..0dc553128c 100644 --- a/packages/adblocker/tsconfig.json +++ b/packages/adblocker/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "outDir": "./dist/src", - "declarationDir": "./dist/types", + "outDir": "./dist" }, "references": [ { "path": "../adblocker-content/tsconfig.json" }, diff --git a/yarn.lock b/yarn.lock index 8129f6de51..5d70535ba1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -379,11 +379,12 @@ __metadata: "@cliqz/adblocker-extended-selectors": "npm:^1.27.11" "@rollup/plugin-node-resolve": "npm:^15.2.1" "@rollup/plugin-terser": "npm:^0.4.4" - "@rollup/plugin-typescript": "npm:^11.1.3" + "@rollup/plugin-typescript": "npm:^11.1.6" "@types/node": "npm:^20.6.2" eslint: "npm:^9.3.0" rimraf: "npm:^5.0.1" rollup: "npm:^4.0.2" + rollup-plugin-copy: "npm:^3.5.0" typescript: "npm:^5.5.2" languageName: unknown linkType: soft @@ -409,12 +410,13 @@ __metadata: "@cliqz/adblocker-content": "npm:^1.27.11" "@rollup/plugin-commonjs": "npm:^26.0.1" "@rollup/plugin-node-resolve": "npm:^15.2.1" - "@rollup/plugin-typescript": "npm:^11.1.3" + "@rollup/plugin-typescript": "npm:^11.1.6" "@types/chrome": "npm:^0.0.268" electron: "npm:^31.0.0" eslint: "npm:^9.3.0" rimraf: "npm:^5.0.1" rollup: "npm:^4.0.2" + rollup-plugin-copy: "npm:^3.5.0" typescript: "npm:^5.5.2" peerDependencies: electron: ">11" @@ -429,6 +431,7 @@ __metadata: "@cliqz/adblocker-electron-preload": "npm:^1.27.11" "@rollup/plugin-node-resolve": "npm:^15.2.3" "@rollup/plugin-terser": "npm:^0.4.4" + "@rollup/plugin-typescript": "npm:^11.1.6" "@types/chai": "npm:^4.3.6" "@types/mocha": "npm:^10.0.1" "@types/node": "npm:^20.12.12" @@ -439,6 +442,7 @@ __metadata: nyc: "npm:^17.0.0" rimraf: "npm:^5.0.1" rollup: "npm:^4.17.2" + rollup-plugin-copy: "npm:^3.5.0" tldts-experimental: "npm:^6.0.14" ts-node: "npm:^10.9.1" typescript: "npm:^5.5.2" @@ -493,6 +497,7 @@ __metadata: "@cliqz/adblocker-content": "npm:^1.27.11" "@rollup/plugin-node-resolve": "npm:^15.2.3" "@rollup/plugin-terser": "npm:^0.4.4" + "@rollup/plugin-typescript": "npm:^11.1.6" "@types/chai": "npm:^4.3.6" "@types/mocha": "npm:^10.0.1" chai: "npm:^5.1.0" @@ -502,6 +507,7 @@ __metadata: playwright: "npm:^1.38.0" rimraf: "npm:^5.0.1" rollup: "npm:^4.17.2" + rollup-plugin-copy: "npm:^3.5.0" tldts-experimental: "npm:^6.0.14" typescript: "npm:^5.5.2" peerDependencies: @@ -531,6 +537,7 @@ __metadata: "@cliqz/adblocker-content": "npm:^1.27.11" "@rollup/plugin-node-resolve": "npm:^15.2.3" "@rollup/plugin-terser": "npm:^0.4.4" + "@rollup/plugin-typescript": "npm:^11.1.6" "@types/chai": "npm:^4.3.6" "@types/mocha": "npm:^10.0.1" "@types/node": "npm:^20.12.12" @@ -541,6 +548,7 @@ __metadata: puppeteer: "npm:22.12.1" rimraf: "npm:^5.0.1" rollup: "npm:^4.17.2" + rollup-plugin-copy: "npm:^3.5.0" tldts-experimental: "npm:^6.0.14" ts-node: "npm:^10.9.1" typescript: "npm:^5.5.2" @@ -556,7 +564,7 @@ __metadata: "@cliqz/adblocker-content": "npm:^1.27.11" "@cliqz/adblocker-extended-selectors": "npm:^1.27.11" "@rollup/plugin-node-resolve": "npm:^15.2.3" - "@rollup/plugin-typescript": "npm:^11.1.3" + "@rollup/plugin-typescript": "npm:^11.1.6" "@types/chai": "npm:^4.3.6" "@types/chrome": "npm:^0.0.268" "@types/jsdom": "npm:^21.1.3" @@ -570,6 +578,7 @@ __metadata: nyc: "npm:^17.0.0" rimraf: "npm:^5.0.1" rollup: "npm:^4.0.2" + rollup-plugin-copy: "npm:^3.5.0" sinon: "npm:^18.0.0" ts-node: "npm:^10.9.1" typescript: "npm:^5.5.2" @@ -584,7 +593,7 @@ __metadata: "@cliqz/adblocker-webextension-cosmetics": "npm:^1.27.11" "@rollup/plugin-commonjs": "npm:^26.0.1" "@rollup/plugin-node-resolve": "npm:^15.2.1" - "@rollup/plugin-typescript": "npm:^11.1.3" + "@rollup/plugin-typescript": "npm:^11.1.6" "@types/chrome": "npm:^0.0.268" eslint: "npm:^9.3.0" rimraf: "npm:^5.0.1" @@ -601,7 +610,7 @@ __metadata: "@cliqz/adblocker": "npm:^1.27.11" "@cliqz/adblocker-content": "npm:^1.27.11" "@rollup/plugin-node-resolve": "npm:^15.2.1" - "@rollup/plugin-typescript": "npm:^11.1.3" + "@rollup/plugin-typescript": "npm:^11.1.6" "@types/chai": "npm:^4.3.6" "@types/mocha": "npm:^10.0.1" "@types/node": "npm:^20.12.12" @@ -611,6 +620,7 @@ __metadata: nyc: "npm:^17.0.0" rimraf: "npm:^5.0.1" rollup: "npm:^4.0.2" + rollup-plugin-copy: "npm:^3.5.0" tldts-experimental: "npm:^6.0.14" ts-node: "npm:^10.9.1" typescript: "npm:^5.5.2" @@ -630,7 +640,7 @@ __metadata: "@remusao/smaz-generate": "npm:^1.9.1" "@rollup/plugin-node-resolve": "npm:^15.2.1" "@rollup/plugin-terser": "npm:^0.4.4" - "@rollup/plugin-typescript": "npm:^11.1.3" + "@rollup/plugin-typescript": "npm:^11.1.6" "@types/chai": "npm:^4.3.6" "@types/chrome": "npm:^0.0.268" "@types/firefox-webext-browser": "npm:^120.0.0" @@ -644,6 +654,7 @@ __metadata: nyc: "npm:^17.0.0" rimraf: "npm:^5.0.1" rollup: "npm:^4.0.2" + rollup-plugin-copy: "npm:^3.5.0" tldts-experimental: "npm:^6.0.14" ts-node: "npm:^10.9.1" typescript: "npm:^5.5.2" @@ -1759,7 +1770,7 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-typescript@npm:^11.1.3, @rollup/plugin-typescript@npm:^11.1.6": +"@rollup/plugin-typescript@npm:^11.1.6": version: 11.1.6 resolution: "@rollup/plugin-typescript@npm:11.1.6" dependencies: