Skip to content

Commit 99b81df

Browse files
authored
Merge branch 'main' into caio/font-late-load-scheduler
2 parents e143cc5 + 2294380 commit 99b81df

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ Special thanks to these community members who have contributed code to SuperDoc:
184184
<a href="https://github.com/msviderok"><img src="https://github.com/msviderok.png" width="50" height="50" alt="msviderok" title="Myroslav Sviderok" /></a>
185185
<a href="https://github.com/sergiogomes"><img src="https://github.com/sergiogomes.png" width="50" height="50" alt="sergiogomes" title="Sérgio Paulo Gomes" /></a>
186186
<a href="https://github.com/wookieb"><img src="https://github.com/wookieb.png" width="50" height="50" alt="wookieb" title="Łukasz Kużyński" /></a>
187+
<a href="https://github.com/xy200303"><img src="https://github.com/xy200303.png" width="50" height="50" alt="xy200303" title="小云" /></a>
187188

188189
Want to see your avatar here? Check the [Contributing Guide](CONTRIBUTING.md) to get started.
189190

packages/superdoc/vite.config.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,13 +342,15 @@ export default defineConfig(({ mode, command }) => {
342342
},
343343
},
344344
resolve: {
345-
// Under Vitest, alias @superdoc/font-system to its source so cdn-entry.test.js can
346-
// resolve the import cdn-entry.js makes. The production CDN build aliases it in
347-
// vite.config.cdn.js; the ES build never imports cdn-entry. Kept OUT of getAliases so
348-
// the vite-plugin-dts build (which reads resolve.alias) is unaffected - an alias there
349-
// makes it emit unresolvable source paths. The /bundled subpath precedes the bare one.
345+
// Under Vitest and the dev server (command 'serve'), alias @superdoc/font-system to its
346+
// source: cdn-entry.test.js needs it for the import cdn-entry.js makes, and the dev
347+
// playground imports it transitively via layout-engine/super-editor source. font-system
348+
// lives under shared/, so it is NOT covered by vite.sourceResolve's packages/** aliases.
349+
// The production CDN build aliases it in vite.config.cdn.js; the ES build never imports
350+
// cdn-entry. Kept OUT of getAliases so the vite-plugin-dts build (command 'build') is
351+
// unaffected - an alias there makes it emit unresolvable source paths. /bundled precedes the bare one.
350352
alias: [
351-
...(process.env.VITEST
353+
...(process.env.VITEST || isDev
352354
? [
353355
{ find: '@superdoc/font-system/bundled', replacement: path.resolve(__dirname, '../../shared/font-system/src/bundled.ts') },
354356
{ find: '@superdoc/font-system', replacement: path.resolve(__dirname, '../../shared/font-system/src/index.ts') },

0 commit comments

Comments
 (0)