mirror of
https://github.com/zadam/trilium.git
synced 2025-10-30 02:59:03 +01:00
fix(dx/client): client not starting due to duplicate config
This commit is contained in:
parent
5cf182cf98
commit
35743de0df
@ -7,12 +7,18 @@ import preact from "@preact/preset-vite";
|
||||
|
||||
const assets = [ "assets", "stylesheets", "fonts", "translations" ];
|
||||
|
||||
export default defineConfig(() => ({
|
||||
root: __dirname,
|
||||
cacheDir: '../../node_modules/.vite/apps/client',
|
||||
base: "",
|
||||
plugins: [
|
||||
preact(),
|
||||
const isDev = process.env.NODE_ENV === "development";
|
||||
let plugins: any = [
|
||||
preact({
|
||||
babel: {
|
||||
compact: !isDev
|
||||
}
|
||||
})
|
||||
];
|
||||
|
||||
if (!isDev) {
|
||||
plugins = [
|
||||
...plugins,
|
||||
viteStaticCopy({
|
||||
targets: assets.map((asset) => ({
|
||||
src: `src/${asset}/*`,
|
||||
@ -29,7 +35,14 @@ export default defineConfig(() => ({
|
||||
]
|
||||
}),
|
||||
webpackStatsPlugin()
|
||||
] as Plugin[],
|
||||
]
|
||||
}
|
||||
|
||||
export default defineConfig(() => ({
|
||||
root: __dirname,
|
||||
cacheDir: '../../node_modules/.vite/apps/client',
|
||||
base: "",
|
||||
plugins,
|
||||
resolve: {
|
||||
alias: [
|
||||
{
|
||||
|
||||
@ -27,17 +27,7 @@ async function register(app: express.Application) {
|
||||
appType: "custom",
|
||||
cacheDir: path.join(srcRoot, "../../.cache/vite"),
|
||||
base: `/${assetUrlFragment}/`,
|
||||
root: path.join(srcRoot, "../client"),
|
||||
plugins: [
|
||||
preact({
|
||||
babel: {
|
||||
compact: false
|
||||
}
|
||||
})
|
||||
],
|
||||
define: {
|
||||
"process.env.IS_PREACT": JSON.stringify("true"),
|
||||
}
|
||||
root: path.join(srcRoot, "../client")
|
||||
});
|
||||
app.use(`/${assetUrlFragment}/`, (req, res, next) => {
|
||||
req.url = `/${assetUrlFragment}` + req.url;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user