Switch to new @gorhill/ubo-core package (#2100)

ghostery · Aug 2, 2021 · 48f96e7 · 48f96e7
1 parent b5a8cf8
commit 48f96e7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/adblocker-benchmarks/Makefile b/packages/adblocker-benchmarks/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all clean deps run ubo-snfe adblockpluscore adblock-rs brave cliqz cliqz-compression ublock adblockplus tldts url min
+.PHONY: all clean deps run ubo-core adblockpluscore adblock-rs brave cliqz cliqz-compression ublock adblockplus tldts url min
 
 all: deps run
 
@@ -8,11 +8,11 @@ requests.json:
 ./blockers/ublock/.git:
 	git submodule update --recursive --depth 1 --init blockers/ublock
 
-./node_modules/ubo-snfe:
+./node_modules/@gorhill/ubo-core:
 	make -C ./blockers/ublock install-nodejs clean
-	npx rollup ./node_modules/ubo-snfe/main.js --file ./node_modules/ubo-snfe/bundle.min.cjs --format cjs --context global --plugin terser
+	npx rollup ./node_modules/@gorhill/ubo-core/index.js --file ./node_modules/@gorhill/ubo-core/bundle.min.cjs --format cjs --context global --plugin terser
 
-ubo-snfe: ./blockers/ublock/.git ./node_modules/ubo-snfe
+ubo-core: ./blockers/ublock/.git ./node_modules/@gorhill/ubo-core
 
 ./blockers/adblockpluscore/.git:
 	git submodule update --recursive --depth 1 --init blockers/adblockpluscore
@@ -58,5 +58,5 @@ run: deps url tldts cliqz ublock adblockplus brave adblockfast
 
 clean:
 	rm -f requests.json
-	npm uninstall ubo-snfe adblock-rs
+	npm uninstall ubo-core adblock-rs
 	git submodule deinit --all
diff --git a/packages/adblocker-benchmarks/blockers/ublock b/packages/adblocker-benchmarks/blockers/ublock
diff --git a/packages/adblocker-benchmarks/blockers/ublock.js b/packages/adblocker-benchmarks/blockers/ublock.js
@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-const { FilteringContext, pslInit, restart } = require('ubo-snfe/bundle.min.cjs');
+const { FilteringContext, pslInit, restart } = require('@gorhill/ubo-core/bundle.min.cjs');
 
 class MockStorage {
   constructor(serialized) {

diff --git a/packages/adblocker-benchmarks/package.json b/packages/adblocker-benchmarks/package.json
@@ -15,7 +15,7 @@
   },
   "scripts": {
     "download-requests": "make requests.json",
-    "download-ubo": "make ubo-snfe",
+    "download-ubo": "make ubo-core",
     "download-abp": "make adblockpluscore",
     "download-brave": "make adblock-rs",
     "prepare": "yarn download-requests && yarn download-ubo && yarn download-abp && yarn download-brave"
+1 −1		Makefile
+0 −0		platform/nodejs/index.js
+1 −1		platform/nodejs/install.js
+7 −7		platform/nodejs/package.json
+1 −1		platform/nodejs/test.js
+36 −24		src/js/redirect-engine.js
+1 −1		src/js/start.js
+6 −9		src/js/static-net-filtering.js
+12 −4		src/js/storage.js
+9 −3		src/js/traffic.js
+2 −1		src/js/ublock.js