fix(arborist): use full location as tracker key when inflating - #4300

Merged
lukekarrys merged 1 commit into
release-nextfrom
fix-idealtree-inflate
Feb 22, 2022
Merged

fix(arborist): use full location as tracker key when inflating#4300
lukekarrys merged 1 commit into
release-nextfrom
fix-idealtree-inflate

Conversation

@lukekarrys

@lukekarryslukekarrys commented Jan 20, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

Fixes: #4273
Ref: #4298

I ran into this issue in #4427 while making tracker events run by default on all tests. This test was failing because the two packages being inflated are file: so they don't start with node_modules/ resulting in the location portion of the tracker key being empty. I don't see a reason why the key shouldn't be the full path, except that we show it to the user as part of the logs. But if that's a concern it can be fixed elsewhere.

@lukekarrys
lukekarrys requested a review from a team as a code ownerJanuary 20, 2022 18:29
@npm-robot

npm-robot commented Jan 20, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

found 20 benchmarks with statistically significant performance improvements

  • app-large: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
  • app-medium: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
timing results
app-largecleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@873.688 ±3.5839.321 ±0.5723.760 ±0.2427.453 ±1.403.924 ±0.213.734 ±0.033.022 ±0.0016.036 ±0.213.035 ±0.024.364 ±0.08
#43000.527 ±0.010.521 ±0.000.520 ±0.000.539 ±0.020.512 ±0.000.533 ±0.020.535 ±0.040.512 ±0.000.529 ±0.030.540 ±0.04
app-mediumcleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@847.599 ±0.8629.887 ±0.0418.121 ±0.3118.682 ±0.183.534 ±0.023.500 ±0.013.172 ±0.0512.524 ±0.002.930 ±0.043.940 ±0.05
#43000.522 ±0.010.528 ±0.010.544 ±0.010.539 ±0.040.544 ±0.000.564 ±0.040.523 ±0.000.524 ±0.000.515 ±0.010.518 ±0.00

@lukekarrys
lukekarrys marked this pull request as draft February 3, 2022 17:56
@lukekarrys
lukekarrys marked this pull request as ready for review February 22, 2022 06:49
@lukekarryslukekarrys changed the title Fix Tracker "idealTree:inflate:" already existsfix(arborist): use full location as tracker key when inflatingFeb 22, 2022
wraithgar
wraithgar reviewed Feb 22, 2022
View reviewed changes
Comment threadworkspaces/arborist/lib/arborist/build-ideal-tree.js
wraithgar
wraithgar approved these changes Feb 22, 2022
View reviewed changes

@wraithgarwraithgar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It's Fine ™️ to show the full location here imo, but if we want to strip it I added a suggestion. Approved either way.

@lukekarrys

lukekarrys commented Feb 22, 2022

Copy link
Copy Markdown
ContributorAuthor

So I'm not exactly sure why but stripping out node_modules/ at all breaks that same test I referenced above. I logged the full location and the location with node_modules/ removed and found that in that test it is inflating a and b in two different locations that end up being the same. I'm not sure if this points to a deeper arborist bug, but I'm confident that this fix is a net positive.

location: a
wo_nodem: a
====================
location: a/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: a/node_modules/@ruyadorno/package-with-added-bin
====================
location: b
wo_nodem: b
====================
location: b/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: b/node_modules/@ruyadorno/package-with-added-bin
====================
location: node_modules/a
wo_nodem: a
====================
location: node_modules/b
wo_nodem: b
====================
FAIL test/arborist/build-ideal-tree.js
✖ with lockfile
test: test/arborist/build-ideal-tree.js deduped transitive deps with asymmetrical bin declaration
at: {}
found:
!error
name: Error
message: Tracker "idealTree:inflate:a" already exists
stack: >-
Error: Tracker "idealTree:inflate:a" already exists
at Arborist.[_onError] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:96:11)
at Arborist.addTracker (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:25:21)
at Array.<anonymous> (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:761:14)
at run (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:30:26)
at /Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:39:5
at new Promise (<anonymous>)
at promiseCallLimit (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:2:48)
at Arborist.[inflateAncientLockfile] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:776:11)
at Arborist.buildIdealTree (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:214:13)

@lukekarrys
lukekarrys merged commit 9bdd1ac into release-nextFeb 22, 2022
@lukekarrys
lukekarrys deleted the fix-idealtree-inflate branch February 22, 2022 16:49
@lukekarryslukekarrys mentioned this pull request Feb 24, 2022
Merged
@npm-robotnpm-robot mentioned this pull request Feb 24, 2022
Closed
@wraithgarwraithgar mentioned this pull request Mar 15, 2022
Closed
1 task
@geriuxgeriux mentioned this pull request Nov 21, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@wraithgarwraithgarwraithgar approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@lukekarrys@npm-robot@wraithgar@ruyadorno@kirtangajjar
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(arborist): use full location as tracker key when inflating - #4300
Merged
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Feb 22, 2022
Merged
fix(arborist): use full location as tracker key when inflating#4300
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Conversation
@lukekarrys
@lukekarryslukekarrys
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Fixes: #4273

Ref: #4298
I ran into this issue in #4427 while making tracker events run by default on all tests. This test was failing because the two packages being inflated are file: so they don't start with node_modules/ resulting in the location portion of the tracker key being empty. I don't see a reason why the key shouldn't be the full path, except that we show it to the user as part of the logs. But if that's a concern it can be fixed elsewhere.
@lukekarrys
lukekarrys
requested a review
from a team
as a code ownerJanuary 20, 2022 18:29
@npm-robot
npm-robot
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
found 20 benchmarks with statistically significant performance improvements
  • app-large: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
  • app-medium: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
timing results
app-largecleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@873.688 ±3.5839.321 ±0.5723.760 ±0.2427.453 ±1.403.924 ±0.213.734 ±0.033.022 ±0.0016.036 ±0.213.035 ±0.024.364 ±0.08
#43000.527 ±0.010.521 ±0.000.520 ±0.000.539 ±0.020.512 ±0.000.533 ±0.020.535 ±0.040.512 ±0.000.529 ±0.030.540 ±0.04
app-mediumcleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@847.599 ±0.8629.887 ±0.0418.121 ±0.3118.682 ±0.183.534 ±0.023.500 ±0.013.172 ±0.0512.524 ±0.002.930 ±0.043.940 ±0.05
#43000.522 ±0.010.528 ±0.010.544 ±0.010.539 ±0.040.544 ±0.000.564 ±0.040.523 ±0.000.524 ±0.000.515 ±0.010.518 ±0.00
@lukekarrys
lukekarrys
marked this pull request as draft
February 3, 2022 17:56
@lukekarrys
lukekarrys
marked this pull request as ready for review
February 22, 2022 06:49
@lukekarryslukekarrys
changed the title
Fix Tracker "idealTree:inflate:" already existsfix(arborist): use full location as tracker key when inflatingFeb 22, 2022
wraithgar
wraithgar
reviewed
Feb 22, 2022
View reviewed changes
Comment threadworkspaces/arborist/lib/arborist/build-ideal-tree.js
wraithgar
wraithgar
approved these changes
Feb 22, 2022
View reviewed changes
@wraithgarwraithgar
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's Fine ™️ to show the full location here imo, but if we want to strip it I added a suggestion. Approved either way.
@lukekarrys
lukekarrys
commented
Feb 22, 2022

Copy link


Copy Markdown

ContributorAuthor
So I'm not exactly sure why but stripping out node_modules/ at all breaks that same test I referenced above. I logged the full location and the location with node_modules/ removed and found that in that test it is inflating a and b in two different locations that end up being the same. I'm not sure if this points to a deeper arborist bug, but I'm confident that this fix is a net positive.
location: a
wo_nodem: a
====================
location: a/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: a/node_modules/@ruyadorno/package-with-added-bin
====================
location: b
wo_nodem: b
====================
location: b/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: b/node_modules/@ruyadorno/package-with-added-bin
====================
location: node_modules/a
wo_nodem: a
====================
location: node_modules/b
wo_nodem: b
====================
FAIL test/arborist/build-ideal-tree.js
✖ with lockfile
test: test/arborist/build-ideal-tree.js deduped transitive deps with asymmetrical bin declaration
at: {}
found:
!error
name: Error
message: Tracker "idealTree:inflate:a" already exists
stack: >-
Error: Tracker "idealTree:inflate:a" already exists
at Arborist.[_onError] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:96:11)
at Arborist.addTracker (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:25:21)
at Array.<anonymous> (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:761:14)
at run (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:30:26)
at /Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:39:5
at new Promise (<anonymous>)
at promiseCallLimit (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:2:48)
at Arborist.[inflateAncientLockfile] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:776:11)
at Arborist.buildIdealTree (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:214:13)

@lukekarrys
lukekarrys
merged commit 9bdd1ac
into
release-nextFeb 22, 2022
@lukekarrys
lukekarrys
deleted the

fix-idealtree-inflate

branch
February 22, 2022 16:49
@lukekarryslukekarrys
mentioned this pull request
Feb 24, 2022
 Merged

@npm-robotnpm-robot
mentioned this pull request
Feb 24, 2022
 Closed

@wraithgarwraithgar
mentioned this pull request
Mar 15, 2022

Closed

1 task
@geriuxgeriux
mentioned this pull request
Nov 21, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@wraithgarwraithgarwraithgar approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@lukekarrys@npm-robot@wraithgar@ruyadorno@kirtangajjar

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(arborist): use full location as tracker key when inflating - #4300
Merged
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Feb 22, 2022
Merged
fix(arborist): use full location as tracker key when inflating#4300
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Conversation
@lukekarrys
@lukekarryslukekarrys
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Fixes: #4273

Ref: #4298
I ran into this issue in #4427 while making tracker events run by default on all tests. This test was failing because the two packages being inflated are file: so they don't start with node_modules/ resulting in the location portion of the tracker key being empty. I don't see a reason why the key shouldn't be the full path, except that we show it to the user as part of the logs. But if that's a concern it can be fixed elsewhere.
@lukekarrys
lukekarrys
requested a review
from a team
as a code ownerJanuary 20, 2022 18:29
@npm-robot
npm-robot
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
found 20 benchmarks with statistically significant performance improvements
  • app-large: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
  • app-medium: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
timing results
app-largecleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@873.688 ±3.5839.321 ±0.5723.760 ±0.2427.453 ±1.403.924 ±0.213.734 ±0.033.022 ±0.0016.036 ±0.213.035 ±0.024.364 ±0.08
#43000.527 ±0.010.521 ±0.000.520 ±0.000.539 ±0.020.512 ±0.000.533 ±0.020.535 ±0.040.512 ±0.000.529 ±0.030.540 ±0.04
app-mediumcleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@847.599 ±0.8629.887 ±0.0418.121 ±0.3118.682 ±0.183.534 ±0.023.500 ±0.013.172 ±0.0512.524 ±0.002.930 ±0.043.940 ±0.05
#43000.522 ±0.010.528 ±0.010.544 ±0.010.539 ±0.040.544 ±0.000.564 ±0.040.523 ±0.000.524 ±0.000.515 ±0.010.518 ±0.00
@lukekarrys
lukekarrys
marked this pull request as draft
February 3, 2022 17:56
@lukekarrys
lukekarrys
marked this pull request as ready for review
February 22, 2022 06:49
@lukekarryslukekarrys
changed the title
Fix Tracker "idealTree:inflate:" already existsfix(arborist): use full location as tracker key when inflatingFeb 22, 2022
wraithgar
wraithgar
reviewed
Feb 22, 2022
View reviewed changes
Comment threadworkspaces/arborist/lib/arborist/build-ideal-tree.js
wraithgar
wraithgar
approved these changes
Feb 22, 2022
View reviewed changes
@wraithgarwraithgar
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's Fine ™️ to show the full location here imo, but if we want to strip it I added a suggestion. Approved either way.
@lukekarrys
lukekarrys
commented
Feb 22, 2022

Copy link


Copy Markdown

ContributorAuthor
So I'm not exactly sure why but stripping out node_modules/ at all breaks that same test I referenced above. I logged the full location and the location with node_modules/ removed and found that in that test it is inflating a and b in two different locations that end up being the same. I'm not sure if this points to a deeper arborist bug, but I'm confident that this fix is a net positive.
location: a
wo_nodem: a
====================
location: a/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: a/node_modules/@ruyadorno/package-with-added-bin
====================
location: b
wo_nodem: b
====================
location: b/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: b/node_modules/@ruyadorno/package-with-added-bin
====================
location: node_modules/a
wo_nodem: a
====================
location: node_modules/b
wo_nodem: b
====================
FAIL test/arborist/build-ideal-tree.js
✖ with lockfile
test: test/arborist/build-ideal-tree.js deduped transitive deps with asymmetrical bin declaration
at: {}
found:
!error
name: Error
message: Tracker "idealTree:inflate:a" already exists
stack: >-
Error: Tracker "idealTree:inflate:a" already exists
at Arborist.[_onError] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:96:11)
at Arborist.addTracker (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:25:21)
at Array.<anonymous> (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:761:14)
at run (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:30:26)
at /Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:39:5
at new Promise (<anonymous>)
at promiseCallLimit (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:2:48)
at Arborist.[inflateAncientLockfile] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:776:11)
at Arborist.buildIdealTree (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:214:13)

@lukekarrys
lukekarrys
merged commit 9bdd1ac
into
release-nextFeb 22, 2022
@lukekarrys
lukekarrys
deleted the

fix-idealtree-inflate

branch
February 22, 2022 16:49
@lukekarryslukekarrys
mentioned this pull request
Feb 24, 2022
 Merged

@npm-robotnpm-robot
mentioned this pull request
Feb 24, 2022
 Closed

@wraithgarwraithgar
mentioned this pull request
Mar 15, 2022

Closed

1 task
@geriuxgeriux
mentioned this pull request
Nov 21, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@wraithgarwraithgarwraithgar approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@lukekarrys@npm-robot@wraithgar@ruyadorno@kirtangajjar

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(arborist): use full location as tracker key when inflating - #4300
Merged
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Feb 22, 2022
Merged
fix(arborist): use full location as tracker key when inflating#4300
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Conversation
@lukekarrys
@lukekarryslukekarrys
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Fixes: #4273

Ref: #4298
I ran into this issue in #4427 while making tracker events run by default on all tests. This test was failing because the two packages being inflated are file: so they don't start with node_modules/ resulting in the location portion of the tracker key being empty. I don't see a reason why the key shouldn't be the full path, except that we show it to the user as part of the logs. But if that's a concern it can be fixed elsewhere.
@lukekarrys
lukekarrys
requested a review
from a team
as a code ownerJanuary 20, 2022 18:29
@npm-robot
npm-robot
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
found 20 benchmarks with statistically significant performance improvements
  • app-large: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
  • app-medium: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
timing results
app-largecleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@873.688 ±3.5839.321 ±0.5723.760 ±0.2427.453 ±1.403.924 ±0.213.734 ±0.033.022 ±0.0016.036 ±0.213.035 ±0.024.364 ±0.08
#43000.527 ±0.010.521 ±0.000.520 ±0.000.539 ±0.020.512 ±0.000.533 ±0.020.535 ±0.040.512 ±0.000.529 ±0.030.540 ±0.04
app-mediumcleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@847.599 ±0.8629.887 ±0.0418.121 ±0.3118.682 ±0.183.534 ±0.023.500 ±0.013.172 ±0.0512.524 ±0.002.930 ±0.043.940 ±0.05
#43000.522 ±0.010.528 ±0.010.544 ±0.010.539 ±0.040.544 ±0.000.564 ±0.040.523 ±0.000.524 ±0.000.515 ±0.010.518 ±0.00
@lukekarrys
lukekarrys
marked this pull request as draft
February 3, 2022 17:56
@lukekarrys
lukekarrys
marked this pull request as ready for review
February 22, 2022 06:49
@lukekarryslukekarrys
changed the title
Fix Tracker "idealTree:inflate:" already existsfix(arborist): use full location as tracker key when inflatingFeb 22, 2022
wraithgar
wraithgar
reviewed
Feb 22, 2022
View reviewed changes
Comment threadworkspaces/arborist/lib/arborist/build-ideal-tree.js
wraithgar
wraithgar
approved these changes
Feb 22, 2022
View reviewed changes
@wraithgarwraithgar
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's Fine ™️ to show the full location here imo, but if we want to strip it I added a suggestion. Approved either way.
@lukekarrys
lukekarrys
commented
Feb 22, 2022

Copy link


Copy Markdown

ContributorAuthor
So I'm not exactly sure why but stripping out node_modules/ at all breaks that same test I referenced above. I logged the full location and the location with node_modules/ removed and found that in that test it is inflating a and b in two different locations that end up being the same. I'm not sure if this points to a deeper arborist bug, but I'm confident that this fix is a net positive.
location: a
wo_nodem: a
====================
location: a/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: a/node_modules/@ruyadorno/package-with-added-bin
====================
location: b
wo_nodem: b
====================
location: b/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: b/node_modules/@ruyadorno/package-with-added-bin
====================
location: node_modules/a
wo_nodem: a
====================
location: node_modules/b
wo_nodem: b
====================
FAIL test/arborist/build-ideal-tree.js
✖ with lockfile
test: test/arborist/build-ideal-tree.js deduped transitive deps with asymmetrical bin declaration
at: {}
found:
!error
name: Error
message: Tracker "idealTree:inflate:a" already exists
stack: >-
Error: Tracker "idealTree:inflate:a" already exists
at Arborist.[_onError] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:96:11)
at Arborist.addTracker (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:25:21)
at Array.<anonymous> (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:761:14)
at run (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:30:26)
at /Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:39:5
at new Promise (<anonymous>)
at promiseCallLimit (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:2:48)
at Arborist.[inflateAncientLockfile] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:776:11)
at Arborist.buildIdealTree (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:214:13)

@lukekarrys
lukekarrys
merged commit 9bdd1ac
into
release-nextFeb 22, 2022
@lukekarrys
lukekarrys
deleted the

fix-idealtree-inflate

branch
February 22, 2022 16:49
@lukekarryslukekarrys
mentioned this pull request
Feb 24, 2022
 Merged

@npm-robotnpm-robot
mentioned this pull request
Feb 24, 2022
 Closed

@wraithgarwraithgar
mentioned this pull request
Mar 15, 2022

Closed

1 task
@geriuxgeriux
mentioned this pull request
Nov 21, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@wraithgarwraithgarwraithgar approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@lukekarrys@npm-robot@wraithgar@ruyadorno@kirtangajjar

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(arborist): use full location as tracker key when inflating - #4300
Merged
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Feb 22, 2022
Merged
fix(arborist): use full location as tracker key when inflating#4300
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Conversation
@lukekarrys
@lukekarryslukekarrys
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Fixes: #4273

Ref: #4298
I ran into this issue in #4427 while making tracker events run by default on all tests. This test was failing because the two packages being inflated are file: so they don't start with node_modules/ resulting in the location portion of the tracker key being empty. I don't see a reason why the key shouldn't be the full path, except that we show it to the user as part of the logs. But if that's a concern it can be fixed elsewhere.
@lukekarrys
lukekarrys
requested a review
from a team
as a code ownerJanuary 20, 2022 18:29
@npm-robot
npm-robot
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
found 20 benchmarks with statistically significant performance improvements
  • app-large: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
  • app-medium: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
timing results
app-largecleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@873.688 ±3.5839.321 ±0.5723.760 ±0.2427.453 ±1.403.924 ±0.213.734 ±0.033.022 ±0.0016.036 ±0.213.035 ±0.024.364 ±0.08
#43000.527 ±0.010.521 ±0.000.520 ±0.000.539 ±0.020.512 ±0.000.533 ±0.020.535 ±0.040.512 ±0.000.529 ±0.030.540 ±0.04
app-mediumcleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@847.599 ±0.8629.887 ±0.0418.121 ±0.3118.682 ±0.183.534 ±0.023.500 ±0.013.172 ±0.0512.524 ±0.002.930 ±0.043.940 ±0.05
#43000.522 ±0.010.528 ±0.010.544 ±0.010.539 ±0.040.544 ±0.000.564 ±0.040.523 ±0.000.524 ±0.000.515 ±0.010.518 ±0.00
@lukekarrys
lukekarrys
marked this pull request as draft
February 3, 2022 17:56
@lukekarrys
lukekarrys
marked this pull request as ready for review
February 22, 2022 06:49
@lukekarryslukekarrys
changed the title
Fix Tracker "idealTree:inflate:" already existsfix(arborist): use full location as tracker key when inflatingFeb 22, 2022
wraithgar
wraithgar
reviewed
Feb 22, 2022
View reviewed changes
Comment threadworkspaces/arborist/lib/arborist/build-ideal-tree.js
wraithgar
wraithgar
approved these changes
Feb 22, 2022
View reviewed changes
@wraithgarwraithgar
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's Fine ™️ to show the full location here imo, but if we want to strip it I added a suggestion. Approved either way.
@lukekarrys
lukekarrys
commented
Feb 22, 2022

Copy link


Copy Markdown

ContributorAuthor
So I'm not exactly sure why but stripping out node_modules/ at all breaks that same test I referenced above. I logged the full location and the location with node_modules/ removed and found that in that test it is inflating a and b in two different locations that end up being the same. I'm not sure if this points to a deeper arborist bug, but I'm confident that this fix is a net positive.
location: a
wo_nodem: a
====================
location: a/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: a/node_modules/@ruyadorno/package-with-added-bin
====================
location: b
wo_nodem: b
====================
location: b/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: b/node_modules/@ruyadorno/package-with-added-bin
====================
location: node_modules/a
wo_nodem: a
====================
location: node_modules/b
wo_nodem: b
====================
FAIL test/arborist/build-ideal-tree.js
✖ with lockfile
test: test/arborist/build-ideal-tree.js deduped transitive deps with asymmetrical bin declaration
at: {}
found:
!error
name: Error
message: Tracker "idealTree:inflate:a" already exists
stack: >-
Error: Tracker "idealTree:inflate:a" already exists
at Arborist.[_onError] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:96:11)
at Arborist.addTracker (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:25:21)
at Array.<anonymous> (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:761:14)
at run (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:30:26)
at /Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:39:5
at new Promise (<anonymous>)
at promiseCallLimit (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:2:48)
at Arborist.[inflateAncientLockfile] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:776:11)
at Arborist.buildIdealTree (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:214:13)

@lukekarrys
lukekarrys
merged commit 9bdd1ac
into
release-nextFeb 22, 2022
@lukekarrys
lukekarrys
deleted the

fix-idealtree-inflate

branch
February 22, 2022 16:49
@lukekarryslukekarrys
mentioned this pull request
Feb 24, 2022
 Merged

@npm-robotnpm-robot
mentioned this pull request
Feb 24, 2022
 Closed

@wraithgarwraithgar
mentioned this pull request
Mar 15, 2022

Closed

1 task
@geriuxgeriux
mentioned this pull request
Nov 21, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@wraithgarwraithgarwraithgar approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@lukekarrys@npm-robot@wraithgar@ruyadorno@kirtangajjar

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(arborist): use full location as tracker key when inflating - #4300
Merged
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Feb 22, 2022
Merged
fix(arborist): use full location as tracker key when inflating#4300
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Conversation
@lukekarrys
@lukekarryslukekarrys
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Fixes: #4273

Ref: #4298
I ran into this issue in #4427 while making tracker events run by default on all tests. This test was failing because the two packages being inflated are file: so they don't start with node_modules/ resulting in the location portion of the tracker key being empty. I don't see a reason why the key shouldn't be the full path, except that we show it to the user as part of the logs. But if that's a concern it can be fixed elsewhere.
@lukekarrys
lukekarrys
requested a review
from a team
as a code ownerJanuary 20, 2022 18:29
@npm-robot
npm-robot
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
found 20 benchmarks with statistically significant performance improvements
  • app-large: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
  • app-medium: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
timing results
app-largecleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@873.688 ±3.5839.321 ±0.5723.760 ±0.2427.453 ±1.403.924 ±0.213.734 ±0.033.022 ±0.0016.036 ±0.213.035 ±0.024.364 ±0.08
#43000.527 ±0.010.521 ±0.000.520 ±0.000.539 ±0.020.512 ±0.000.533 ±0.020.535 ±0.040.512 ±0.000.529 ±0.030.540 ±0.04
app-mediumcleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@847.599 ±0.8629.887 ±0.0418.121 ±0.3118.682 ±0.183.534 ±0.023.500 ±0.013.172 ±0.0512.524 ±0.002.930 ±0.043.940 ±0.05
#43000.522 ±0.010.528 ±0.010.544 ±0.010.539 ±0.040.544 ±0.000.564 ±0.040.523 ±0.000.524 ±0.000.515 ±0.010.518 ±0.00
@lukekarrys
lukekarrys
marked this pull request as draft
February 3, 2022 17:56
@lukekarrys
lukekarrys
marked this pull request as ready for review
February 22, 2022 06:49
@lukekarryslukekarrys
changed the title
Fix Tracker "idealTree:inflate:" already existsfix(arborist): use full location as tracker key when inflatingFeb 22, 2022
wraithgar
wraithgar
reviewed
Feb 22, 2022
View reviewed changes
Comment threadworkspaces/arborist/lib/arborist/build-ideal-tree.js
wraithgar
wraithgar
approved these changes
Feb 22, 2022
View reviewed changes
@wraithgarwraithgar
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's Fine ™️ to show the full location here imo, but if we want to strip it I added a suggestion. Approved either way.
@lukekarrys
lukekarrys
commented
Feb 22, 2022

Copy link


Copy Markdown

ContributorAuthor
So I'm not exactly sure why but stripping out node_modules/ at all breaks that same test I referenced above. I logged the full location and the location with node_modules/ removed and found that in that test it is inflating a and b in two different locations that end up being the same. I'm not sure if this points to a deeper arborist bug, but I'm confident that this fix is a net positive.
location: a
wo_nodem: a
====================
location: a/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: a/node_modules/@ruyadorno/package-with-added-bin
====================
location: b
wo_nodem: b
====================
location: b/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: b/node_modules/@ruyadorno/package-with-added-bin
====================
location: node_modules/a
wo_nodem: a
====================
location: node_modules/b
wo_nodem: b
====================
FAIL test/arborist/build-ideal-tree.js
✖ with lockfile
test: test/arborist/build-ideal-tree.js deduped transitive deps with asymmetrical bin declaration
at: {}
found:
!error
name: Error
message: Tracker "idealTree:inflate:a" already exists
stack: >-
Error: Tracker "idealTree:inflate:a" already exists
at Arborist.[_onError] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:96:11)
at Arborist.addTracker (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:25:21)
at Array.<anonymous> (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:761:14)
at run (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:30:26)
at /Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:39:5
at new Promise (<anonymous>)
at promiseCallLimit (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:2:48)
at Arborist.[inflateAncientLockfile] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:776:11)
at Arborist.buildIdealTree (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:214:13)

@lukekarrys
lukekarrys
merged commit 9bdd1ac
into
release-nextFeb 22, 2022
@lukekarrys
lukekarrys
deleted the

fix-idealtree-inflate

branch
February 22, 2022 16:49
@lukekarryslukekarrys
mentioned this pull request
Feb 24, 2022
 Merged

@npm-robotnpm-robot
mentioned this pull request
Feb 24, 2022
 Closed

@wraithgarwraithgar
mentioned this pull request
Mar 15, 2022

Closed

1 task
@geriuxgeriux
mentioned this pull request
Nov 21, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@wraithgarwraithgarwraithgar approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@lukekarrys@npm-robot@wraithgar@ruyadorno@kirtangajjar

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(arborist): use full location as tracker key when inflating - #4300
Merged
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Feb 22, 2022
Merged
fix(arborist): use full location as tracker key when inflating#4300
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Conversation
@lukekarrys
@lukekarryslukekarrys
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Fixes: #4273

Ref: #4298
I ran into this issue in #4427 while making tracker events run by default on all tests. This test was failing because the two packages being inflated are file: so they don't start with node_modules/ resulting in the location portion of the tracker key being empty. I don't see a reason why the key shouldn't be the full path, except that we show it to the user as part of the logs. But if that's a concern it can be fixed elsewhere.
@lukekarrys
lukekarrys
requested a review
from a team
as a code ownerJanuary 20, 2022 18:29
@npm-robot
npm-robot
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
found 20 benchmarks with statistically significant performance improvements
  • app-large: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
  • app-medium: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
timing results
app-largecleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@873.688 ±3.5839.321 ±0.5723.760 ±0.2427.453 ±1.403.924 ±0.213.734 ±0.033.022 ±0.0016.036 ±0.213.035 ±0.024.364 ±0.08
#43000.527 ±0.010.521 ±0.000.520 ±0.000.539 ±0.020.512 ±0.000.533 ±0.020.535 ±0.040.512 ±0.000.529 ±0.030.540 ±0.04
app-mediumcleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@847.599 ±0.8629.887 ±0.0418.121 ±0.3118.682 ±0.183.534 ±0.023.500 ±0.013.172 ±0.0512.524 ±0.002.930 ±0.043.940 ±0.05
#43000.522 ±0.010.528 ±0.010.544 ±0.010.539 ±0.040.544 ±0.000.564 ±0.040.523 ±0.000.524 ±0.000.515 ±0.010.518 ±0.00
@lukekarrys
lukekarrys
marked this pull request as draft
February 3, 2022 17:56
@lukekarrys
lukekarrys
marked this pull request as ready for review
February 22, 2022 06:49
@lukekarryslukekarrys
changed the title
Fix Tracker "idealTree:inflate:" already existsfix(arborist): use full location as tracker key when inflatingFeb 22, 2022
wraithgar
wraithgar
reviewed
Feb 22, 2022
View reviewed changes
Comment threadworkspaces/arborist/lib/arborist/build-ideal-tree.js
wraithgar
wraithgar
approved these changes
Feb 22, 2022
View reviewed changes
@wraithgarwraithgar
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's Fine ™️ to show the full location here imo, but if we want to strip it I added a suggestion. Approved either way.
@lukekarrys
lukekarrys
commented
Feb 22, 2022

Copy link


Copy Markdown

ContributorAuthor
So I'm not exactly sure why but stripping out node_modules/ at all breaks that same test I referenced above. I logged the full location and the location with node_modules/ removed and found that in that test it is inflating a and b in two different locations that end up being the same. I'm not sure if this points to a deeper arborist bug, but I'm confident that this fix is a net positive.
location: a
wo_nodem: a
====================
location: a/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: a/node_modules/@ruyadorno/package-with-added-bin
====================
location: b
wo_nodem: b
====================
location: b/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: b/node_modules/@ruyadorno/package-with-added-bin
====================
location: node_modules/a
wo_nodem: a
====================
location: node_modules/b
wo_nodem: b
====================
FAIL test/arborist/build-ideal-tree.js
✖ with lockfile
test: test/arborist/build-ideal-tree.js deduped transitive deps with asymmetrical bin declaration
at: {}
found:
!error
name: Error
message: Tracker "idealTree:inflate:a" already exists
stack: >-
Error: Tracker "idealTree:inflate:a" already exists
at Arborist.[_onError] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:96:11)
at Arborist.addTracker (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:25:21)
at Array.<anonymous> (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:761:14)
at run (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:30:26)
at /Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:39:5
at new Promise (<anonymous>)
at promiseCallLimit (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:2:48)
at Arborist.[inflateAncientLockfile] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:776:11)
at Arborist.buildIdealTree (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:214:13)

@lukekarrys
lukekarrys
merged commit 9bdd1ac
into
release-nextFeb 22, 2022
@lukekarrys
lukekarrys
deleted the

fix-idealtree-inflate

branch
February 22, 2022 16:49
@lukekarryslukekarrys
mentioned this pull request
Feb 24, 2022
 Merged

@npm-robotnpm-robot
mentioned this pull request
Feb 24, 2022
 Closed

@wraithgarwraithgar
mentioned this pull request
Mar 15, 2022

Closed

1 task
@geriuxgeriux
mentioned this pull request
Nov 21, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@wraithgarwraithgarwraithgar approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@lukekarrys@npm-robot@wraithgar@ruyadorno@kirtangajjar

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(arborist): use full location as tracker key when inflating - #4300
Merged
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Feb 22, 2022
Merged
fix(arborist): use full location as tracker key when inflating#4300
lukekarrys merged 1 commit into
release-nextfrom 
fix-idealtree-inflate
Conversation
@lukekarrys
@lukekarryslukekarrys
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Fixes: #4273

Ref: #4298
I ran into this issue in #4427 while making tracker events run by default on all tests. This test was failing because the two packages being inflated are file: so they don't start with node_modules/ resulting in the location portion of the tracker key being empty. I don't see a reason why the key shouldn't be the full path, except that we show it to the user as part of the logs. But if that's a concern it can be fixed elsewhere.
@lukekarrys
lukekarrys
requested a review
from a team
as a code ownerJanuary 20, 2022 18:29
@npm-robot
npm-robot
commented
Jan 20, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
found 20 benchmarks with statistically significant performance improvements
  • app-large: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
  • app-medium: clean, lock-only, cache-only, cache-only:peer-deps, modules-only, no-lock, no-cache, no-modules, no-clean, no-clean:audit
timing results
app-largecleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@873.688 ±3.5839.321 ±0.5723.760 ±0.2427.453 ±1.403.924 ±0.213.734 ±0.033.022 ±0.0016.036 ±0.213.035 ±0.024.364 ±0.08
#43000.527 ±0.010.521 ±0.000.520 ±0.000.539 ±0.020.512 ±0.000.533 ±0.020.535 ±0.040.512 ±0.000.529 ±0.030.540 ±0.04
app-mediumcleanlock-onlycache-onlycache-only
peer-deps		modules-onlyno-lockno-cacheno-modulesno-cleanno-clean
audit
npm@847.599 ±0.8629.887 ±0.0418.121 ±0.3118.682 ±0.183.534 ±0.023.500 ±0.013.172 ±0.0512.524 ±0.002.930 ±0.043.940 ±0.05
#43000.522 ±0.010.528 ±0.010.544 ±0.010.539 ±0.040.544 ±0.000.564 ±0.040.523 ±0.000.524 ±0.000.515 ±0.010.518 ±0.00
@lukekarrys
lukekarrys
marked this pull request as draft
February 3, 2022 17:56
@lukekarrys
lukekarrys
marked this pull request as ready for review
February 22, 2022 06:49
@lukekarryslukekarrys
changed the title
Fix Tracker "idealTree:inflate:" already existsfix(arborist): use full location as tracker key when inflatingFeb 22, 2022
wraithgar
wraithgar
reviewed
Feb 22, 2022
View reviewed changes
Comment threadworkspaces/arborist/lib/arborist/build-ideal-tree.js
wraithgar
wraithgar
approved these changes
Feb 22, 2022
View reviewed changes
@wraithgarwraithgar
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

It's Fine ™️ to show the full location here imo, but if we want to strip it I added a suggestion. Approved either way.
@lukekarrys
lukekarrys
commented
Feb 22, 2022

Copy link


Copy Markdown

ContributorAuthor
So I'm not exactly sure why but stripping out node_modules/ at all breaks that same test I referenced above. I logged the full location and the location with node_modules/ removed and found that in that test it is inflating a and b in two different locations that end up being the same. I'm not sure if this points to a deeper arborist bug, but I'm confident that this fix is a net positive.
location: a
wo_nodem: a
====================
location: a/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: a/node_modules/@ruyadorno/package-with-added-bin
====================
location: b
wo_nodem: b
====================
location: b/node_modules/@ruyadorno/package-with-added-bin
wo_nodem: b/node_modules/@ruyadorno/package-with-added-bin
====================
location: node_modules/a
wo_nodem: a
====================
location: node_modules/b
wo_nodem: b
====================
FAIL test/arborist/build-ideal-tree.js
✖ with lockfile
test: test/arborist/build-ideal-tree.js deduped transitive deps with asymmetrical bin declaration
at: {}
found:
!error
name: Error
message: Tracker "idealTree:inflate:a" already exists
stack: >-
Error: Tracker "idealTree:inflate:a" already exists
at Arborist.[_onError] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:96:11)
at Arborist.addTracker (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/tracker.js:25:21)
at Array.<anonymous> (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:761:14)
at run (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:30:26)
at /Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:39:5
at new Promise (<anonymous>)
at promiseCallLimit (/Users/lukekarrys/projects/npm/cli/node_modules/promise-call-limit/index.js:2:48)
at Arborist.[inflateAncientLockfile] (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:776:11)
at Arborist.buildIdealTree (/Users/lukekarrys/projects/npm/cli/workspaces/arborist/lib/arborist/build-ideal-tree.js:214:13)

@lukekarrys
lukekarrys
merged commit 9bdd1ac
into
release-nextFeb 22, 2022
@lukekarrys
lukekarrys
deleted the

fix-idealtree-inflate

branch
February 22, 2022 16:49
@lukekarryslukekarrys
mentioned this pull request
Feb 24, 2022
 Merged

@npm-robotnpm-robot
mentioned this pull request
Feb 24, 2022
 Closed

@wraithgarwraithgar
mentioned this pull request
Mar 15, 2022

Closed

1 task
@geriuxgeriux
mentioned this pull request
Nov 21, 2022

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@wraithgarwraithgarwraithgar approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@lukekarrys@npm-robot@wraithgar@ruyadorno@kirtangajjar