Configuration Definition Refactor, Phase 1 - #2878

Merged
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor
Mar 18, 2021
Merged

Configuration Definition Refactor, Phase 1#2878
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor

Conversation

@isaacs

@isaacsisaacs commented Mar 16, 2021

Copy link
Copy Markdown
Contributor

This is the first step in refactoring our configuration definition, flattening, and documentation.

Still TODO:

  • Remove all use of npm.flatOptions in lib/cli, other than passing to dependencies. (@wraithgar is working on this in another PR)
  • Audit every dependency's use of every option key, so that we know which things are used in which ways. (And so that we can stop flattening options just for our own internal usage, since we can access config.get() which is fine.)
  • Categorize config keys into groups for the purpose of easily documenting which configs are used by which commands.
  • Identify (ie, in the config definition) which flatOptions are affected by which config fields.
  • Move back to a single place where flatOptions are flattened (so that logic isn't spread across multiple config definitions in cases like saveType)

Furthermore, explore whether the flatOptions dirty flag should be "you need to regenerate all of these", or a dirty flag for the individual fields that might have changed, or just an object full of getters for each one. The current approach (generate flat options if missing, throw away when config.set() changes anything) is naive, but simple and probably performant enough.

@isaacs
isaacs requested a review from a team as a code ownerMarch 16, 2021 00:28
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from 08161ea to 9013367CompareMarch 16, 2021 00:50
@isaacs

Copy link
Copy Markdown
ContributorAuthor

This is ready to review for basic structure and approach, but there are a few blockers to landing it:

  • Should remove all use of npm.flatOptions from lib/*.js, except for passing to other deps.
  • Finish audit of config field usage (this is also turning up a few errors which will be fixed shortly).
  • Land changes to node_modules/@npmcli/config upstream and publish a major, so that when we pull it in, it's a "clean fork" from the published module before making any other changes.

@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from fac742a to 300ff77CompareMarch 16, 2021 22:29
@darcyclarkedarcyclarke added the Release 7.x work is associated with a specific npm 7 release label Mar 17, 2021
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from d08ed0a to 0206855CompareMarch 18, 2021 18:58
@isaacs
isaacs changed the base branch from latest to release-nextMarch 18, 2021 18:59
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from 0206855 to aaafab8CompareMarch 18, 2021 18:59
@isaacs
isaacs merged commit aaafab8 into release-nextMar 18, 2021
wallrat added a commit to wallrat/cli that referenced this pull request Mar 28, 2021
The default value for 'maxsockets' was changed during the refactoring in npm#2878 from 50 to 'Inifinity', this PR changes it back to the previous value of 50.
Fixesnpm#2978
ruyadorno pushed a commit to wallrat/cli that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in npm#2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixesnpm#2978
PR-URL: npm#2979
Credit: @wallratClose: npm#2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
ruyadorno pushed a commit that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in #2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixes#2978
PR-URL: #2979
Credit: @wallratClose: #2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
@nlf
nlf deleted the isaacs/config-refactor branch March 28, 2022 17:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release 7.xwork is associated with a specific npm 7 release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@isaacs@darcyclarke
, '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

Configuration Definition Refactor, Phase 1 - #2878

Merged
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor
Mar 18, 2021
Merged

Configuration Definition Refactor, Phase 1#2878
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor

Conversation

@isaacs

@isaacsisaacs commented Mar 16, 2021

Copy link
Copy Markdown
Contributor

This is the first step in refactoring our configuration definition, flattening, and documentation.

Still TODO:

  • Remove all use of npm.flatOptions in lib/cli, other than passing to dependencies. (@wraithgar is working on this in another PR)
  • Audit every dependency's use of every option key, so that we know which things are used in which ways. (And so that we can stop flattening options just for our own internal usage, since we can access config.get() which is fine.)
  • Categorize config keys into groups for the purpose of easily documenting which configs are used by which commands.
  • Identify (ie, in the config definition) which flatOptions are affected by which config fields.
  • Move back to a single place where flatOptions are flattened (so that logic isn't spread across multiple config definitions in cases like saveType)

Furthermore, explore whether the flatOptions dirty flag should be "you need to regenerate all of these", or a dirty flag for the individual fields that might have changed, or just an object full of getters for each one. The current approach (generate flat options if missing, throw away when config.set() changes anything) is naive, but simple and probably performant enough.

@isaacs
isaacs requested a review from a team as a code ownerMarch 16, 2021 00:28
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from 08161ea to 9013367CompareMarch 16, 2021 00:50
@isaacs

Copy link
Copy Markdown
ContributorAuthor

This is ready to review for basic structure and approach, but there are a few blockers to landing it:

  • Should remove all use of npm.flatOptions from lib/*.js, except for passing to other deps.
  • Finish audit of config field usage (this is also turning up a few errors which will be fixed shortly).
  • Land changes to node_modules/@npmcli/config upstream and publish a major, so that when we pull it in, it's a "clean fork" from the published module before making any other changes.

@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from fac742a to 300ff77CompareMarch 16, 2021 22:29
@darcyclarkedarcyclarke added the Release 7.x work is associated with a specific npm 7 release label Mar 17, 2021
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from d08ed0a to 0206855CompareMarch 18, 2021 18:58
@isaacs
isaacs changed the base branch from latest to release-nextMarch 18, 2021 18:59
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from 0206855 to aaafab8CompareMarch 18, 2021 18:59
@isaacs
isaacs merged commit aaafab8 into release-nextMar 18, 2021
wallrat added a commit to wallrat/cli that referenced this pull request Mar 28, 2021
The default value for 'maxsockets' was changed during the refactoring in npm#2878 from 50 to 'Inifinity', this PR changes it back to the previous value of 50.
Fixesnpm#2978
ruyadorno pushed a commit to wallrat/cli that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in npm#2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixesnpm#2978
PR-URL: npm#2979
Credit: @wallratClose: npm#2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
ruyadorno pushed a commit that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in #2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixes#2978
PR-URL: #2979
Credit: @wallratClose: #2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
@nlf
nlf deleted the isaacs/config-refactor branch March 28, 2022 17:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release 7.xwork is associated with a specific npm 7 release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@isaacs@darcyclarke
, '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

Configuration Definition Refactor, Phase 1 - #2878

Merged
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor
Mar 18, 2021
Merged

Configuration Definition Refactor, Phase 1#2878
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor

Conversation

@isaacs

@isaacsisaacs commented Mar 16, 2021

Copy link
Copy Markdown
Contributor

This is the first step in refactoring our configuration definition, flattening, and documentation.

Still TODO:

  • Remove all use of npm.flatOptions in lib/cli, other than passing to dependencies. (@wraithgar is working on this in another PR)
  • Audit every dependency's use of every option key, so that we know which things are used in which ways. (And so that we can stop flattening options just for our own internal usage, since we can access config.get() which is fine.)
  • Categorize config keys into groups for the purpose of easily documenting which configs are used by which commands.
  • Identify (ie, in the config definition) which flatOptions are affected by which config fields.
  • Move back to a single place where flatOptions are flattened (so that logic isn't spread across multiple config definitions in cases like saveType)

Furthermore, explore whether the flatOptions dirty flag should be "you need to regenerate all of these", or a dirty flag for the individual fields that might have changed, or just an object full of getters for each one. The current approach (generate flat options if missing, throw away when config.set() changes anything) is naive, but simple and probably performant enough.

@isaacs
isaacs requested a review from a team as a code ownerMarch 16, 2021 00:28
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from 08161ea to 9013367CompareMarch 16, 2021 00:50
@isaacs

Copy link
Copy Markdown
ContributorAuthor

This is ready to review for basic structure and approach, but there are a few blockers to landing it:

  • Should remove all use of npm.flatOptions from lib/*.js, except for passing to other deps.
  • Finish audit of config field usage (this is also turning up a few errors which will be fixed shortly).
  • Land changes to node_modules/@npmcli/config upstream and publish a major, so that when we pull it in, it's a "clean fork" from the published module before making any other changes.

@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from fac742a to 300ff77CompareMarch 16, 2021 22:29
@darcyclarkedarcyclarke added the Release 7.x work is associated with a specific npm 7 release label Mar 17, 2021
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from d08ed0a to 0206855CompareMarch 18, 2021 18:58
@isaacs
isaacs changed the base branch from latest to release-nextMarch 18, 2021 18:59
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from 0206855 to aaafab8CompareMarch 18, 2021 18:59
@isaacs
isaacs merged commit aaafab8 into release-nextMar 18, 2021
wallrat added a commit to wallrat/cli that referenced this pull request Mar 28, 2021
The default value for 'maxsockets' was changed during the refactoring in npm#2878 from 50 to 'Inifinity', this PR changes it back to the previous value of 50.
Fixesnpm#2978
ruyadorno pushed a commit to wallrat/cli that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in npm#2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixesnpm#2978
PR-URL: npm#2979
Credit: @wallratClose: npm#2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
ruyadorno pushed a commit that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in #2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixes#2978
PR-URL: #2979
Credit: @wallratClose: #2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
@nlf
nlf deleted the isaacs/config-refactor branch March 28, 2022 17:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release 7.xwork is associated with a specific npm 7 release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@isaacs@darcyclarke
, '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

Configuration Definition Refactor, Phase 1 - #2878

Merged
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor
Mar 18, 2021
Merged

Configuration Definition Refactor, Phase 1#2878
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor

Conversation

@isaacs

@isaacsisaacs commented Mar 16, 2021

Copy link
Copy Markdown
Contributor

This is the first step in refactoring our configuration definition, flattening, and documentation.

Still TODO:

  • Remove all use of npm.flatOptions in lib/cli, other than passing to dependencies. (@wraithgar is working on this in another PR)
  • Audit every dependency's use of every option key, so that we know which things are used in which ways. (And so that we can stop flattening options just for our own internal usage, since we can access config.get() which is fine.)
  • Categorize config keys into groups for the purpose of easily documenting which configs are used by which commands.
  • Identify (ie, in the config definition) which flatOptions are affected by which config fields.
  • Move back to a single place where flatOptions are flattened (so that logic isn't spread across multiple config definitions in cases like saveType)

Furthermore, explore whether the flatOptions dirty flag should be "you need to regenerate all of these", or a dirty flag for the individual fields that might have changed, or just an object full of getters for each one. The current approach (generate flat options if missing, throw away when config.set() changes anything) is naive, but simple and probably performant enough.

@isaacs
isaacs requested a review from a team as a code ownerMarch 16, 2021 00:28
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from 08161ea to 9013367CompareMarch 16, 2021 00:50
@isaacs

Copy link
Copy Markdown
ContributorAuthor

This is ready to review for basic structure and approach, but there are a few blockers to landing it:

  • Should remove all use of npm.flatOptions from lib/*.js, except for passing to other deps.
  • Finish audit of config field usage (this is also turning up a few errors which will be fixed shortly).
  • Land changes to node_modules/@npmcli/config upstream and publish a major, so that when we pull it in, it's a "clean fork" from the published module before making any other changes.

@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from fac742a to 300ff77CompareMarch 16, 2021 22:29
@darcyclarkedarcyclarke added the Release 7.x work is associated with a specific npm 7 release label Mar 17, 2021
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from d08ed0a to 0206855CompareMarch 18, 2021 18:58
@isaacs
isaacs changed the base branch from latest to release-nextMarch 18, 2021 18:59
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from 0206855 to aaafab8CompareMarch 18, 2021 18:59
@isaacs
isaacs merged commit aaafab8 into release-nextMar 18, 2021
wallrat added a commit to wallrat/cli that referenced this pull request Mar 28, 2021
The default value for 'maxsockets' was changed during the refactoring in npm#2878 from 50 to 'Inifinity', this PR changes it back to the previous value of 50.
Fixesnpm#2978
ruyadorno pushed a commit to wallrat/cli that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in npm#2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixesnpm#2978
PR-URL: npm#2979
Credit: @wallratClose: npm#2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
ruyadorno pushed a commit that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in #2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixes#2978
PR-URL: #2979
Credit: @wallratClose: #2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
@nlf
nlf deleted the isaacs/config-refactor branch March 28, 2022 17:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release 7.xwork is associated with a specific npm 7 release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@isaacs@darcyclarke
, '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

Configuration Definition Refactor, Phase 1 - #2878

Merged
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor
Mar 18, 2021
Merged

Configuration Definition Refactor, Phase 1#2878
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor

Conversation

@isaacs

@isaacsisaacs commented Mar 16, 2021

Copy link
Copy Markdown
Contributor

This is the first step in refactoring our configuration definition, flattening, and documentation.

Still TODO:

  • Remove all use of npm.flatOptions in lib/cli, other than passing to dependencies. (@wraithgar is working on this in another PR)
  • Audit every dependency's use of every option key, so that we know which things are used in which ways. (And so that we can stop flattening options just for our own internal usage, since we can access config.get() which is fine.)
  • Categorize config keys into groups for the purpose of easily documenting which configs are used by which commands.
  • Identify (ie, in the config definition) which flatOptions are affected by which config fields.
  • Move back to a single place where flatOptions are flattened (so that logic isn't spread across multiple config definitions in cases like saveType)

Furthermore, explore whether the flatOptions dirty flag should be "you need to regenerate all of these", or a dirty flag for the individual fields that might have changed, or just an object full of getters for each one. The current approach (generate flat options if missing, throw away when config.set() changes anything) is naive, but simple and probably performant enough.

@isaacs
isaacs requested a review from a team as a code ownerMarch 16, 2021 00:28
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from 08161ea to 9013367CompareMarch 16, 2021 00:50
@isaacs

Copy link
Copy Markdown
ContributorAuthor

This is ready to review for basic structure and approach, but there are a few blockers to landing it:

  • Should remove all use of npm.flatOptions from lib/*.js, except for passing to other deps.
  • Finish audit of config field usage (this is also turning up a few errors which will be fixed shortly).
  • Land changes to node_modules/@npmcli/config upstream and publish a major, so that when we pull it in, it's a "clean fork" from the published module before making any other changes.

@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from fac742a to 300ff77CompareMarch 16, 2021 22:29
@darcyclarkedarcyclarke added the Release 7.x work is associated with a specific npm 7 release label Mar 17, 2021
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from d08ed0a to 0206855CompareMarch 18, 2021 18:58
@isaacs
isaacs changed the base branch from latest to release-nextMarch 18, 2021 18:59
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from 0206855 to aaafab8CompareMarch 18, 2021 18:59
@isaacs
isaacs merged commit aaafab8 into release-nextMar 18, 2021
wallrat added a commit to wallrat/cli that referenced this pull request Mar 28, 2021
The default value for 'maxsockets' was changed during the refactoring in npm#2878 from 50 to 'Inifinity', this PR changes it back to the previous value of 50.
Fixesnpm#2978
ruyadorno pushed a commit to wallrat/cli that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in npm#2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixesnpm#2978
PR-URL: npm#2979
Credit: @wallratClose: npm#2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
ruyadorno pushed a commit that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in #2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixes#2978
PR-URL: #2979
Credit: @wallratClose: #2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
@nlf
nlf deleted the isaacs/config-refactor branch March 28, 2022 17:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release 7.xwork is associated with a specific npm 7 release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@isaacs@darcyclarke
, '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

Configuration Definition Refactor, Phase 1 - #2878

Merged
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor
Mar 18, 2021
Merged

Configuration Definition Refactor, Phase 1#2878
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor

Conversation

@isaacs

@isaacsisaacs commented Mar 16, 2021

Copy link
Copy Markdown
Contributor

This is the first step in refactoring our configuration definition, flattening, and documentation.

Still TODO:

  • Remove all use of npm.flatOptions in lib/cli, other than passing to dependencies. (@wraithgar is working on this in another PR)
  • Audit every dependency's use of every option key, so that we know which things are used in which ways. (And so that we can stop flattening options just for our own internal usage, since we can access config.get() which is fine.)
  • Categorize config keys into groups for the purpose of easily documenting which configs are used by which commands.
  • Identify (ie, in the config definition) which flatOptions are affected by which config fields.
  • Move back to a single place where flatOptions are flattened (so that logic isn't spread across multiple config definitions in cases like saveType)

Furthermore, explore whether the flatOptions dirty flag should be "you need to regenerate all of these", or a dirty flag for the individual fields that might have changed, or just an object full of getters for each one. The current approach (generate flat options if missing, throw away when config.set() changes anything) is naive, but simple and probably performant enough.

@isaacs
isaacs requested a review from a team as a code ownerMarch 16, 2021 00:28
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from 08161ea to 9013367CompareMarch 16, 2021 00:50
@isaacs

Copy link
Copy Markdown
ContributorAuthor

This is ready to review for basic structure and approach, but there are a few blockers to landing it:

  • Should remove all use of npm.flatOptions from lib/*.js, except for passing to other deps.
  • Finish audit of config field usage (this is also turning up a few errors which will be fixed shortly).
  • Land changes to node_modules/@npmcli/config upstream and publish a major, so that when we pull it in, it's a "clean fork" from the published module before making any other changes.

@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from fac742a to 300ff77CompareMarch 16, 2021 22:29
@darcyclarkedarcyclarke added the Release 7.x work is associated with a specific npm 7 release label Mar 17, 2021
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from d08ed0a to 0206855CompareMarch 18, 2021 18:58
@isaacs
isaacs changed the base branch from latest to release-nextMarch 18, 2021 18:59
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from 0206855 to aaafab8CompareMarch 18, 2021 18:59
@isaacs
isaacs merged commit aaafab8 into release-nextMar 18, 2021
wallrat added a commit to wallrat/cli that referenced this pull request Mar 28, 2021
The default value for 'maxsockets' was changed during the refactoring in npm#2878 from 50 to 'Inifinity', this PR changes it back to the previous value of 50.
Fixesnpm#2978
ruyadorno pushed a commit to wallrat/cli that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in npm#2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixesnpm#2978
PR-URL: npm#2979
Credit: @wallratClose: npm#2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
ruyadorno pushed a commit that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in #2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixes#2978
PR-URL: #2979
Credit: @wallratClose: #2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
@nlf
nlf deleted the isaacs/config-refactor branch March 28, 2022 17:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release 7.xwork is associated with a specific npm 7 release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@isaacs@darcyclarke
, '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

Configuration Definition Refactor, Phase 1 - #2878

Merged
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor
Mar 18, 2021
Merged

Configuration Definition Refactor, Phase 1#2878
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor

Conversation

@isaacs

@isaacsisaacs commented Mar 16, 2021

Copy link
Copy Markdown
Contributor

This is the first step in refactoring our configuration definition, flattening, and documentation.

Still TODO:

  • Remove all use of npm.flatOptions in lib/cli, other than passing to dependencies. (@wraithgar is working on this in another PR)
  • Audit every dependency's use of every option key, so that we know which things are used in which ways. (And so that we can stop flattening options just for our own internal usage, since we can access config.get() which is fine.)
  • Categorize config keys into groups for the purpose of easily documenting which configs are used by which commands.
  • Identify (ie, in the config definition) which flatOptions are affected by which config fields.
  • Move back to a single place where flatOptions are flattened (so that logic isn't spread across multiple config definitions in cases like saveType)

Furthermore, explore whether the flatOptions dirty flag should be "you need to regenerate all of these", or a dirty flag for the individual fields that might have changed, or just an object full of getters for each one. The current approach (generate flat options if missing, throw away when config.set() changes anything) is naive, but simple and probably performant enough.

@isaacs
isaacs requested a review from a team as a code ownerMarch 16, 2021 00:28
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from 08161ea to 9013367CompareMarch 16, 2021 00:50
@isaacs

Copy link
Copy Markdown
ContributorAuthor

This is ready to review for basic structure and approach, but there are a few blockers to landing it:

  • Should remove all use of npm.flatOptions from lib/*.js, except for passing to other deps.
  • Finish audit of config field usage (this is also turning up a few errors which will be fixed shortly).
  • Land changes to node_modules/@npmcli/config upstream and publish a major, so that when we pull it in, it's a "clean fork" from the published module before making any other changes.

@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from fac742a to 300ff77CompareMarch 16, 2021 22:29
@darcyclarkedarcyclarke added the Release 7.x work is associated with a specific npm 7 release label Mar 17, 2021
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from d08ed0a to 0206855CompareMarch 18, 2021 18:58
@isaacs
isaacs changed the base branch from latest to release-nextMarch 18, 2021 18:59
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from 0206855 to aaafab8CompareMarch 18, 2021 18:59
@isaacs
isaacs merged commit aaafab8 into release-nextMar 18, 2021
wallrat added a commit to wallrat/cli that referenced this pull request Mar 28, 2021
The default value for 'maxsockets' was changed during the refactoring in npm#2878 from 50 to 'Inifinity', this PR changes it back to the previous value of 50.
Fixesnpm#2978
ruyadorno pushed a commit to wallrat/cli that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in npm#2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixesnpm#2978
PR-URL: npm#2979
Credit: @wallratClose: npm#2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
ruyadorno pushed a commit that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in #2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixes#2978
PR-URL: #2979
Credit: @wallratClose: #2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
@nlf
nlf deleted the isaacs/config-refactor branch March 28, 2022 17:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release 7.xwork is associated with a specific npm 7 release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@isaacs@darcyclarke
, '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

Configuration Definition Refactor, Phase 1 - #2878

Merged
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor
Mar 18, 2021
Merged

Configuration Definition Refactor, Phase 1#2878
isaacs merged 1 commit into
release-nextfrom
isaacs/config-refactor

Conversation

@isaacs

@isaacsisaacs commented Mar 16, 2021

Copy link
Copy Markdown
Contributor

This is the first step in refactoring our configuration definition, flattening, and documentation.

Still TODO:

  • Remove all use of npm.flatOptions in lib/cli, other than passing to dependencies. (@wraithgar is working on this in another PR)
  • Audit every dependency's use of every option key, so that we know which things are used in which ways. (And so that we can stop flattening options just for our own internal usage, since we can access config.get() which is fine.)
  • Categorize config keys into groups for the purpose of easily documenting which configs are used by which commands.
  • Identify (ie, in the config definition) which flatOptions are affected by which config fields.
  • Move back to a single place where flatOptions are flattened (so that logic isn't spread across multiple config definitions in cases like saveType)

Furthermore, explore whether the flatOptions dirty flag should be "you need to regenerate all of these", or a dirty flag for the individual fields that might have changed, or just an object full of getters for each one. The current approach (generate flat options if missing, throw away when config.set() changes anything) is naive, but simple and probably performant enough.

@isaacs
isaacs requested a review from a team as a code ownerMarch 16, 2021 00:28
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from 08161ea to 9013367CompareMarch 16, 2021 00:50
@isaacs

Copy link
Copy Markdown
ContributorAuthor

This is ready to review for basic structure and approach, but there are a few blockers to landing it:

  • Should remove all use of npm.flatOptions from lib/*.js, except for passing to other deps.
  • Finish audit of config field usage (this is also turning up a few errors which will be fixed shortly).
  • Land changes to node_modules/@npmcli/config upstream and publish a major, so that when we pull it in, it's a "clean fork" from the published module before making any other changes.

@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from fac742a to 300ff77CompareMarch 16, 2021 22:29
@darcyclarkedarcyclarke added the Release 7.x work is associated with a specific npm 7 release label Mar 17, 2021
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch 4 times, most recently from d08ed0a to 0206855CompareMarch 18, 2021 18:58
@isaacs
isaacs changed the base branch from latest to release-nextMarch 18, 2021 18:59
@isaacs
isaacsforce-pushed the isaacs/config-refactor branch from 0206855 to aaafab8CompareMarch 18, 2021 18:59
@isaacs
isaacs merged commit aaafab8 into release-nextMar 18, 2021
wallrat added a commit to wallrat/cli that referenced this pull request Mar 28, 2021
The default value for 'maxsockets' was changed during the refactoring in npm#2878 from 50 to 'Inifinity', this PR changes it back to the previous value of 50.
Fixesnpm#2978
ruyadorno pushed a commit to wallrat/cli that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in npm#2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixesnpm#2978
PR-URL: npm#2979
Credit: @wallratClose: npm#2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
ruyadorno pushed a commit that referenced this pull request Mar 29, 2021
The default value for 'maxsockets' was changed during the refactoring
in #2878 from 50 to 'Inifinity', this PR changes it to the more
accurate value of 15, which was the default used in:
https://github.com/npm/make-fetch-happen/blob/785af652ec0c8f108a43004903afd2183af93904/agent.js#L15Fixes#2978
PR-URL: #2979
Credit: @wallratClose: #2979
Reviewed-by: @ruyadorno
Co-authored-by: Gar <gar+gh@danger.computer>
@nlf
nlf deleted the isaacs/config-refactor branch March 28, 2022 17:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release 7.xwork is associated with a specific npm 7 release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@isaacs@darcyclarke