2062117 - New Tab: activity-stream.bundle.js and css/activity-stream.css re-added after Bug 2025793 removed them

Status: RESOLVED FIXED

(Firefox :: New Tab Page, defect, P1)

Description

[Nina Pypchenko [:nina-py]]

Bug 2025793 stopped committing the generated New Tab bundle/CSS artifacts, added them to .gitignore, and deleted activity-stream.bundle.js, vendor.bundle.js, css/activity-stream.css, and css/nova/activity-stream.css from the tree so the build generates them instead.

Two of those, browser/extensions/newtab/data/content/activity-stream.bundle.js and browser/extensions/newtab/css/activity-stream.css, were then re-added by Bug 2050954 Part 1 (D309610). They are tracked again despite being listed in .gitignore, so the committed copies and the build-generated ones are out of sync.

Remove the two re-added files with git rm so only the build-generated copies remain, matching Bug 2025793's intent.

Comment 1

[Nina Pypchenko [:nina-py]]

Attachment: Bug 2062117 - Remove newtab bundle/CSS artifacts re-added after Bug 2025793

Bug 2025793 stopped committing the generated newtab bundle and CSS and added
them to .gitignore, but Bug 2050954 later re-added
data/content/activity-stream.bundle.js and css/activity-stream.css to the tree.
Remove them again so only the build-generated, packaged copies remain.

Comment 2

[BugBot [:suhaib / :marco]]

Set release status flags based on info from the regressing bug 2050954

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://github.com/mozilla-firefox/firefox/commit/b4b220f7bfcb
https://hg.mozilla.org/integration/autoland/rev/d4d04521101b
Remove newtab bundle/CSS artifacts re-added after Bug 2025793 r=mconley

Comment 4

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/d4d04521101b