Merge branch 'develop' of github.com:Budibase/budibase into grid-block

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.7.24",
+  "version": "2.7.25-alpha.1",
   "npmClient": "yarn",
   "packages": [
     "packages/backend-core",
@@ -16,6 +16,7 @@
     "packages/worker",
     "packages/pro/packages/pro"
   ],
+  "useWorkspaces": true,
   "command": {
     "publish": {
       "ignoreChanges": [

package.json

@@ -15,10 +15,10 @@
     "husky": "^8.0.3",
     "js-yaml": "^4.1.0",
     "kill-port": "^1.6.1",
-    "lerna": "^7.0.1",
+    "lerna": "7.0.0-alpha.0",
     "madge": "^6.0.0",
     "minimist": "^1.2.8",
-    "nx": "^16.3.2",
+    "nx": "^16.2.1",
     "prettier": "^2.3.1",
     "prettier-plugin-svelte": "^2.3.0",
     "rimraf": "^3.0.2",

packages/builder/vite.config.js

@@ -12,9 +12,31 @@ const ignoredWarnings = [
   "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 }) => {
   const isProduction = mode === "production"
   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 {
     test: {
       setupFiles: ["./vitest.setup.js"],
@@ -60,18 +82,8 @@ export default defineConfig(({ mode }) => {
         ),
         "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: {
       exclude: ["@roxi/routify"],