Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes follow up of #13038 - swiping up ad notification doesn't trigger the dismiss event type - 1.26.x #9100

Merged
merged 1 commit into from
Jun 16, 2021

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Jun 11, 2021

Uplift of #9099
Resolves brave/brave-browser#16361

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@tmancey tmancey requested a review from a team June 11, 2021 15:45
@tmancey tmancey self-assigned this Jun 11, 2021
@tmancey tmancey added this to the 1.26.x - Beta milestone Jun 11, 2021
@tmancey tmancey force-pushed the issues/16361-1.26.x branch from 520a5a9 to 4ac045e Compare June 14, 2021 16:47
@kjozwiak
Copy link
Member

Restarting Linux as build failed as per https://ci.brave.com/job/pr-brave-browser-issues-16361-1.26.x-linux/2/execution/node/156/log/.

13:13:11  <s> [webpack.Progress] 100% 
13:13:11  
13:13:11  Hash: fa72cd3d3ed4e5e79029
13:13:11  Version: webpack 4.46.0
13:13:11  Time: 27070ms
13:13:11  Built at: 06/14/2021 5:13:11 PM
13:13:11   11 assets
13:13:11  Entrypoint brave_wallet_panel = brave_wallet_panel.bundle.js
13:13:11    [3] (webpack)/buildin/global.js 472 bytes {0} [built]
13:13:11   [18] ./node_modules/@emotion/is-prop-valid/dist/is-prop-valid.esm.js + 1 modules 4.41 KiB {0} [built]
13:13:11        |    2 modules
13:13:11  [184] ./components/brave_wallet_ui/panel/wallet_panel.tsx + 103 modules 203 KiB {0} [built]
13:13:11        |    104 modules
13:13:11  [185] ../out/Release/gen/mojo/public/js/mojo_bindings_lite.js 25 KiB {1} [built]
13:13:11  [186] ../out/Release/gen/url/mojom/url.mojom-lite.js 806 bytes {1} [built]
13:13:11  [188] ./components/brave_wallet_ui/wallet_panel_api_proxy.js + 1 modules 13.8 KiB {1} [built]
13:13:11        | ../out/Release/gen/ui/webui/resources/preprocessed/js/cr.m.js 12.2 KiB [built]
13:13:11        |     + 1 hidden module
13:13:11      + 183 hidden modules
13:13:11  
13:13:11  ERROR in ../out/Release/gen/ui/webui/resources/preprocessed/js/cr.m.js
13:13:11  Module not found: Error: Can't resolve './assert.m.js' in '/home/ubuntu/workspace/pr-brave-browser-issues-16361-1.26.x-linux/src/out/Release/gen/ui/webui/resources/preprocessed/js'
13:13:11   @ ../out/Release/gen/ui/webui/resources/preprocessed/js/cr.m.js 12:0-55 193:0-6 194:0-6 291:2-18 356:2-18
13:13:11   @ ./components/brave_wallet_ui/wallet_panel_api_proxy.js
13:13:11   @ ./components/brave_wallet_ui/panel/async/wallet_panel_async_handler.ts
13:13:11   @ ./components/brave_wallet_ui/panel/store.ts
13:13:11   @ ./components/brave_wallet_ui/panel/wallet_panel.tsx
13:13:11  
13:13:11  ERROR in ../out/Release/gen/ui/webui/resources/preprocessed/js/cr.m.js
13:13:11  Module not found: Error: Can't resolve './promise_resolver.m.js' in '/home/ubuntu/workspace/pr-brave-browser-issues-16361-1.26.x-linux/src/out/Release/gen/ui/webui/resources/preprocessed/js'
13:13:11   @ ../out/Release/gen/ui/webui/resources/preprocessed/js/cr.m.js 13:0-56 121:30-45
13:13:11   @ ./components/brave_wallet_ui/wallet_panel_api_proxy.js
13:13:11   @ ./components/brave_wallet_ui/panel/async/wallet_panel_async_handler.ts
13:13:11   @ ./components/brave_wallet_ui/panel/store.ts
13:13:11   @ ./components/brave_wallet_ui/panel/wallet_panel.tsx
13:13:11  
13:13:11  ERROR in chunk 1
13:13:11  1.chunk.js
13:13:11  /home/ubuntu/workspace/pr-brave-browser-issues-16361-1.26.x-linux/src/brave/components/brave_wallet_ui/wallet_panel_api_proxy.js a4e3f987512a3f666da5c9eb7a235402
13:13:11  Unexpected token (123:30)
13:13:11  | function sendWithPromise(methodName, var_args) {
13:13:11  |   const args = Array.prototype.slice.call(arguments, 1);
13:13:11  |   const promiseResolver = new !(function webpackMissingModule() { var e = new Error("Cannot find module './promise_resolver.m.js'"); e.code = 'MODULE_NOT_FOUND'; throw e; }())();
13:13:11  |   const id = methodName + '_' + createUid();
13:13:11  |   chromeSendResolverMap[id] = promiseResolver;
13:13:11  npm ERR! code ELIFECYCLE
13:13:11  npm ERR! errno 2
13:13:11  npm ERR! brave-core@1.26.59 web-ui: `webpack --config components/webpack/webpack.config.js --progress --colors "--mode=production" "brave_wallet_panel=/home/ubuntu/workspace/pr-brave-browser-issues-16361-1.26.x-linux/src/brave/components/brave_wallet_ui/panel/wallet_panel.tsx"`
13:13:11  npm ERR! Exit status 2
13:13:11  npm ERR! 
13:13:11 
 npm ERR! Failed at the brave-core@1.26.59 web-ui script.

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.26.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #9099 (comment).

@kjozwiak kjozwiak merged commit 44e98bc into 1.26.x Jun 16, 2021
@kjozwiak kjozwiak deleted the issues/16361-1.26.x branch June 16, 2021 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants