Skip to content

Commit 2b8a88b

Browse files
committed
load jit modules with try/catch instead of by version number
1 parent 6bef5de commit 2b8a88b

File tree

1 file changed

+23
-14
lines changed

1 file changed

+23
-14
lines changed

src/server.ts

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -435,16 +435,21 @@ async function createProjectService(
435435
jitModules = {
436436
generateRules: {
437437
module: __non_webpack_require__(
438-
resolveFrom(
439-
configDir,
440-
semver.gte(tailwindcssVersion, '2.1.3')
441-
? 'tailwindcss/lib/jit/lib/generateRules'
442-
: 'tailwindcss/jit/lib/generateRules'
443-
)
438+
resolveFrom(configDir, 'tailwindcss/lib/jit/lib/generateRules')
444439
).generateRules,
445440
},
446441
}
447-
} catch (_) {}
442+
} catch (_) {
443+
try {
444+
jitModules = {
445+
generateRules: {
446+
module: __non_webpack_require__(
447+
resolveFrom(configDir, 'tailwindcss/jit/lib/generateRules')
448+
).generateRules,
449+
},
450+
}
451+
} catch (_) {}
452+
}
448453
} catch (error) {
449454
throw new SilentError(error.message)
450455
// TODO: force mode
@@ -670,13 +675,17 @@ async function createProjectService(
670675
state.classNames = (await extractClassNames(postcssResult.root)) as ClassNames
671676

672677
if (state.jit) {
673-
let setupContext = semver.gte(tailwindcss.version, '2.1.3')
674-
? __non_webpack_require__(
675-
resolveFrom(path.dirname(state.configPath), 'tailwindcss/lib/jit/lib/setupContext')
676-
).default
677-
: __non_webpack_require__(
678-
resolveFrom(path.dirname(state.configPath), 'tailwindcss/jit/lib/setupContext')
679-
)
678+
let setupContext
679+
680+
try {
681+
setupContext = __non_webpack_require__(
682+
resolveFrom(path.dirname(state.configPath), 'tailwindcss/lib/jit/lib/setupContext')
683+
).default
684+
} catch (_) {
685+
setupContext = __non_webpack_require__(
686+
resolveFrom(path.dirname(state.configPath), 'tailwindcss/jit/lib/setupContext')
687+
)
688+
}
680689

681690
state.jitContext = setupContext(state.configPath)(
682691
{ opts: {}, messages: [] },

0 commit comments

Comments
 (0)