@bndynet/vue-site 0.1.8 → 0.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/vue-site.mjs +41 -1
- package/package.json +1 -1
package/bin/vue-site.mjs
CHANGED
|
@@ -301,6 +301,11 @@ async function buildViteConfig(options = {}) {
|
|
|
301
301
|
}
|
|
302
302
|
}
|
|
303
303
|
|
|
304
|
+
// Absolute source root directories for packages using entryPath, used by the
|
|
305
|
+
// scss-raw plugin below to prevent Vite's module cache from returning an
|
|
306
|
+
// already-transformed JS module to Sass on a second resolution of the same file.
|
|
307
|
+
const watchedSourceRoots = []
|
|
308
|
+
|
|
304
309
|
if (watchPackages.length) {
|
|
305
310
|
const excludeNames = []
|
|
306
311
|
const watchPatterns = []
|
|
@@ -324,6 +329,9 @@ async function buildViteConfig(options = {}) {
|
|
|
324
329
|
const dirForGlob = entryDir.replace(/\\/g, '/')
|
|
325
330
|
watchPatterns.push(`!${dirForGlob}/**`)
|
|
326
331
|
fsAllowPaths.push(entryDir)
|
|
332
|
+
// Track the package root (parent of entryDir) so SCSS imports that use
|
|
333
|
+
// paths like '../styles/foo.scss' are also covered.
|
|
334
|
+
watchedSourceRoots.push(dirname(entryDir))
|
|
327
335
|
}
|
|
328
336
|
}
|
|
329
337
|
|
|
@@ -379,9 +387,41 @@ async function buildViteConfig(options = {}) {
|
|
|
379
387
|
|
|
380
388
|
const entryCode = buildEntryCode(siteConfig)
|
|
381
389
|
|
|
390
|
+
// When watchPackages uses entryPath, SCSS files imported inside the watched
|
|
391
|
+
// package source (e.g. Lit web components with `import styles from './foo.scss'`
|
|
392
|
+
// used alongside `unsafeCSS()`) need to be exported as a CSS string, not
|
|
393
|
+
// injected as a side-effect. Vite only does this for `?inline` imports.
|
|
394
|
+
// This pre-plugin intercepts .scss/.sass imports whose importer lives inside a
|
|
395
|
+
// watched source root and transparently adds `?inline`, so Vite compiles the
|
|
396
|
+
// SCSS through Sass and returns `export default "...css..."`.
|
|
397
|
+
const watchedScssPlugin =
|
|
398
|
+
watchedSourceRoots.length > 0
|
|
399
|
+
? [
|
|
400
|
+
{
|
|
401
|
+
name: 'vue-site:watched-scss-inline',
|
|
402
|
+
enforce: 'pre',
|
|
403
|
+
async resolveId(source, importer) {
|
|
404
|
+
if (!importer) return
|
|
405
|
+
const cleanImporter = importer.split('?')[0]
|
|
406
|
+
const cleanSource = source.split('?')[0]
|
|
407
|
+
if (
|
|
408
|
+
(cleanSource.endsWith('.scss') || cleanSource.endsWith('.sass')) &&
|
|
409
|
+
!source.includes('?') &&
|
|
410
|
+
watchedSourceRoots.some((root) => cleanImporter.startsWith(root))
|
|
411
|
+
) {
|
|
412
|
+
const resolved = await this.resolve(source, importer, { skipSelf: true })
|
|
413
|
+
if (resolved && !resolved.external) {
|
|
414
|
+
return { id: resolved.id + '?inline' }
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
},
|
|
418
|
+
},
|
|
419
|
+
]
|
|
420
|
+
: []
|
|
421
|
+
|
|
382
422
|
const baseConfig = {
|
|
383
423
|
root: cwd,
|
|
384
|
-
plugins: [vue(vueOpts), ...vueSitePlugin(entryCode), ...(userPlugins || [])],
|
|
424
|
+
plugins: [vue(vueOpts), ...watchedScssPlugin, ...vueSitePlugin(entryCode), ...(userPlugins || [])],
|
|
385
425
|
resolve: {
|
|
386
426
|
alias: {
|
|
387
427
|
vue: resolve(vuePath, 'dist/vue.runtime.esm-bundler.js'),
|