Merge remote-tracking branch 'origin/develop' into feature/app-settings-section
This commit is contained in:
commit
1d184a27cb
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "2.7.25-alpha.1",
|
"version": "2.7.25-alpha.2",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"packages": [
|
"packages": [
|
||||||
"packages/backend-core",
|
"packages/backend-core",
|
||||||
|
|
|
@ -12,9 +12,31 @@ const ignoredWarnings = [
|
||||||
"a11y-click-events-have-key-events",
|
"a11y-click-events-have-key-events",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
const copyFonts = dest =>
|
||||||
|
viteStaticCopy({
|
||||||
|
targets: [
|
||||||
|
{
|
||||||
|
src: "../../node_modules/@fontsource/source-sans-pro",
|
||||||
|
dest,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
src: "../../node_modules/remixicon/fonts/*",
|
||||||
|
dest,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
})
|
||||||
|
|
||||||
export default defineConfig(({ mode }) => {
|
export default defineConfig(({ mode }) => {
|
||||||
const isProduction = mode === "production"
|
const isProduction = mode === "production"
|
||||||
const env = loadEnv(mode, process.cwd())
|
const env = loadEnv(mode, process.cwd())
|
||||||
|
|
||||||
|
// Plugins to only run in dev
|
||||||
|
const devOnlyPlugins = [
|
||||||
|
// Copy fonts to an additional path so that svelte's automatic
|
||||||
|
// prefixing of the base URL path can still resolve assets
|
||||||
|
copyFonts("builder/fonts"),
|
||||||
|
]
|
||||||
|
|
||||||
return {
|
return {
|
||||||
test: {
|
test: {
|
||||||
setupFiles: ["./vitest.setup.js"],
|
setupFiles: ["./vitest.setup.js"],
|
||||||
|
@ -60,18 +82,8 @@ export default defineConfig(({ mode }) => {
|
||||||
),
|
),
|
||||||
"process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN),
|
"process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN),
|
||||||
}),
|
}),
|
||||||
viteStaticCopy({
|
copyFonts("fonts"),
|
||||||
targets: [
|
...(isProduction ? [] : devOnlyPlugins),
|
||||||
{
|
|
||||||
src: "../../node_modules/@fontsource/source-sans-pro",
|
|
||||||
dest: isProduction ? "fonts" : "builder/fonts",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "../../node_modules/remixicon/fonts/*",
|
|
||||||
dest: isProduction ? "fonts" : "builder/fonts",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
],
|
],
|
||||||
optimizeDeps: {
|
optimizeDeps: {
|
||||||
exclude: ["@roxi/routify"],
|
exclude: ["@roxi/routify"],
|
||||||
|
|
Loading…
Reference in New Issue