') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); build: fix invalid required angular version by devversion · Pull Request #12089 · angular/components · GitHub
Skip to content

build: fix invalid required angular version - #12089

Merged
josephperrott merged 1 commit into
angular:masterfrom
devversion:build/fix-invalid-required-ng-version
Aug 9, 2018
Merged

build: fix invalid required angular version#12089
josephperrott merged 1 commit into
angular:masterfrom
devversion:build/fix-invalid-required-ng-version

Conversation

@devversion

@devversiondevversion commented Jul 6, 2018

Copy link
Copy Markdown
Member

Right now the package.json of the release packages accepts every Angular 6.0.0 beta as a working dependency.

This is not really correct since we depend on the preserveWhitespaces change from beta.6 and also depend on the new Injectable / provider API changes which are spread across the beta versions.

Also makes it easier to change the required angular version (right now it's easy to forget about the property in the build config)

References #10301 and #10216

@devversiondevversion added the P2 The issue is important to a large percentage of users, with a workaround label Jul 6, 2018
@devversion
devversion requested a review from jelbourn as a code ownerJuly 6, 2018 13:51
@googlebotgooglebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Jul 6, 2018
@CaerusKaruCaerusKaru mentioned this pull request Jul 6, 2018
Merged
@devversion
devversionforce-pushed the build/fix-invalid-required-ng-version branch from 550ad1d to ca308a1CompareJuly 9, 2018 18:01
@devversiondevversion added the target: patch This PR is targeted for the next patch release label Jul 9, 2018
@josephperrottjosephperrott added target: minor This PR is targeted for the next minor release and removed target: patch This PR is targeted for the next patch release labels Jul 9, 2018
@devversion

devversion commented Jul 9, 2018

Copy link
Copy Markdown
MemberAuthor

Since we plan to publish this as part of the next minor, can we already mark it as merge ready to make sure it won't be forgotten? @josephperrott

@jelbournjelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker labels Jul 9, 2018
@ngbot

ngbotBot commented Jul 9, 2018

Copy link
Copy Markdown

I see that you just added the pr: merge ready label, but the following checks are still failing:
failure conflicts with base branch "master"

If you want your PR to be merged, it has to pass all the CI checks.

If you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help.

@ngbot

ngbotBot commented Jul 11, 2018

Copy link
Copy Markdown

Hi @devversion! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@devversion
devversionforce-pushed the build/fix-invalid-required-ng-version branch from ca308a1 to bfdd4ffCompareJuly 11, 2018 15:18
@ngbot

ngbotBot commented Jul 18, 2018

Copy link
Copy Markdown

Hi @devversion! This PR has merge conflicts due to recent upstream merges.
Please help to unblock it by resolving these conflicts. Thanks!

@josephperrottjosephperrott added pr: needs rebase and removed action: merge The PR is ready for merge by the caretaker labels Jul 18, 2018
@devversion
devversionforce-pushed the build/fix-invalid-required-ng-version branch from bfdd4ff to b4c3deeCompareJuly 18, 2018 18:27
@devversion

devversion commented Jul 18, 2018

Copy link
Copy Markdown
MemberAuthor

@josephperrott Rebased.

@devversiondevversion added the action: merge The PR is ready for merge by the caretaker label Jul 22, 2018
@devversion
devversionforce-pushed the build/fix-invalid-required-ng-version branch from b4c3dee to fada3a6CompareJuly 24, 2018 17:15
@devversiondevversion added P1 Impacts a large percentage of users; if a workaround exists it is partial or overly painful and removed P2 The issue is important to a large percentage of users, with a workaround labels Jul 24, 2018
@angularangular deleted a comment from ngbotBotJul 24, 2018
@devversion
build: fix invalid required angular version
fdebd41
* Right now the `package.json` of the release packages accepts every Angular 6.0.0 beta as a working dependency. This is not really correct since we depend on the `preserveWhitespaces` change from `beta.6` and also depend on the new `Injectable` / `provider` syntax from `beta.4`. We either need to require a version `>= beta.6` or just go to the `6.0.0` stable release.
* Makes it easier to change the required angular version (right now it's easy to forget about the property in the build config)
@devversion
devversionforce-pushed the build/fix-invalid-required-ng-version branch from fada3a6 to fdebd41CompareJuly 30, 2018 22:01
@josephperrott
josephperrott merged commit a2c6dfc into angular:masterAug 9, 2018
josephperrott pushed a commit that referenced this pull request Aug 9, 2018
@devversion@josephperrott
build: fix invalid required angular version (#12089)
b63d0ee
devversion added a commit to devversion/material2 that referenced this pull request Aug 11, 2018
@devversion
build: sync bazel angular version placeholder
c681667
* Updates the Bazel Angular version that will be replaced within the `npm_package` rule to the required Angular version that has been changed with angular#12089.
* Removes an unused NPM script
* Adds a small check to the Bazel workspace status script that ensures that both Angular versions are in sync.
@devversiondevversion mentioned this pull request Aug 11, 2018
Merged
mmalerba pushed a commit that referenced this pull request Sep 20, 2018
@devversion@mmalerba
build: sync bazel angular version placeholder (#12635)
bbd2a61
* Updates the Bazel Angular version that will be replaced within the `npm_package` rule to the required Angular version that has been changed with #12089.
* Removes an unused NPM script
* Adds a small check to the Bazel workspace status script that ensures that both Angular versions are in sync.
roboshoes pushed a commit to roboshoes/material2 that referenced this pull request Oct 23, 2018
@devversion@roboshoes
build: sync bazel angular version placeholder (angular#12635)
a4a653e
* Updates the Bazel Angular version that will be replaced within the `npm_package` rule to the required Angular version that has been changed with angular#12089.
* Removes an unused NPM script
* Adds a small check to the Bazel workspace status script that ensures that both Angular versions are in sync.
@angular-automatic-lock-bot

angular-automatic-lock-botBot commented Sep 9, 2019

Copy link
Copy Markdown

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-botangular-automatic-lock-botBot locked and limited conversation to collaborators Sep 9, 2019
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jelbournjelbournAwaiting requested review from jelbourn

Assignees

@jelbournjelbourn

@josephperrottjosephperrott

Labels

action: mergeThe PR is ready for merge by the caretakercla: yesPR author has agreed to Google's Contributor License AgreementP1Impacts a large percentage of users; if a workaround exists it is partial or overly painfultarget: minorThis PR is targeted for the next minor release

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@devversion@jelbourn@googlebot@josephperrott