Skip to content

Commit b568635

Browse files
Merge pull request #503 from il-sairamg/fix/msdf-generator-pnpm-local-dependency
fix: resolve msdf-generator from app's node_modules for pnpm/local deps
2 parents a152629 + 380a1f5 commit b568635

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

vite/msdfGenerator.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import path from 'path'
1919
import * as fs from 'fs'
2020
import { createHash } from 'crypto'
21+
import { createRequire } from 'module'
2122

2223
class TaskQueue {
2324
constructor() {
@@ -47,14 +48,22 @@ async function loadMsdfModules() {
4748
if (msdfLoaded) return true
4849

4950
try {
50-
const msdfGenerator = await import('@lightningjs/msdf-generator')
51+
// Create a require function that resolves from the app's working directory
52+
// This ensures the msdf-generator is resolved from the app's node_modules
53+
const userRequire = createRequire(process.cwd() + '/')
54+
55+
const msdfGeneratorPath = userRequire.resolve('@lightningjs/msdf-generator')
56+
const msdfGeneratorUrl = new URL(`file:///${msdfGeneratorPath.replace(/\\/g, '/')}`).href
57+
const msdfGenerator = await import(msdfGeneratorUrl)
5158
genFont = msdfGenerator.genFont
5259
setGeneratePaths = msdfGenerator.setGeneratePaths
5360

54-
const adjustFontModule = await import('@lightningjs/msdf-generator/adjustFont')
61+
const adjustFontPath = userRequire.resolve('@lightningjs/msdf-generator/adjustFont')
62+
const adjustFontUrl = new URL(`file:///${adjustFontPath.replace(/\\/g, '/')}`).href
63+
const adjustFontModule = await import(adjustFontUrl)
5564
adjustFont = adjustFontModule.adjustFont
5665
return true
57-
} catch (err) {
66+
} catch {
5867
return false
5968
}
6069
}

0 commit comments

Comments
 (0)