Skip to content

Commit 75efd5c

Browse files
ineshboseineshbose
committed
fix(content): move strict scanning to experimental
1 parent d3e4de7 commit 75efd5c

3 files changed

Lines changed: 62 additions & 19 deletions

File tree

‎playground/nuxt.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ export default defineNuxtConfig({
7777
exposeConfig: true,
7878
cssPath: '~/assets/css/tailwind.css',
7979
editorSupport: true,
80+
// experimental: { strictScanContentPaths: true },
8081
}satisfiesPartial<ModuleOptions>,
8182
})

‎src/internal-context/load.ts‎

Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const loadConfig = loadConfigC12<Partial<TWConfig>>
1414
typeResolvedConfig=ResolvedC12Config<Partial<TWConfig>>
1515

1616
constpagesContentPath=getContext<string[]>('twcss-pages-path')
17+
constcomponentsContentPath=getContext<string[]>('twcss-components-path')
1718
constresolvedConfigsCtx=getContext<Array<ResolvedConfig|null>>('twcss-resolved-configs')
1819

1920
constcreateInternalContext=async(moduleOptions: ModuleOptions,nuxt=useNuxt())=>{
@@ -80,7 +81,7 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
8081
if(!isLayer){
8182
constpageFiles=pagesContentPath.tryUse()
8283

83-
if(pageFiles&&pageFiles.length){
84+
if(moduleOptions.experimental?.strictScanContentPaths&&pageFiles&&pageFiles.length){
8485
// replace filenames like [...path].vue with ?...path?.vue because [ and ] are reserved in glob matching
8586
rootProjectFiles.push(...pageFiles.map(p=>p.replaceAll(/\[(\.+)([^.].*)\]/g,'?$1$2?')))
8687
}
@@ -90,21 +91,32 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
9091
}
9192
}
9293

94+
constcomponentPaths: string[]=[]
95+
constcomponentFiles=componentsContentPath.tryUse()
96+
97+
if(moduleOptions.experimental?.strictScanContentPaths&&componentFiles&&componentFiles.length){
98+
if(!isLayer)componentPaths.push(...componentFiles)
99+
}
100+
else{
101+
componentPaths.push(
102+
withSrcDir(`components/**/*${sfcExtensions}`),
103+
...(()=>{
104+
if(nuxtOptions.components){
105+
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
106+
constvalueToResolve=typeofd==='string' ? d : d?.path
107+
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
108+
}).filter(Boolean)
109+
}
110+
return[]
111+
})(),
112+
)
113+
}
114+
93115
return{
94116
config: {
95117
content: {
96118
files: [
97-
withSrcDir(`components/**/*${sfcExtensions}`),
98-
...(()=>{
99-
if(nuxtOptions.components){
100-
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
101-
constvalueToResolve=typeofd==='string' ? d : d?.path
102-
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
103-
}).filter(Boolean)
104-
}
105-
return[]
106-
})(),
107-
119+
...componentPaths,
108120
nuxtOptions.dir?.layouts&&withSrcDir(`${nuxtOptions.dir.layouts}/**/*${sfcExtensions}`),
109121
nuxtOptions.dir?.plugins&&withSrcDir(`${nuxtOptions.dir.plugins}/**/*${defaultExtensions}`),
110122
...importDirs.map(d=>`${d}/**/*${defaultExtensions}`),
@@ -241,14 +253,28 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
241253
}
242254
})
243255

244-
nuxt.hook('pages:extend',async(pages)=>{
245-
constnewPageFiles=resolvePageFiles(pages)
256+
if(moduleOptions.experimental?.strictScanContentPaths){
257+
nuxt.hook('pages:extend',async(pages)=>{
258+
constnewPageFiles=resolvePageFiles(pages)
246259

247-
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
248-
pagesContentPath.set(newPageFiles,true)
249-
awaitreloadConfigTemplate()
250-
}
251-
})
260+
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
261+
pagesContentPath.set(newPageFiles,true)
262+
awaitreloadConfigTemplate()
263+
}
264+
})
265+
266+
nuxt.hook('components:extend',async(components)=>{
267+
constnewComponentFiles=components.map(c=>c.filePath)
268+
269+
if(newComponentFiles.length!==componentsContentPath.tryUse()?.length){
270+
componentsContentPath.set(newComponentFiles,true)
271+
awaitreloadConfigTemplate()
272+
}
273+
})
274+
}
275+
else{
276+
nuxt.hook('pages:extend',()=>reloadConfigTemplate())
277+
}
252278

253279
nuxt.hook('vite:serverCreated',(server)=>{
254280
nuxt.hook('tailwindcss:internal:regenerateTemplates',(data)=>{

‎src/types.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ export type EditorSupportConfig = {
7272
autocompleteUtil: BoolObj<Pick<Import,'as'>>
7373
}
7474

75+
exporttypeExperimentalOptions={
76+
/**
77+
* Specify individual files for Nuxt scanned directories in content configuration
78+
* using `pages:extend` and `components:extend` hook.
79+
*
80+
* @default false
81+
*/
82+
strictScanContentPaths: boolean
83+
}
84+
7585
exportinterfaceModuleOptions{
7686
/**
7787
* The path of the Tailwind configuration file. The extension can be omitted, in which case it will try to find a `.js`, `.cjs`, `.mjs`, or `.ts` file.
@@ -118,6 +128,12 @@ export interface ModuleOptions {
118128
* @default false // if true, { autocompleteUtil: true }
119129
*/
120130
editorSupport: BoolObj<EditorSupportConfig>
131+
/**
132+
* Enable module experimental functionalities.
133+
*
134+
* @default false
135+
*/
136+
experimental: Partial<ExperimentalOptions>
121137
/**
122138
* This option falls back to the Tailwind configuration inlined to the PostCSS
123139
* loader, so any configuration changes while the dev server is running will

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(content): move strict scanning to experimental · nuxt-modules/tailwindcss@75efd5c · GitHub
Skip to content
Commit 75efd5c
Browse files
ineshboseineshbose
committed
fix(content): move strict scanning to experimental
1 parent d3e4de7 commit 75efd5c
3 files changed
Lines changed: 62 additions & 19 deletions
File tree
‎playground/nuxt.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ export default defineNuxtConfig({
7777
exposeConfig: true,
7878
cssPath: '~/assets/css/tailwind.css',
7979
editorSupport: true,
80+
// experimental: { strictScanContentPaths: true },
8081
}satisfiesPartial<ModuleOptions>,
8182
})
‎src/internal-context/load.ts‎
Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const loadConfig = loadConfigC12<Partial<TWConfig>>
1414
typeResolvedConfig=ResolvedC12Config<Partial<TWConfig>>
1515

1616
constpagesContentPath=getContext<string[]>('twcss-pages-path')
17+
constcomponentsContentPath=getContext<string[]>('twcss-components-path')
1718
constresolvedConfigsCtx=getContext<Array<ResolvedConfig|null>>('twcss-resolved-configs')
1819

1920
constcreateInternalContext=async(moduleOptions: ModuleOptions,nuxt=useNuxt())=>{
@@ -80,7 +81,7 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
8081
if(!isLayer){
8182
constpageFiles=pagesContentPath.tryUse()
8283

83-
if(pageFiles&&pageFiles.length){
84+
if(moduleOptions.experimental?.strictScanContentPaths&&pageFiles&&pageFiles.length){
8485
// replace filenames like [...path].vue with ?...path?.vue because [ and ] are reserved in glob matching
8586
rootProjectFiles.push(...pageFiles.map(p=>p.replaceAll(/\[(\.+)([^.].*)\]/g,'?$1$2?')))
8687
}
@@ -90,21 +91,32 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
9091
}
9192
}
9293

94+
constcomponentPaths: string[]=[]
95+
constcomponentFiles=componentsContentPath.tryUse()
96+
97+
if(moduleOptions.experimental?.strictScanContentPaths&&componentFiles&&componentFiles.length){
98+
if(!isLayer)componentPaths.push(...componentFiles)
99+
}
100+
else{
101+
componentPaths.push(
102+
withSrcDir(`components/**/*${sfcExtensions}`),
103+
 ...(()=>{
104+
if(nuxtOptions.components){
105+
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
106+
constvalueToResolve=typeofd==='string' ? d : d?.path
107+
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
108+
}).filter(Boolean)
109+
}
110+
return[]
111+
})(),
112+
)
113+
}
114+
93115
return{
94116
config: {
95117
content: {
96118
files: [
97-
withSrcDir(`components/**/*${sfcExtensions}`),
98-
 ...(()=>{
99-
if(nuxtOptions.components){
100-
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
101-
constvalueToResolve=typeofd==='string' ? d : d?.path
102-
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
103-
}).filter(Boolean)
104-
}
105-
return[]
106-
})(),
107-
119+
 ...componentPaths,
108120
nuxtOptions.dir?.layouts&&withSrcDir(`${nuxtOptions.dir.layouts}/**/*${sfcExtensions}`),
109121
nuxtOptions.dir?.plugins&&withSrcDir(`${nuxtOptions.dir.plugins}/**/*${defaultExtensions}`),
110122
 ...importDirs.map(d=>`${d}/**/*${defaultExtensions}`),
@@ -241,14 +253,28 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
241253
}
242254
})
243255

244-
nuxt.hook('pages:extend',async(pages)=>{
245-
constnewPageFiles=resolvePageFiles(pages)
256+
if(moduleOptions.experimental?.strictScanContentPaths){
257+
nuxt.hook('pages:extend',async(pages)=>{
258+
constnewPageFiles=resolvePageFiles(pages)
246259

247-
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
248-
pagesContentPath.set(newPageFiles,true)
249-
awaitreloadConfigTemplate()
250-
}
251-
})
260+
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
261+
pagesContentPath.set(newPageFiles,true)
262+
awaitreloadConfigTemplate()
263+
}
264+
})
265+
266+
nuxt.hook('components:extend',async(components)=>{
267+
constnewComponentFiles=components.map(c=>c.filePath)
268+
269+
if(newComponentFiles.length!==componentsContentPath.tryUse()?.length){
270+
componentsContentPath.set(newComponentFiles,true)
271+
awaitreloadConfigTemplate()
272+
}
273+
})
274+
}
275+
else{
276+
nuxt.hook('pages:extend',()=>reloadConfigTemplate())
277+
}
252278

253279
nuxt.hook('vite:serverCreated',(server)=>{
254280
nuxt.hook('tailwindcss:internal:regenerateTemplates',(data)=>{
‎src/types.ts‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ export type EditorSupportConfig = {
7272
autocompleteUtil: BoolObj<Pick<Import,'as'>>
7373
}
7474

75+
exporttypeExperimentalOptions={
76+
/**
77+
 * Specify individual files for Nuxt scanned directories in content configuration
78+
 * using `pages:extend` and `components:extend` hook.
79+
 *
80+
 * @default false
81+
 */
82+
strictScanContentPaths: boolean
83+
}
84+
7585
exportinterfaceModuleOptions{
7686
/**
7787
 * The path of the Tailwind configuration file. The extension can be omitted, in which case it will try to find a `.js`, `.cjs`, `.mjs`, or `.ts` file.
@@ -118,6 +128,12 @@ export interface ModuleOptions {
118128
 * @default false // if true, { autocompleteUtil: true }
119129
 */
120130
editorSupport: BoolObj<EditorSupportConfig>
131+
/**
132+
 * Enable module experimental functionalities.
133+
 *
134+
 * @default false
135+
 */
136+
experimental: Partial<ExperimentalOptions>
121137
/**
122138
 * This option falls back to the Tailwind configuration inlined to the PostCSS
123139
 * loader, so any configuration changes while the dev server is running will
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(content): move strict scanning to experimental · nuxt-modules/tailwindcss@75efd5c · GitHub
Skip to content
Commit 75efd5c
Browse files
ineshboseineshbose
committed
fix(content): move strict scanning to experimental
1 parent d3e4de7 commit 75efd5c
3 files changed
Lines changed: 62 additions & 19 deletions
File tree
‎playground/nuxt.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ export default defineNuxtConfig({
7777
exposeConfig: true,
7878
cssPath: '~/assets/css/tailwind.css',
7979
editorSupport: true,
80+
// experimental: { strictScanContentPaths: true },
8081
}satisfiesPartial<ModuleOptions>,
8182
})
‎src/internal-context/load.ts‎
Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const loadConfig = loadConfigC12<Partial<TWConfig>>
1414
typeResolvedConfig=ResolvedC12Config<Partial<TWConfig>>
1515

1616
constpagesContentPath=getContext<string[]>('twcss-pages-path')
17+
constcomponentsContentPath=getContext<string[]>('twcss-components-path')
1718
constresolvedConfigsCtx=getContext<Array<ResolvedConfig|null>>('twcss-resolved-configs')
1819

1920
constcreateInternalContext=async(moduleOptions: ModuleOptions,nuxt=useNuxt())=>{
@@ -80,7 +81,7 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
8081
if(!isLayer){
8182
constpageFiles=pagesContentPath.tryUse()
8283

83-
if(pageFiles&&pageFiles.length){
84+
if(moduleOptions.experimental?.strictScanContentPaths&&pageFiles&&pageFiles.length){
8485
// replace filenames like [...path].vue with ?...path?.vue because [ and ] are reserved in glob matching
8586
rootProjectFiles.push(...pageFiles.map(p=>p.replaceAll(/\[(\.+)([^.].*)\]/g,'?$1$2?')))
8687
}
@@ -90,21 +91,32 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
9091
}
9192
}
9293

94+
constcomponentPaths: string[]=[]
95+
constcomponentFiles=componentsContentPath.tryUse()
96+
97+
if(moduleOptions.experimental?.strictScanContentPaths&&componentFiles&&componentFiles.length){
98+
if(!isLayer)componentPaths.push(...componentFiles)
99+
}
100+
else{
101+
componentPaths.push(
102+
withSrcDir(`components/**/*${sfcExtensions}`),
103+
 ...(()=>{
104+
if(nuxtOptions.components){
105+
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
106+
constvalueToResolve=typeofd==='string' ? d : d?.path
107+
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
108+
}).filter(Boolean)
109+
}
110+
return[]
111+
})(),
112+
)
113+
}
114+
93115
return{
94116
config: {
95117
content: {
96118
files: [
97-
withSrcDir(`components/**/*${sfcExtensions}`),
98-
 ...(()=>{
99-
if(nuxtOptions.components){
100-
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
101-
constvalueToResolve=typeofd==='string' ? d : d?.path
102-
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
103-
}).filter(Boolean)
104-
}
105-
return[]
106-
})(),
107-
119+
 ...componentPaths,
108120
nuxtOptions.dir?.layouts&&withSrcDir(`${nuxtOptions.dir.layouts}/**/*${sfcExtensions}`),
109121
nuxtOptions.dir?.plugins&&withSrcDir(`${nuxtOptions.dir.plugins}/**/*${defaultExtensions}`),
110122
 ...importDirs.map(d=>`${d}/**/*${defaultExtensions}`),
@@ -241,14 +253,28 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
241253
}
242254
})
243255

244-
nuxt.hook('pages:extend',async(pages)=>{
245-
constnewPageFiles=resolvePageFiles(pages)
256+
if(moduleOptions.experimental?.strictScanContentPaths){
257+
nuxt.hook('pages:extend',async(pages)=>{
258+
constnewPageFiles=resolvePageFiles(pages)
246259

247-
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
248-
pagesContentPath.set(newPageFiles,true)
249-
awaitreloadConfigTemplate()
250-
}
251-
})
260+
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
261+
pagesContentPath.set(newPageFiles,true)
262+
awaitreloadConfigTemplate()
263+
}
264+
})
265+
266+
nuxt.hook('components:extend',async(components)=>{
267+
constnewComponentFiles=components.map(c=>c.filePath)
268+
269+
if(newComponentFiles.length!==componentsContentPath.tryUse()?.length){
270+
componentsContentPath.set(newComponentFiles,true)
271+
awaitreloadConfigTemplate()
272+
}
273+
})
274+
}
275+
else{
276+
nuxt.hook('pages:extend',()=>reloadConfigTemplate())
277+
}
252278

253279
nuxt.hook('vite:serverCreated',(server)=>{
254280
nuxt.hook('tailwindcss:internal:regenerateTemplates',(data)=>{
‎src/types.ts‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ export type EditorSupportConfig = {
7272
autocompleteUtil: BoolObj<Pick<Import,'as'>>
7373
}
7474

75+
exporttypeExperimentalOptions={
76+
/**
77+
 * Specify individual files for Nuxt scanned directories in content configuration
78+
 * using `pages:extend` and `components:extend` hook.
79+
 *
80+
 * @default false
81+
 */
82+
strictScanContentPaths: boolean
83+
}
84+
7585
exportinterfaceModuleOptions{
7686
/**
7787
 * The path of the Tailwind configuration file. The extension can be omitted, in which case it will try to find a `.js`, `.cjs`, `.mjs`, or `.ts` file.
@@ -118,6 +128,12 @@ export interface ModuleOptions {
118128
 * @default false // if true, { autocompleteUtil: true }
119129
 */
120130
editorSupport: BoolObj<EditorSupportConfig>
131+
/**
132+
 * Enable module experimental functionalities.
133+
 *
134+
 * @default false
135+
 */
136+
experimental: Partial<ExperimentalOptions>
121137
/**
122138
 * This option falls back to the Tailwind configuration inlined to the PostCSS
123139
 * loader, so any configuration changes while the dev server is running will
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(content): move strict scanning to experimental · nuxt-modules/tailwindcss@75efd5c · GitHub
Skip to content
Commit 75efd5c
Browse files
ineshboseineshbose
committed
fix(content): move strict scanning to experimental
1 parent d3e4de7 commit 75efd5c
3 files changed
Lines changed: 62 additions & 19 deletions
File tree
‎playground/nuxt.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ export default defineNuxtConfig({
7777
exposeConfig: true,
7878
cssPath: '~/assets/css/tailwind.css',
7979
editorSupport: true,
80+
// experimental: { strictScanContentPaths: true },
8081
}satisfiesPartial<ModuleOptions>,
8182
})
‎src/internal-context/load.ts‎
Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const loadConfig = loadConfigC12<Partial<TWConfig>>
1414
typeResolvedConfig=ResolvedC12Config<Partial<TWConfig>>
1515

1616
constpagesContentPath=getContext<string[]>('twcss-pages-path')
17+
constcomponentsContentPath=getContext<string[]>('twcss-components-path')
1718
constresolvedConfigsCtx=getContext<Array<ResolvedConfig|null>>('twcss-resolved-configs')
1819

1920
constcreateInternalContext=async(moduleOptions: ModuleOptions,nuxt=useNuxt())=>{
@@ -80,7 +81,7 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
8081
if(!isLayer){
8182
constpageFiles=pagesContentPath.tryUse()
8283

83-
if(pageFiles&&pageFiles.length){
84+
if(moduleOptions.experimental?.strictScanContentPaths&&pageFiles&&pageFiles.length){
8485
// replace filenames like [...path].vue with ?...path?.vue because [ and ] are reserved in glob matching
8586
rootProjectFiles.push(...pageFiles.map(p=>p.replaceAll(/\[(\.+)([^.].*)\]/g,'?$1$2?')))
8687
}
@@ -90,21 +91,32 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
9091
}
9192
}
9293

94+
constcomponentPaths: string[]=[]
95+
constcomponentFiles=componentsContentPath.tryUse()
96+
97+
if(moduleOptions.experimental?.strictScanContentPaths&&componentFiles&&componentFiles.length){
98+
if(!isLayer)componentPaths.push(...componentFiles)
99+
}
100+
else{
101+
componentPaths.push(
102+
withSrcDir(`components/**/*${sfcExtensions}`),
103+
 ...(()=>{
104+
if(nuxtOptions.components){
105+
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
106+
constvalueToResolve=typeofd==='string' ? d : d?.path
107+
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
108+
}).filter(Boolean)
109+
}
110+
return[]
111+
})(),
112+
)
113+
}
114+
93115
return{
94116
config: {
95117
content: {
96118
files: [
97-
withSrcDir(`components/**/*${sfcExtensions}`),
98-
 ...(()=>{
99-
if(nuxtOptions.components){
100-
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
101-
constvalueToResolve=typeofd==='string' ? d : d?.path
102-
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
103-
}).filter(Boolean)
104-
}
105-
return[]
106-
})(),
107-
119+
 ...componentPaths,
108120
nuxtOptions.dir?.layouts&&withSrcDir(`${nuxtOptions.dir.layouts}/**/*${sfcExtensions}`),
109121
nuxtOptions.dir?.plugins&&withSrcDir(`${nuxtOptions.dir.plugins}/**/*${defaultExtensions}`),
110122
 ...importDirs.map(d=>`${d}/**/*${defaultExtensions}`),
@@ -241,14 +253,28 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
241253
}
242254
})
243255

244-
nuxt.hook('pages:extend',async(pages)=>{
245-
constnewPageFiles=resolvePageFiles(pages)
256+
if(moduleOptions.experimental?.strictScanContentPaths){
257+
nuxt.hook('pages:extend',async(pages)=>{
258+
constnewPageFiles=resolvePageFiles(pages)
246259

247-
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
248-
pagesContentPath.set(newPageFiles,true)
249-
awaitreloadConfigTemplate()
250-
}
251-
})
260+
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
261+
pagesContentPath.set(newPageFiles,true)
262+
awaitreloadConfigTemplate()
263+
}
264+
})
265+
266+
nuxt.hook('components:extend',async(components)=>{
267+
constnewComponentFiles=components.map(c=>c.filePath)
268+
269+
if(newComponentFiles.length!==componentsContentPath.tryUse()?.length){
270+
componentsContentPath.set(newComponentFiles,true)
271+
awaitreloadConfigTemplate()
272+
}
273+
})
274+
}
275+
else{
276+
nuxt.hook('pages:extend',()=>reloadConfigTemplate())
277+
}
252278

253279
nuxt.hook('vite:serverCreated',(server)=>{
254280
nuxt.hook('tailwindcss:internal:regenerateTemplates',(data)=>{
‎src/types.ts‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ export type EditorSupportConfig = {
7272
autocompleteUtil: BoolObj<Pick<Import,'as'>>
7373
}
7474

75+
exporttypeExperimentalOptions={
76+
/**
77+
 * Specify individual files for Nuxt scanned directories in content configuration
78+
 * using `pages:extend` and `components:extend` hook.
79+
 *
80+
 * @default false
81+
 */
82+
strictScanContentPaths: boolean
83+
}
84+
7585
exportinterfaceModuleOptions{
7686
/**
7787
 * The path of the Tailwind configuration file. The extension can be omitted, in which case it will try to find a `.js`, `.cjs`, `.mjs`, or `.ts` file.
@@ -118,6 +128,12 @@ export interface ModuleOptions {
118128
 * @default false // if true, { autocompleteUtil: true }
119129
 */
120130
editorSupport: BoolObj<EditorSupportConfig>
131+
/**
132+
 * Enable module experimental functionalities.
133+
 *
134+
 * @default false
135+
 */
136+
experimental: Partial<ExperimentalOptions>
121137
/**
122138
 * This option falls back to the Tailwind configuration inlined to the PostCSS
123139
 * loader, so any configuration changes while the dev server is running will
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(content): move strict scanning to experimental · nuxt-modules/tailwindcss@75efd5c · GitHub
Skip to content
Commit 75efd5c
Browse files
ineshboseineshbose
committed
fix(content): move strict scanning to experimental
1 parent d3e4de7 commit 75efd5c
3 files changed
Lines changed: 62 additions & 19 deletions
File tree
‎playground/nuxt.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ export default defineNuxtConfig({
7777
exposeConfig: true,
7878
cssPath: '~/assets/css/tailwind.css',
7979
editorSupport: true,
80+
// experimental: { strictScanContentPaths: true },
8081
}satisfiesPartial<ModuleOptions>,
8182
})
‎src/internal-context/load.ts‎
Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const loadConfig = loadConfigC12<Partial<TWConfig>>
1414
typeResolvedConfig=ResolvedC12Config<Partial<TWConfig>>
1515

1616
constpagesContentPath=getContext<string[]>('twcss-pages-path')
17+
constcomponentsContentPath=getContext<string[]>('twcss-components-path')
1718
constresolvedConfigsCtx=getContext<Array<ResolvedConfig|null>>('twcss-resolved-configs')
1819

1920
constcreateInternalContext=async(moduleOptions: ModuleOptions,nuxt=useNuxt())=>{
@@ -80,7 +81,7 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
8081
if(!isLayer){
8182
constpageFiles=pagesContentPath.tryUse()
8283

83-
if(pageFiles&&pageFiles.length){
84+
if(moduleOptions.experimental?.strictScanContentPaths&&pageFiles&&pageFiles.length){
8485
// replace filenames like [...path].vue with ?...path?.vue because [ and ] are reserved in glob matching
8586
rootProjectFiles.push(...pageFiles.map(p=>p.replaceAll(/\[(\.+)([^.].*)\]/g,'?$1$2?')))
8687
}
@@ -90,21 +91,32 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
9091
}
9192
}
9293

94+
constcomponentPaths: string[]=[]
95+
constcomponentFiles=componentsContentPath.tryUse()
96+
97+
if(moduleOptions.experimental?.strictScanContentPaths&&componentFiles&&componentFiles.length){
98+
if(!isLayer)componentPaths.push(...componentFiles)
99+
}
100+
else{
101+
componentPaths.push(
102+
withSrcDir(`components/**/*${sfcExtensions}`),
103+
 ...(()=>{
104+
if(nuxtOptions.components){
105+
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
106+
constvalueToResolve=typeofd==='string' ? d : d?.path
107+
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
108+
}).filter(Boolean)
109+
}
110+
return[]
111+
})(),
112+
)
113+
}
114+
93115
return{
94116
config: {
95117
content: {
96118
files: [
97-
withSrcDir(`components/**/*${sfcExtensions}`),
98-
 ...(()=>{
99-
if(nuxtOptions.components){
100-
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
101-
constvalueToResolve=typeofd==='string' ? d : d?.path
102-
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
103-
}).filter(Boolean)
104-
}
105-
return[]
106-
})(),
107-
119+
 ...componentPaths,
108120
nuxtOptions.dir?.layouts&&withSrcDir(`${nuxtOptions.dir.layouts}/**/*${sfcExtensions}`),
109121
nuxtOptions.dir?.plugins&&withSrcDir(`${nuxtOptions.dir.plugins}/**/*${defaultExtensions}`),
110122
 ...importDirs.map(d=>`${d}/**/*${defaultExtensions}`),
@@ -241,14 +253,28 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
241253
}
242254
})
243255

244-
nuxt.hook('pages:extend',async(pages)=>{
245-
constnewPageFiles=resolvePageFiles(pages)
256+
if(moduleOptions.experimental?.strictScanContentPaths){
257+
nuxt.hook('pages:extend',async(pages)=>{
258+
constnewPageFiles=resolvePageFiles(pages)
246259

247-
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
248-
pagesContentPath.set(newPageFiles,true)
249-
awaitreloadConfigTemplate()
250-
}
251-
})
260+
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
261+
pagesContentPath.set(newPageFiles,true)
262+
awaitreloadConfigTemplate()
263+
}
264+
})
265+
266+
nuxt.hook('components:extend',async(components)=>{
267+
constnewComponentFiles=components.map(c=>c.filePath)
268+
269+
if(newComponentFiles.length!==componentsContentPath.tryUse()?.length){
270+
componentsContentPath.set(newComponentFiles,true)
271+
awaitreloadConfigTemplate()
272+
}
273+
})
274+
}
275+
else{
276+
nuxt.hook('pages:extend',()=>reloadConfigTemplate())
277+
}
252278

253279
nuxt.hook('vite:serverCreated',(server)=>{
254280
nuxt.hook('tailwindcss:internal:regenerateTemplates',(data)=>{
‎src/types.ts‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ export type EditorSupportConfig = {
7272
autocompleteUtil: BoolObj<Pick<Import,'as'>>
7373
}
7474

75+
exporttypeExperimentalOptions={
76+
/**
77+
 * Specify individual files for Nuxt scanned directories in content configuration
78+
 * using `pages:extend` and `components:extend` hook.
79+
 *
80+
 * @default false
81+
 */
82+
strictScanContentPaths: boolean
83+
}
84+
7585
exportinterfaceModuleOptions{
7686
/**
7787
 * The path of the Tailwind configuration file. The extension can be omitted, in which case it will try to find a `.js`, `.cjs`, `.mjs`, or `.ts` file.
@@ -118,6 +128,12 @@ export interface ModuleOptions {
118128
 * @default false // if true, { autocompleteUtil: true }
119129
 */
120130
editorSupport: BoolObj<EditorSupportConfig>
131+
/**
132+
 * Enable module experimental functionalities.
133+
 *
134+
 * @default false
135+
 */
136+
experimental: Partial<ExperimentalOptions>
121137
/**
122138
 * This option falls back to the Tailwind configuration inlined to the PostCSS
123139
 * loader, so any configuration changes while the dev server is running will
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(content): move strict scanning to experimental · nuxt-modules/tailwindcss@75efd5c · GitHub
Skip to content
Commit 75efd5c
Browse files
ineshboseineshbose
committed
fix(content): move strict scanning to experimental
1 parent d3e4de7 commit 75efd5c
3 files changed
Lines changed: 62 additions & 19 deletions
File tree
‎playground/nuxt.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ export default defineNuxtConfig({
7777
exposeConfig: true,
7878
cssPath: '~/assets/css/tailwind.css',
7979
editorSupport: true,
80+
// experimental: { strictScanContentPaths: true },
8081
}satisfiesPartial<ModuleOptions>,
8182
})
‎src/internal-context/load.ts‎
Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const loadConfig = loadConfigC12<Partial<TWConfig>>
1414
typeResolvedConfig=ResolvedC12Config<Partial<TWConfig>>
1515

1616
constpagesContentPath=getContext<string[]>('twcss-pages-path')
17+
constcomponentsContentPath=getContext<string[]>('twcss-components-path')
1718
constresolvedConfigsCtx=getContext<Array<ResolvedConfig|null>>('twcss-resolved-configs')
1819

1920
constcreateInternalContext=async(moduleOptions: ModuleOptions,nuxt=useNuxt())=>{
@@ -80,7 +81,7 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
8081
if(!isLayer){
8182
constpageFiles=pagesContentPath.tryUse()
8283

83-
if(pageFiles&&pageFiles.length){
84+
if(moduleOptions.experimental?.strictScanContentPaths&&pageFiles&&pageFiles.length){
8485
// replace filenames like [...path].vue with ?...path?.vue because [ and ] are reserved in glob matching
8586
rootProjectFiles.push(...pageFiles.map(p=>p.replaceAll(/\[(\.+)([^.].*)\]/g,'?$1$2?')))
8687
}
@@ -90,21 +91,32 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
9091
}
9192
}
9293

94+
constcomponentPaths: string[]=[]
95+
constcomponentFiles=componentsContentPath.tryUse()
96+
97+
if(moduleOptions.experimental?.strictScanContentPaths&&componentFiles&&componentFiles.length){
98+
if(!isLayer)componentPaths.push(...componentFiles)
99+
}
100+
else{
101+
componentPaths.push(
102+
withSrcDir(`components/**/*${sfcExtensions}`),
103+
 ...(()=>{
104+
if(nuxtOptions.components){
105+
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
106+
constvalueToResolve=typeofd==='string' ? d : d?.path
107+
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
108+
}).filter(Boolean)
109+
}
110+
return[]
111+
})(),
112+
)
113+
}
114+
93115
return{
94116
config: {
95117
content: {
96118
files: [
97-
withSrcDir(`components/**/*${sfcExtensions}`),
98-
 ...(()=>{
99-
if(nuxtOptions.components){
100-
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
101-
constvalueToResolve=typeofd==='string' ? d : d?.path
102-
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
103-
}).filter(Boolean)
104-
}
105-
return[]
106-
})(),
107-
119+
 ...componentPaths,
108120
nuxtOptions.dir?.layouts&&withSrcDir(`${nuxtOptions.dir.layouts}/**/*${sfcExtensions}`),
109121
nuxtOptions.dir?.plugins&&withSrcDir(`${nuxtOptions.dir.plugins}/**/*${defaultExtensions}`),
110122
 ...importDirs.map(d=>`${d}/**/*${defaultExtensions}`),
@@ -241,14 +253,28 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
241253
}
242254
})
243255

244-
nuxt.hook('pages:extend',async(pages)=>{
245-
constnewPageFiles=resolvePageFiles(pages)
256+
if(moduleOptions.experimental?.strictScanContentPaths){
257+
nuxt.hook('pages:extend',async(pages)=>{
258+
constnewPageFiles=resolvePageFiles(pages)
246259

247-
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
248-
pagesContentPath.set(newPageFiles,true)
249-
awaitreloadConfigTemplate()
250-
}
251-
})
260+
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
261+
pagesContentPath.set(newPageFiles,true)
262+
awaitreloadConfigTemplate()
263+
}
264+
})
265+
266+
nuxt.hook('components:extend',async(components)=>{
267+
constnewComponentFiles=components.map(c=>c.filePath)
268+
269+
if(newComponentFiles.length!==componentsContentPath.tryUse()?.length){
270+
componentsContentPath.set(newComponentFiles,true)
271+
awaitreloadConfigTemplate()
272+
}
273+
})
274+
}
275+
else{
276+
nuxt.hook('pages:extend',()=>reloadConfigTemplate())
277+
}
252278

253279
nuxt.hook('vite:serverCreated',(server)=>{
254280
nuxt.hook('tailwindcss:internal:regenerateTemplates',(data)=>{
‎src/types.ts‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ export type EditorSupportConfig = {
7272
autocompleteUtil: BoolObj<Pick<Import,'as'>>
7373
}
7474

75+
exporttypeExperimentalOptions={
76+
/**
77+
 * Specify individual files for Nuxt scanned directories in content configuration
78+
 * using `pages:extend` and `components:extend` hook.
79+
 *
80+
 * @default false
81+
 */
82+
strictScanContentPaths: boolean
83+
}
84+
7585
exportinterfaceModuleOptions{
7686
/**
7787
 * The path of the Tailwind configuration file. The extension can be omitted, in which case it will try to find a `.js`, `.cjs`, `.mjs`, or `.ts` file.
@@ -118,6 +128,12 @@ export interface ModuleOptions {
118128
 * @default false // if true, { autocompleteUtil: true }
119129
 */
120130
editorSupport: BoolObj<EditorSupportConfig>
131+
/**
132+
 * Enable module experimental functionalities.
133+
 *
134+
 * @default false
135+
 */
136+
experimental: Partial<ExperimentalOptions>
121137
/**
122138
 * This option falls back to the Tailwind configuration inlined to the PostCSS
123139
 * loader, so any configuration changes while the dev server is running will
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(content): move strict scanning to experimental · nuxt-modules/tailwindcss@75efd5c · GitHub
Skip to content
Commit 75efd5c
Browse files
ineshboseineshbose
committed
fix(content): move strict scanning to experimental
1 parent d3e4de7 commit 75efd5c
3 files changed
Lines changed: 62 additions & 19 deletions
File tree
‎playground/nuxt.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ export default defineNuxtConfig({
7777
exposeConfig: true,
7878
cssPath: '~/assets/css/tailwind.css',
7979
editorSupport: true,
80+
// experimental: { strictScanContentPaths: true },
8081
}satisfiesPartial<ModuleOptions>,
8182
})
‎src/internal-context/load.ts‎
Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const loadConfig = loadConfigC12<Partial<TWConfig>>
1414
typeResolvedConfig=ResolvedC12Config<Partial<TWConfig>>
1515

1616
constpagesContentPath=getContext<string[]>('twcss-pages-path')
17+
constcomponentsContentPath=getContext<string[]>('twcss-components-path')
1718
constresolvedConfigsCtx=getContext<Array<ResolvedConfig|null>>('twcss-resolved-configs')
1819

1920
constcreateInternalContext=async(moduleOptions: ModuleOptions,nuxt=useNuxt())=>{
@@ -80,7 +81,7 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
8081
if(!isLayer){
8182
constpageFiles=pagesContentPath.tryUse()
8283

83-
if(pageFiles&&pageFiles.length){
84+
if(moduleOptions.experimental?.strictScanContentPaths&&pageFiles&&pageFiles.length){
8485
// replace filenames like [...path].vue with ?...path?.vue because [ and ] are reserved in glob matching
8586
rootProjectFiles.push(...pageFiles.map(p=>p.replaceAll(/\[(\.+)([^.].*)\]/g,'?$1$2?')))
8687
}
@@ -90,21 +91,32 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
9091
}
9192
}
9293

94+
constcomponentPaths: string[]=[]
95+
constcomponentFiles=componentsContentPath.tryUse()
96+
97+
if(moduleOptions.experimental?.strictScanContentPaths&&componentFiles&&componentFiles.length){
98+
if(!isLayer)componentPaths.push(...componentFiles)
99+
}
100+
else{
101+
componentPaths.push(
102+
withSrcDir(`components/**/*${sfcExtensions}`),
103+
 ...(()=>{
104+
if(nuxtOptions.components){
105+
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
106+
constvalueToResolve=typeofd==='string' ? d : d?.path
107+
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
108+
}).filter(Boolean)
109+
}
110+
return[]
111+
})(),
112+
)
113+
}
114+
93115
return{
94116
config: {
95117
content: {
96118
files: [
97-
withSrcDir(`components/**/*${sfcExtensions}`),
98-
 ...(()=>{
99-
if(nuxtOptions.components){
100-
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
101-
constvalueToResolve=typeofd==='string' ? d : d?.path
102-
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
103-
}).filter(Boolean)
104-
}
105-
return[]
106-
})(),
107-
119+
 ...componentPaths,
108120
nuxtOptions.dir?.layouts&&withSrcDir(`${nuxtOptions.dir.layouts}/**/*${sfcExtensions}`),
109121
nuxtOptions.dir?.plugins&&withSrcDir(`${nuxtOptions.dir.plugins}/**/*${defaultExtensions}`),
110122
 ...importDirs.map(d=>`${d}/**/*${defaultExtensions}`),
@@ -241,14 +253,28 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
241253
}
242254
})
243255

244-
nuxt.hook('pages:extend',async(pages)=>{
245-
constnewPageFiles=resolvePageFiles(pages)
256+
if(moduleOptions.experimental?.strictScanContentPaths){
257+
nuxt.hook('pages:extend',async(pages)=>{
258+
constnewPageFiles=resolvePageFiles(pages)
246259

247-
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
248-
pagesContentPath.set(newPageFiles,true)
249-
awaitreloadConfigTemplate()
250-
}
251-
})
260+
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
261+
pagesContentPath.set(newPageFiles,true)
262+
awaitreloadConfigTemplate()
263+
}
264+
})
265+
266+
nuxt.hook('components:extend',async(components)=>{
267+
constnewComponentFiles=components.map(c=>c.filePath)
268+
269+
if(newComponentFiles.length!==componentsContentPath.tryUse()?.length){
270+
componentsContentPath.set(newComponentFiles,true)
271+
awaitreloadConfigTemplate()
272+
}
273+
})
274+
}
275+
else{
276+
nuxt.hook('pages:extend',()=>reloadConfigTemplate())
277+
}
252278

253279
nuxt.hook('vite:serverCreated',(server)=>{
254280
nuxt.hook('tailwindcss:internal:regenerateTemplates',(data)=>{
‎src/types.ts‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ export type EditorSupportConfig = {
7272
autocompleteUtil: BoolObj<Pick<Import,'as'>>
7373
}
7474

75+
exporttypeExperimentalOptions={
76+
/**
77+
 * Specify individual files for Nuxt scanned directories in content configuration
78+
 * using `pages:extend` and `components:extend` hook.
79+
 *
80+
 * @default false
81+
 */
82+
strictScanContentPaths: boolean
83+
}
84+
7585
exportinterfaceModuleOptions{
7686
/**
7787
 * The path of the Tailwind configuration file. The extension can be omitted, in which case it will try to find a `.js`, `.cjs`, `.mjs`, or `.ts` file.
@@ -118,6 +128,12 @@ export interface ModuleOptions {
118128
 * @default false // if true, { autocompleteUtil: true }
119129
 */
120130
editorSupport: BoolObj<EditorSupportConfig>
131+
/**
132+
 * Enable module experimental functionalities.
133+
 *
134+
 * @default false
135+
 */
136+
experimental: Partial<ExperimentalOptions>
121137
/**
122138
 * This option falls back to the Tailwind configuration inlined to the PostCSS
123139
 * loader, so any configuration changes while the dev server is running will
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(content): move strict scanning to experimental · nuxt-modules/tailwindcss@75efd5c · GitHub
Skip to content
Commit 75efd5c
Browse files
ineshboseineshbose
committed
fix(content): move strict scanning to experimental
1 parent d3e4de7 commit 75efd5c
3 files changed
Lines changed: 62 additions & 19 deletions
File tree
‎playground/nuxt.config.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ export default defineNuxtConfig({
7777
exposeConfig: true,
7878
cssPath: '~/assets/css/tailwind.css',
7979
editorSupport: true,
80+
// experimental: { strictScanContentPaths: true },
8081
}satisfiesPartial<ModuleOptions>,
8182
})
‎src/internal-context/load.ts‎
Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const loadConfig = loadConfigC12<Partial<TWConfig>>
1414
typeResolvedConfig=ResolvedC12Config<Partial<TWConfig>>
1515

1616
constpagesContentPath=getContext<string[]>('twcss-pages-path')
17+
constcomponentsContentPath=getContext<string[]>('twcss-components-path')
1718
constresolvedConfigsCtx=getContext<Array<ResolvedConfig|null>>('twcss-resolved-configs')
1819

1920
constcreateInternalContext=async(moduleOptions: ModuleOptions,nuxt=useNuxt())=>{
@@ -80,7 +81,7 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
8081
if(!isLayer){
8182
constpageFiles=pagesContentPath.tryUse()
8283

83-
if(pageFiles&&pageFiles.length){
84+
if(moduleOptions.experimental?.strictScanContentPaths&&pageFiles&&pageFiles.length){
8485
// replace filenames like [...path].vue with ?...path?.vue because [ and ] are reserved in glob matching
8586
rootProjectFiles.push(...pageFiles.map(p=>p.replaceAll(/\[(\.+)([^.].*)\]/g,'?$1$2?')))
8687
}
@@ -90,21 +91,32 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
9091
}
9192
}
9293

94+
constcomponentPaths: string[]=[]
95+
constcomponentFiles=componentsContentPath.tryUse()
96+
97+
if(moduleOptions.experimental?.strictScanContentPaths&&componentFiles&&componentFiles.length){
98+
if(!isLayer)componentPaths.push(...componentFiles)
99+
}
100+
else{
101+
componentPaths.push(
102+
withSrcDir(`components/**/*${sfcExtensions}`),
103+
 ...(()=>{
104+
if(nuxtOptions.components){
105+
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
106+
constvalueToResolve=typeofd==='string' ? d : d?.path
107+
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
108+
}).filter(Boolean)
109+
}
110+
return[]
111+
})(),
112+
)
113+
}
114+
93115
return{
94116
config: {
95117
content: {
96118
files: [
97-
withSrcDir(`components/**/*${sfcExtensions}`),
98-
 ...(()=>{
99-
if(nuxtOptions.components){
100-
return(Array.isArray(nuxtOptions.components) ? nuxtOptions.components : typeofnuxtOptions.components==='boolean' ? ['components'] : (nuxtOptions.components.dirs||[])).map((d)=>{
101-
constvalueToResolve=typeofd==='string' ? d : d?.path
102-
returnvalueToResolve ? `${resolveAlias(valueToResolve)}/**/*${sfcExtensions}` : ''
103-
}).filter(Boolean)
104-
}
105-
return[]
106-
})(),
107-
119+
 ...componentPaths,
108120
nuxtOptions.dir?.layouts&&withSrcDir(`${nuxtOptions.dir.layouts}/**/*${sfcExtensions}`),
109121
nuxtOptions.dir?.plugins&&withSrcDir(`${nuxtOptions.dir.plugins}/**/*${defaultExtensions}`),
110122
 ...importDirs.map(d=>`${d}/**/*${defaultExtensions}`),
@@ -241,14 +253,28 @@ const createInternalContext = async (moduleOptions: ModuleOptions, nuxt = useNux
241253
}
242254
})
243255

244-
nuxt.hook('pages:extend',async(pages)=>{
245-
constnewPageFiles=resolvePageFiles(pages)
256+
if(moduleOptions.experimental?.strictScanContentPaths){
257+
nuxt.hook('pages:extend',async(pages)=>{
258+
constnewPageFiles=resolvePageFiles(pages)
246259

247-
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
248-
pagesContentPath.set(newPageFiles,true)
249-
awaitreloadConfigTemplate()
250-
}
251-
})
260+
if(newPageFiles.length!==pagesContentPath.tryUse()?.length){
261+
pagesContentPath.set(newPageFiles,true)
262+
awaitreloadConfigTemplate()
263+
}
264+
})
265+
266+
nuxt.hook('components:extend',async(components)=>{
267+
constnewComponentFiles=components.map(c=>c.filePath)
268+
269+
if(newComponentFiles.length!==componentsContentPath.tryUse()?.length){
270+
componentsContentPath.set(newComponentFiles,true)
271+
awaitreloadConfigTemplate()
272+
}
273+
})
274+
}
275+
else{
276+
nuxt.hook('pages:extend',()=>reloadConfigTemplate())
277+
}
252278

253279
nuxt.hook('vite:serverCreated',(server)=>{
254280
nuxt.hook('tailwindcss:internal:regenerateTemplates',(data)=>{
‎src/types.ts‎
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ export type EditorSupportConfig = {
7272
autocompleteUtil: BoolObj<Pick<Import,'as'>>
7373
}
7474

75+
exporttypeExperimentalOptions={
76+
/**
77+
 * Specify individual files for Nuxt scanned directories in content configuration
78+
 * using `pages:extend` and `components:extend` hook.
79+
 *
80+
 * @default false
81+
 */
82+
strictScanContentPaths: boolean
83+
}
84+
7585
exportinterfaceModuleOptions{
7686
/**
7787
 * The path of the Tailwind configuration file. The extension can be omitted, in which case it will try to find a `.js`, `.cjs`, `.mjs`, or `.ts` file.
@@ -118,6 +128,12 @@ export interface ModuleOptions {
118128
 * @default false // if true, { autocompleteUtil: true }
119129
 */
120130
editorSupport: BoolObj<EditorSupportConfig>
131+
/**
132+
 * Enable module experimental functionalities.
133+
 *
134+
 * @default false
135+
 */
136+
experimental: Partial<ExperimentalOptions>
121137
/**
122138
 * This option falls back to the Tailwind configuration inlined to the PostCSS
123139
 * loader, so any configuration changes while the dev server is running will
0 commit comments
Comments
 (0)