Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-22 02:12:44 +01:00
Code Issues Releases Wiki Activity
439a059cca
uBlock/Makefile

92 lines
2.2 KiB
Makefile
Raw Normal View History

Add platform "dig", to experiment/validate code changes This is a replacement for the dubious approach when the extension itself was used to run benchmarks to detect performance and filtering behavior regressions.
2021-08-15 21:47:40 +02:00
# https://stackoverflow.com/a/6273809
run_options := $(filter-out $@,$(MAKECMDGOALS))
Add `opera` as a make target
2023-01-01 16:21:54 +01:00
.PHONY: all clean test lint chromium opera firefox npm dig mv3 mv3-quick \
Add median cost output to dig-snfe
2021-08-29 14:58:20 +02:00
compare maxcost medcost mincost modifiers record wasm
Add Makefile (#3789)
2021-07-31 14:41:28 +02:00
Properly handle default list status changes in assets.json This commit fix properly handling toggling off the default status of a list such that the list will be automatically turned off when its status change from default to non-default. Additionally, imported lists which become stock lists will be properly migrated from imported lists section.
2023-03-23 18:40:51 +01:00
sources := $(wildcard assets/* assets/*/* dist/version src/* src/*/* src/*/*/* src/*/*/*/*)
Create a MVP version of uBOLite for Firefox What does not work at the time of commit: Cosmetic filtering does not work: The content scripts responsible for cosmetic filtering fail when trying to inject the stylesheets through document.adoptedStyleSheets, with the following error message: XrayWrapper denied access to property Symbol.iterator (reason: object is not safely Xrayable). See https://developer.mozilla.org/en-US/docs/Xray_vision for more information. ... css-declarative.js:106:8 A possible solution is to inject those content scripts in the MAIN world. However Firefox scripting API does not support MAIN world injection at the moment. Scriptlet-filtering does not work: Because scriptlet code needs to be injected in the MAIN world, and this is currently not supported by Firefox's scripting API, see https://bugzilla.mozilla.org/show_bug.cgi?id=1736575 There is no count badge on the toolbar icon in Firefox, as it currently does not support the `DNR.setExtensionActionOptions` method. Other than the above issues, it does appear uBO is blocking properly with no error reported in the dev console. The adoptedStyleSheets issue though is worrisome, as the cosmetic filtering content scripts were designed with ISOLATED world injection in mind. Being forced to inject in MAIN world (when available) make things a bit more complicated as uBO has to ensure it's global variables do not leak into the page.
2023-04-07 16:19:43 +02:00
platform := $(wildcard platform/* platform/*/* platform/*/*/* platform/*/*/*/* platform/*/*/*/*/*)
Use `git clone` instead of submodule to pull uAssets dependencies Related issue: - https://github.com/uBlockOrigin/uBlock-issues/issues/2358 We need two different branches of uAssets to properly add the default filter lists into the packages. I couldn't figure out how to do this with submodules, using simple `git clone` as a dependency just work.
2022-11-14 15:50:53 +01:00
assets := dist/build/uAssets
Add Makefile (#3789)
2021-07-31 14:41:28 +02:00
Add support for nodejs flavors The main nodejs flavor is "npm", which is to be used to lint/test and the publication of an official npm package -- and by design it has dependencies on mocha, eslint, etc. A new flavor "dig" has been created with minimal dependencies and which purpose is to easily allow to write specialized code to investigate local code changes in uBO -- and it's not meant for publication. Consequently, "make nodejs" has been replaced with "make npm", and a new "dig" target has been added to the makefile, to be used for instrumenting local code changes for investigation purpose.
2021-08-15 16:43:36 +02:00
all: chromium firefox npm
Add Makefile (#3789)
2021-07-31 14:41:28 +02:00
Add build script as a dependency Related discussion: - https://github.com/gorhill/uBlock/pull/3789#issuecomment-891902206
2021-08-03 17:27:55 +02:00
dist/build/uBlock0.chromium: tools/make-chromium.sh $(sources) $(platform) $(assets)
Add Makefile (#3789)
2021-07-31 14:41:28 +02:00
tools/make-chromium.sh
# Build the extension for Chromium.
chromium: dist/build/uBlock0.chromium
Add `opera` as a make target
2023-01-01 16:21:54 +01:00
dist/build/uBlock0.opera: tools/make-opera.sh $(sources) $(platform) $(assets)
tools/make-opera.sh
# Build the extension for Opera.
opera: dist/build/uBlock0.opera
Add build script as a dependency Related discussion: - https://github.com/gorhill/uBlock/pull/3789#issuecomment-891902206
2021-08-03 17:27:55 +02:00
dist/build/uBlock0.firefox: tools/make-firefox.sh $(sources) $(platform) $(assets)
Add Makefile (#3789)
2021-07-31 14:41:28 +02:00
tools/make-firefox.sh all
# Build the extension for Firefox.
firefox: dist/build/uBlock0.firefox
Add support for nodejs flavors The main nodejs flavor is "npm", which is to be used to lint/test and the publication of an official npm package -- and by design it has dependencies on mocha, eslint, etc. A new flavor "dig" has been created with minimal dependencies and which purpose is to easily allow to write specialized code to investigate local code changes in uBO -- and it's not meant for publication. Consequently, "make nodejs" has been replaced with "make npm", and a new "dig" target has been added to the makefile, to be used for instrumenting local code changes for investigation purpose.
2021-08-15 16:43:36 +02:00
dist/build/uBlock0.npm: tools/make-nodejs.sh $(sources) $(platform) $(assets)
tools/make-npm.sh
Add Makefile (#3789)
2021-07-31 14:41:28 +02:00
# Build the Node.js package.
Add support for nodejs flavors The main nodejs flavor is "npm", which is to be used to lint/test and the publication of an official npm package -- and by design it has dependencies on mocha, eslint, etc. A new flavor "dig" has been created with minimal dependencies and which purpose is to easily allow to write specialized code to investigate local code changes in uBO -- and it's not meant for publication. Consequently, "make nodejs" has been replaced with "make npm", and a new "dig" target has been added to the makefile, to be used for instrumenting local code changes for investigation purpose.
2021-08-15 16:43:36 +02:00
npm: dist/build/uBlock0.npm
Add Makefile (#3789)
2021-07-31 14:41:28 +02:00
Add support for nodejs flavors The main nodejs flavor is "npm", which is to be used to lint/test and the publication of an official npm package -- and by design it has dependencies on mocha, eslint, etc. A new flavor "dig" has been created with minimal dependencies and which purpose is to easily allow to write specialized code to investigate local code changes in uBO -- and it's not meant for publication. Consequently, "make nodejs" has been replaced with "make npm", and a new "dig" target has been added to the makefile, to be used for instrumenting local code changes for investigation purpose.
2021-08-15 16:43:36 +02:00
lint: npm
Run npm install in make-npm.sh (#3831)
2021-08-16 18:34:54 +02:00
cd dist/build/uBlock0.npm && npm run lint
Move linting out of tools/make-nodejs.sh (#3803)
2021-08-04 20:40:20 +02:00
Add support for nodejs flavors The main nodejs flavor is "npm", which is to be used to lint/test and the publication of an official npm package -- and by design it has dependencies on mocha, eslint, etc. A new flavor "dig" has been created with minimal dependencies and which purpose is to easily allow to write specialized code to investigate local code changes in uBO -- and it's not meant for publication. Consequently, "make nodejs" has been replaced with "make npm", and a new "dig" target has been added to the makefile, to be used for instrumenting local code changes for investigation purpose.
2021-08-15 16:43:36 +02:00
test: npm
Run npm install in make-npm.sh (#3831)
2021-08-16 18:34:54 +02:00
cd dist/build/uBlock0.npm && npm run test
Add support for nodejs flavors The main nodejs flavor is "npm", which is to be used to lint/test and the publication of an official npm package -- and by design it has dependencies on mocha, eslint, etc. A new flavor "dig" has been created with minimal dependencies and which purpose is to easily allow to write specialized code to investigate local code changes in uBO -- and it's not meant for publication. Consequently, "make nodejs" has been replaced with "make npm", and a new "dig" target has been added to the makefile, to be used for instrumenting local code changes for investigation purpose.
2021-08-15 16:43:36 +02:00
Add --full-battery option for tests (#3834)
2021-08-17 14:55:31 +02:00
test-full-battery: npm
cd dist/build/uBlock0.npm && npm run test-full-battery
Add check-leaks make target (#3837)
2021-08-18 13:28:23 +02:00
check-leaks: npm
cd dist/build/uBlock0.npm && npm run check-leaks
Add support for nodejs flavors The main nodejs flavor is "npm", which is to be used to lint/test and the publication of an official npm package -- and by design it has dependencies on mocha, eslint, etc. A new flavor "dig" has been created with minimal dependencies and which purpose is to easily allow to write specialized code to investigate local code changes in uBO -- and it's not meant for publication. Consequently, "make nodejs" has been replaced with "make npm", and a new "dig" target has been added to the makefile, to be used for instrumenting local code changes for investigation purpose.
2021-08-15 16:43:36 +02:00
dist/build/uBlock0.dig: tools/make-nodejs.sh $(sources) $(platform) $(assets)
tools/make-dig.sh
dig: dist/build/uBlock0.dig
Add platform "dig", to experiment/validate code changes This is a replacement for the dubious approach when the extension itself was used to run benchmarks to detect performance and filtering behavior regressions.
2021-08-15 21:47:40 +02:00
cd dist/build/uBlock0.dig && npm install
dig-snfe: dig
cd dist/build/uBlock0.dig && npm run snfe $(run_options)
Add test target to makefile (#3810)
2021-08-10 19:50:06 +02:00
Create a MVP version of uBOLite for Firefox What does not work at the time of commit: Cosmetic filtering does not work: The content scripts responsible for cosmetic filtering fail when trying to inject the stylesheets through document.adoptedStyleSheets, with the following error message: XrayWrapper denied access to property Symbol.iterator (reason: object is not safely Xrayable). See https://developer.mozilla.org/en-US/docs/Xray_vision for more information. ... css-declarative.js:106:8 A possible solution is to inject those content scripts in the MAIN world. However Firefox scripting API does not support MAIN world injection at the moment. Scriptlet-filtering does not work: Because scriptlet code needs to be injected in the MAIN world, and this is currently not supported by Firefox's scripting API, see https://bugzilla.mozilla.org/show_bug.cgi?id=1736575 There is no count badge on the toolbar icon in Firefox, as it currently does not support the `DNR.setExtensionActionOptions` method. Other than the above issues, it does appear uBO is blocking properly with no error reported in the dev console. The adoptedStyleSheets issue though is worrisome, as the cosmetic filtering content scripts were designed with ISOLATED world injection in mind. Being forced to inject in MAIN world (when available) make things a bit more complicated as uBO has to ensure it's global variables do not leak into the page.
2023-04-07 16:19:43 +02:00
mv3-chromium: tools/make-mv3.sh $(sources) $(platform)
tools/make-mv3.sh chromium
mv3-firefox: tools/make-mv3.sh $(sources) $(platform)
tools/make-mv3.sh firefox
Add experimental mv3 version This create a separate Chromium extension, named "uBO Minus (MV3)". This experimental mv3 version supports only the blocking of network requests through the declarativeNetRequest API, so as to abide by the stated MV3 philosophy of not requiring broad "read/modify data" permission. Accordingly, the extension should not trigger the warning at installation time: Read and change all your data on all websites The consequences of being permission-less are the following: - No cosmetic filtering (##) - No scriptlet injection (##+js) - No redirect= filters - No csp= filters - No removeparam= filters At this point there is no popup panel or options pages. The default filterset correspond to the default filterset of uBO proper: Listset for 'default': https://ublockorigin.github.io/uAssets/filters/badware.txt https://ublockorigin.github.io/uAssets/filters/filters.txt https://ublockorigin.github.io/uAssets/filters/filters-2020.txt https://ublockorigin.github.io/uAssets/filters/filters-2021.txt https://ublockorigin.github.io/uAssets/filters/filters-2022.txt https://ublockorigin.github.io/uAssets/filters/privacy.txt https://ublockorigin.github.io/uAssets/filters/quick-fixes.txt https://ublockorigin.github.io/uAssets/filters/resource-abuse.txt https://ublockorigin.github.io/uAssets/filters/unbreak.txt https://easylist.to/easylist/easylist.txt https://easylist.to/easylist/easyprivacy.txt https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-online.txt https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext The result of the conversion of the filters in all these filter lists is as follow: Ruleset size for 'default': 22245 Good: 21408 Maybe good (regexes): 127 redirect-rule= (discarded): 458 csp= (discarded): 85 removeparams= (discarded): 22 Unsupported: 145 The fact that the number of DNR rules are far lower than the number of network filters reported in uBO comes from the fact that lists-to-rulesets converter does its best to coallesce filters into minimal set of rules. Notably, the DNR's requestDomains condition property allows to create a single DNR rule out of all pure hostname-based filters. Regex-based rules are dynamically added at launch time since they must be validated as valid DNR regexes through isRegexSupported() API call. At this point I consider being permission-less the limiting factor: if broad "read/modify data" permission is to be used, than there is not much point for an MV3 version over MV2, just use the MV2 version if you want to benefit all the features which can't be implemented without broad "read/modify data" permission. To locally build the MV3 extension: make mv3 Then load the resulting extension directory in the browser using the "Load unpacked" button. From now on there will be a uBlock0.mv3.zip package available in each release.
2022-09-06 19:47:52 +02:00
Add per-site on/off switch to mv3 experimental version
2022-09-07 16:15:36 +02:00
mv3-quick: tools/make-mv3.sh $(sources) $(platform)
tools/make-mv3.sh quick
[mv3] Add ability to enable/disable filter lists
2022-09-13 23:44:24 +02:00
Fine tune build steps
2022-09-07 16:23:40 +02:00
mv3-full: tools/make-mv3.sh $(sources) $(platform)
Github action stuff
2022-09-08 17:21:39 +02:00
tools/make-mv3.sh full
Add experimental mv3 version This create a separate Chromium extension, named "uBO Minus (MV3)". This experimental mv3 version supports only the blocking of network requests through the declarativeNetRequest API, so as to abide by the stated MV3 philosophy of not requiring broad "read/modify data" permission. Accordingly, the extension should not trigger the warning at installation time: Read and change all your data on all websites The consequences of being permission-less are the following: - No cosmetic filtering (##) - No scriptlet injection (##+js) - No redirect= filters - No csp= filters - No removeparam= filters At this point there is no popup panel or options pages. The default filterset correspond to the default filterset of uBO proper: Listset for 'default': https://ublockorigin.github.io/uAssets/filters/badware.txt https://ublockorigin.github.io/uAssets/filters/filters.txt https://ublockorigin.github.io/uAssets/filters/filters-2020.txt https://ublockorigin.github.io/uAssets/filters/filters-2021.txt https://ublockorigin.github.io/uAssets/filters/filters-2022.txt https://ublockorigin.github.io/uAssets/filters/privacy.txt https://ublockorigin.github.io/uAssets/filters/quick-fixes.txt https://ublockorigin.github.io/uAssets/filters/resource-abuse.txt https://ublockorigin.github.io/uAssets/filters/unbreak.txt https://easylist.to/easylist/easylist.txt https://easylist.to/easylist/easyprivacy.txt https://malware-filter.gitlab.io/malware-filter/urlhaus-filter-online.txt https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext The result of the conversion of the filters in all these filter lists is as follow: Ruleset size for 'default': 22245 Good: 21408 Maybe good (regexes): 127 redirect-rule= (discarded): 458 csp= (discarded): 85 removeparams= (discarded): 22 Unsupported: 145 The fact that the number of DNR rules are far lower than the number of network filters reported in uBO comes from the fact that lists-to-rulesets converter does its best to coallesce filters into minimal set of rules. Notably, the DNR's requestDomains condition property allows to create a single DNR rule out of all pure hostname-based filters. Regex-based rules are dynamically added at launch time since they must be validated as valid DNR regexes through isRegexSupported() API call. At this point I consider being permission-less the limiting factor: if broad "read/modify data" permission is to be used, than there is not much point for an MV3 version over MV2, just use the MV2 version if you want to benefit all the features which can't be implemented without broad "read/modify data" permission. To locally build the MV3 extension: make mv3 Then load the resulting extension directory in the browser using the "Load unpacked" button. From now on there will be a uBlock0.mv3.zip package available in each release.
2022-09-06 19:47:52 +02:00
Use `git clone` instead of submodule to pull uAssets dependencies Related issue: - https://github.com/uBlockOrigin/uBlock-issues/issues/2358 We need two different branches of uAssets to properly add the default filter lists into the packages. I couldn't figure out how to do this with submodules, using simple `git clone` as a dependency just work.
2022-11-14 15:50:53 +01:00
dist/build/uAssets:
tools/pull-assets.sh
Add update-submodules as a target
2021-07-31 20:50:31 +02:00
Add Makefile (#3789)
2021-07-31 14:41:28 +02:00
clean:
Use symlink for node_modules (#3830)
2021-08-16 17:54:03 +02:00
rm -rf dist/build tmp/node_modules
Add platform "dig", to experiment/validate code changes This is a replacement for the dubious approach when the extension itself was used to run benchmarks to detect performance and filtering behavior regressions.
2021-08-15 21:47:40 +02:00
# Not real targets, just convenient for auto-completion at shell prompt
compare:
@echo
maxcost:
@echo
Add median cost output to dig-snfe
2021-08-29 14:58:20 +02:00
medcost:
@echo
Add platform "dig", to experiment/validate code changes This is a replacement for the dubious approach when the extension itself was used to run benchmarks to detect performance and filtering behavior regressions.
2021-08-15 21:47:40 +02:00
mincost:
@echo
Expose matchAndFetchModifiers() in npm package Also, add instrumentation for the method in dig-snfe.
2021-08-17 18:48:39 +02:00
modifiers:
@echo
Add platform "dig", to experiment/validate code changes This is a replacement for the dubious approach when the extension itself was used to run benchmarks to detect performance and filtering behavior regressions.
2021-08-15 21:47:40 +02:00
record:
@echo
wasm:
@echo
Reference in New Issue Copy Permalink