Opened 4 weeks ago

Last modified 3 days ago

#7308 reviewing change

Update adblockpluscore dependency to hg:728da87ae4b0

Reported by: mjethani Assignee: jsonesen
Priority: Unknown Milestone:
Module: Platform Keywords:
Cc: jsonesen, sebastian, kzar, greiner Blocked By:
Blocking: Platform: Unknown / Cross platform
Ready: no Confidential: no
Tester: Unknown Verified working: no
Review URL(s):

https://gitlab.com/eyeo/adblockplus/adblockpluschrome/merge_requests/45

Description (last modified by mjethani)

Background

We have made some breaking changes in adblockpluscore since the last dependency update and it would be a good idea to update the dependency once again.

Here is the list of changes:

What to change

Update adblockpluscore dependency to hg:728da87ae4b0 git:da8c662.

Replace let {isThirdParty} = require("../adblockpluscore/lib/domain"); with let {isThirdParty} = require("../adblockpluscore/lib/url"); in lib/csp.js, lib/filterComposer.js, lib/popupBlocker.js, lib/requestBlocker.js, and lib/whitelisting.js.

Replace the following type of loop:

for (let filter of subscription.filters())
{
  ...
}

With the following:

for (let text of subscription.filterText())
{
  let filter = Filter.fromText(text);
  ...
}

In lib/hitLogger.js and anywhere else necessary.

Change History (10)

comment:1 Changed 4 weeks ago by mjethani

  • Description modified (diff)

comment:2 Changed 6 days ago by jsonesen

  • Cc jsonesen sebastian kzar added

comment:3 Changed 6 days ago by jsonesen

  • Review URL(s) modified (diff)
  • Status changed from new to reviewing

comment:4 Changed 6 days ago by jsonesen

  • Owner set to jsonesen

comment:5 Changed 6 days ago by mjethani

  • Description modified (diff)
  • Summary changed from Update adblockpluscore dependency to hg:b30aa01e56ca to Update adblockpluscore dependency to hg:7c1cf4865d70

comment:6 Changed 6 days ago by mjethani

  • Cc greiner added

I have added Thomas. This will also require changes in UI. Subscription.prototype.filters() is gone, now you have to create the filter object from the text yielded from Subscription.prototype.filterText(), using Filter.fromText().

comment:7 Changed 6 days ago by kzar

Issue looks pretty good, will triage it once the adblockplusui part is taken care of. But, please could you add a "Hints for testers" section?

comment:8 Changed 5 days ago by greiner

I'm not sure how to best approach this from our end and it's unfortunate that we couldn't prepare for it.

Considering that we're already finishinig up #7343 and #6936 and that we only have a single Mercurial branch to supply dependency updates to both adblockpluschrome branches, I'd suggest getting #7343 in first, then this one (see also ui#366) and finally #6936 as soon as we're starting work towards the next major release.

comment:9 Changed 3 days ago by mjethani

  • Description modified (diff)
  • Summary changed from Update adblockpluscore dependency to hg:7c1cf4865d70 to Update adblockpluscore dependency to hg:728da87ae4b0

comment:10 Changed 3 days ago by mjethani

I have updated the changset to hg:728da87ae4b0. This includes the changes to the test runners requested by Tristan.

Note: See TracTickets for help on using tickets.