From 1164ac728db43d088ffbec0d2590b0137089deee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 19:03:13 +0300
Subject: [PATCH 01/20] Add note about purpose of entry-meteor.js files.

---
 tools/static-assets/skel-vue/client/entry-meteor.js | 8 ++++++++
 tools/static-assets/skel-vue/server/entry-meteor.js | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/tools/static-assets/skel-vue/client/entry-meteor.js b/tools/static-assets/skel-vue/client/entry-meteor.js
index e69de29bb2..418b5a55cb 100644
--- a/tools/static-assets/skel-vue/client/entry-meteor.js
+++ b/tools/static-assets/skel-vue/client/entry-meteor.js
@@ -0,0 +1,8 @@
+// Entrypoint for the Meteor client
+// Generally, this file can be left empty. Vite will add imports for
+// lazy-loaded Meteor packages to this file to ensure they are included in your
+// final production bundle.
+
+// This can also be a good place to put code that you don't want Vite to
+// process, for example, if you run into a compatability issue or need to use
+// nested imports.
\ No newline at end of file
diff --git a/tools/static-assets/skel-vue/server/entry-meteor.js b/tools/static-assets/skel-vue/server/entry-meteor.js
index e69de29bb2..48af245a74 100644
--- a/tools/static-assets/skel-vue/server/entry-meteor.js
+++ b/tools/static-assets/skel-vue/server/entry-meteor.js
@@ -0,0 +1,8 @@
+// Entrypoint for the Meteor server
+// Generally, this file can be left empty. Vite will add imports for
+// lazy-loaded Meteor packages to this file to ensure they are included in your
+// final production bundle.
+
+// This can also be a good place to put code that you don't want Vite to
+// process, for example, if you run into a compatability issue or need to use
+// nested imports.
\ No newline at end of file

From a29af3f4d64abf34e808a4ef90f8d5b775f678ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 19:05:32 +0300
Subject: [PATCH 02/20] Fix unused 'client/main.js' file, using a more
 consistent main module directory structure

---
 tools/static-assets/skel-vue/client/main.js | 2 +-
 tools/static-assets/skel-vue/vite.config.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/static-assets/skel-vue/client/main.js b/tools/static-assets/skel-vue/client/main.js
index 97d382a9bd..44bcc64d55 100644
--- a/tools/static-assets/skel-vue/client/main.js
+++ b/tools/static-assets/skel-vue/client/main.js
@@ -1 +1 @@
-// main entry point is in imports/ui/main.jsx
+import '../imports/ui/main';
\ No newline at end of file
diff --git a/tools/static-assets/skel-vue/vite.config.js b/tools/static-assets/skel-vue/vite.config.js
index dd08ccf69d..5c0ecc62ba 100644
--- a/tools/static-assets/skel-vue/vite.config.js
+++ b/tools/static-assets/skel-vue/vite.config.js
@@ -6,7 +6,7 @@ export default defineConfig({
   plugins: [
     vue(),
     meteor({
-      clientEntry: 'imports/ui/main.js',
+      clientEntry: 'client/main.js',
       serverEntry: 'server/main.js',
       enableExperimentalFeatures: true,
       stubValidation: {

From 24dbc8a911ea29c197075ed457c8695e59579d99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 19:12:45 +0300
Subject: [PATCH 03/20] Upgrade Tailwind to v4 in Vue skeleton

---
 tools/static-assets/skel-vue/client/main.css | 4 +---
 tools/static-assets/skel-vue/package.json    | 5 ++---
 tools/static-assets/skel-vue/vite.config.js  | 4 +++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/static-assets/skel-vue/client/main.css b/tools/static-assets/skel-vue/client/main.css
index b5c61c9567..a461c505f1 100644
--- a/tools/static-assets/skel-vue/client/main.css
+++ b/tools/static-assets/skel-vue/client/main.css
@@ -1,3 +1 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";
\ No newline at end of file
diff --git a/tools/static-assets/skel-vue/package.json b/tools/static-assets/skel-vue/package.json
index 560c8a23a5..1f573e0e5b 100644
--- a/tools/static-assets/skel-vue/package.json
+++ b/tools/static-assets/skel-vue/package.json
@@ -24,11 +24,10 @@
   },
   "devDependencies": {
     "@types/meteor": "^2.9.7",
+    "@tailwindcss/vite": "^4.1.11",
     "@vitejs/plugin-vue": "^5.2.1",
-    "autoprefixer": "^10.4.16",
     "meteor-vite": "^3.2.1",
-    "postcss": "^8.4.31",
-    "tailwindcss": "^3.3.5",
+    "tailwindcss": "^4.1.11",
     "vite": "^6.0.11"
   }
 }
diff --git a/tools/static-assets/skel-vue/vite.config.js b/tools/static-assets/skel-vue/vite.config.js
index 5c0ecc62ba..01a2ae4903 100644
--- a/tools/static-assets/skel-vue/vite.config.js
+++ b/tools/static-assets/skel-vue/vite.config.js
@@ -1,10 +1,12 @@
-import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
+import tailwindcss from 'tailwindcss';
+import { defineConfig } from 'vite';
 import { meteor } from 'meteor-vite/plugin';
 
 export default defineConfig({
   plugins: [
     vue(),
+    tailwindcss(),
     meteor({
       clientEntry: 'client/main.js',
       serverEntry: 'server/main.js',

From 00bc129092baccd28518abf408acf14c1d11dc88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 19:13:37 +0300
Subject: [PATCH 04/20] Add explicit import for main CSS file in client main
 module

---
 tools/static-assets/skel-vue/client/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/static-assets/skel-vue/client/main.js b/tools/static-assets/skel-vue/client/main.js
index 44bcc64d55..52c40b5d43 100644
--- a/tools/static-assets/skel-vue/client/main.js
+++ b/tools/static-assets/skel-vue/client/main.js
@@ -1 +1,2 @@
+import './main.css';
 import '../imports/ui/main';
\ No newline at end of file

From 735aed6c3a1780eab8ef4e0a1b1dbbbf9d4ad578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 19:14:14 +0300
Subject: [PATCH 05/20] Remove redundant config files from Vue skeleton

---
 tools/static-assets/skel-vue/postcss.config.js  | 6 ------
 tools/static-assets/skel-vue/tailwind.config.js | 8 --------
 2 files changed, 14 deletions(-)
 delete mode 100644 tools/static-assets/skel-vue/postcss.config.js
 delete mode 100644 tools/static-assets/skel-vue/tailwind.config.js

diff --git a/tools/static-assets/skel-vue/postcss.config.js b/tools/static-assets/skel-vue/postcss.config.js
deleted file mode 100644
index 33ad091d26..0000000000
--- a/tools/static-assets/skel-vue/postcss.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-}
diff --git a/tools/static-assets/skel-vue/tailwind.config.js b/tools/static-assets/skel-vue/tailwind.config.js
deleted file mode 100644
index 72c950fc84..0000000000
--- a/tools/static-assets/skel-vue/tailwind.config.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  content: ['./imports/ui/**/*.{vue,js,ts,jsx,tsx}', './client/*.html'],
-  theme: {
-    extend: {},
-  },
-  plugins: [],
-}

From 17e8152f24d8872d5e1d19e150885b943811f3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 19:15:53 +0300
Subject: [PATCH 06/20] Use .mjs file extension for Vite config to avoid CJS
 interop exceptions

---
 tools/static-assets/skel-vue/{vite.config.js => vite.config.mjs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tools/static-assets/skel-vue/{vite.config.js => vite.config.mjs} (100%)

diff --git a/tools/static-assets/skel-vue/vite.config.js b/tools/static-assets/skel-vue/vite.config.mjs
similarity index 100%
rename from tools/static-assets/skel-vue/vite.config.js
rename to tools/static-assets/skel-vue/vite.config.mjs

From a972460c09cf90a4ee461911be96353245f5b4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 19:19:46 +0300
Subject: [PATCH 07/20] Use .mjs file extension for Vite config to avoid CJS
 interop exceptions

---
 tools/static-assets/skel-vue/vite.config.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/static-assets/skel-vue/vite.config.mjs b/tools/static-assets/skel-vue/vite.config.mjs
index 01a2ae4903..f955234c6a 100644
--- a/tools/static-assets/skel-vue/vite.config.mjs
+++ b/tools/static-assets/skel-vue/vite.config.mjs
@@ -1,5 +1,5 @@
 import vue from '@vitejs/plugin-vue';
-import tailwindcss from 'tailwindcss';
+import tailwindcss from '@tailwindcss/vite';
 import { defineConfig } from 'vite';
 import { meteor } from 'meteor-vite/plugin';
 

From e8795c96f8c5d507e6283377483b410c2371a306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 19:31:19 +0300
Subject: [PATCH 08/20] Move main.css file into UI directory to prevent Meteor
 from trying to process it in addition to Vite.

---
 tools/static-assets/skel-vue/client/main.js                  | 3 +--
 tools/static-assets/skel-vue/{client => imports/ui}/main.css | 0
 tools/static-assets/skel-vue/imports/ui/main.js              | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename tools/static-assets/skel-vue/{client => imports/ui}/main.css (100%)

diff --git a/tools/static-assets/skel-vue/client/main.js b/tools/static-assets/skel-vue/client/main.js
index 52c40b5d43..403d8a2d2a 100644
--- a/tools/static-assets/skel-vue/client/main.js
+++ b/tools/static-assets/skel-vue/client/main.js
@@ -1,2 +1 @@
-import './main.css';
-import '../imports/ui/main';
\ No newline at end of file
+import '../imports/ui/main'
\ No newline at end of file
diff --git a/tools/static-assets/skel-vue/client/main.css b/tools/static-assets/skel-vue/imports/ui/main.css
similarity index 100%
rename from tools/static-assets/skel-vue/client/main.css
rename to tools/static-assets/skel-vue/imports/ui/main.css
diff --git a/tools/static-assets/skel-vue/imports/ui/main.js b/tools/static-assets/skel-vue/imports/ui/main.js
index e3500841ea..f568d94ebf 100644
--- a/tools/static-assets/skel-vue/imports/ui/main.js
+++ b/tools/static-assets/skel-vue/imports/ui/main.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor'
 import { createApp } from 'vue'
 import { VueMeteor } from 'vue-meteor-tracker'
 
+import './main.css'
 import App from './App.vue'
 import { router } from './router'
 

From 54e5d26d72acbd51156b976452f33dcea1a8b167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 19:43:20 +0300
Subject: [PATCH 09/20] Add a clear distinction between components, pages and
 the app container through a generally accepted Vue directory structure
 convention.

---
 tools/static-assets/skel-vue/imports/ui/App.vue               | 2 +-
 .../skel-vue/imports/ui/{ => components}/AppMenu.vue          | 0
 .../skel-vue/imports/ui/{ => components}/Hello.vue            | 0
 .../skel-vue/imports/ui/{ => components}/Info.vue             | 0
 tools/static-assets/skel-vue/imports/ui/router.js             | 4 ++--
 tools/static-assets/skel-vue/imports/ui/{ => views}/About.vue | 0
 tools/static-assets/skel-vue/imports/ui/{ => views}/Home.vue  | 4 ++--
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename tools/static-assets/skel-vue/imports/ui/{ => components}/AppMenu.vue (100%)
 rename tools/static-assets/skel-vue/imports/ui/{ => components}/Hello.vue (100%)
 rename tools/static-assets/skel-vue/imports/ui/{ => components}/Info.vue (100%)
 rename tools/static-assets/skel-vue/imports/ui/{ => views}/About.vue (100%)
 rename tools/static-assets/skel-vue/imports/ui/{ => views}/Home.vue (60%)

diff --git a/tools/static-assets/skel-vue/imports/ui/App.vue b/tools/static-assets/skel-vue/imports/ui/App.vue
index 7a775391cb..19a68a1ea1 100644
--- a/tools/static-assets/skel-vue/imports/ui/App.vue
+++ b/tools/static-assets/skel-vue/imports/ui/App.vue
@@ -1,5 +1,5 @@
 <script setup>
-import AppMenu from './AppMenu.vue'
+import AppMenu from './components/AppMenu.vue'
 </script>
 
 <template>
diff --git a/tools/static-assets/skel-vue/imports/ui/AppMenu.vue b/tools/static-assets/skel-vue/imports/ui/components/AppMenu.vue
similarity index 100%
rename from tools/static-assets/skel-vue/imports/ui/AppMenu.vue
rename to tools/static-assets/skel-vue/imports/ui/components/AppMenu.vue
diff --git a/tools/static-assets/skel-vue/imports/ui/Hello.vue b/tools/static-assets/skel-vue/imports/ui/components/Hello.vue
similarity index 100%
rename from tools/static-assets/skel-vue/imports/ui/Hello.vue
rename to tools/static-assets/skel-vue/imports/ui/components/Hello.vue
diff --git a/tools/static-assets/skel-vue/imports/ui/Info.vue b/tools/static-assets/skel-vue/imports/ui/components/Info.vue
similarity index 100%
rename from tools/static-assets/skel-vue/imports/ui/Info.vue
rename to tools/static-assets/skel-vue/imports/ui/components/Info.vue
diff --git a/tools/static-assets/skel-vue/imports/ui/router.js b/tools/static-assets/skel-vue/imports/ui/router.js
index b271e02d29..00ed2a51e1 100644
--- a/tools/static-assets/skel-vue/imports/ui/router.js
+++ b/tools/static-assets/skel-vue/imports/ui/router.js
@@ -1,6 +1,6 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import Home from './Home.vue'
-import About from './About.vue'
+import Home from './views/Home.vue'
+import About from './views/About.vue'
 
 export const router = createRouter({
   history: createWebHistory(),
diff --git a/tools/static-assets/skel-vue/imports/ui/About.vue b/tools/static-assets/skel-vue/imports/ui/views/About.vue
similarity index 100%
rename from tools/static-assets/skel-vue/imports/ui/About.vue
rename to tools/static-assets/skel-vue/imports/ui/views/About.vue
diff --git a/tools/static-assets/skel-vue/imports/ui/Home.vue b/tools/static-assets/skel-vue/imports/ui/views/Home.vue
similarity index 60%
rename from tools/static-assets/skel-vue/imports/ui/Home.vue
rename to tools/static-assets/skel-vue/imports/ui/views/Home.vue
index 0473845661..38e3688bee 100644
--- a/tools/static-assets/skel-vue/imports/ui/Home.vue
+++ b/tools/static-assets/skel-vue/imports/ui/views/Home.vue
@@ -1,6 +1,6 @@
 <script setup>
-import Hello from './Hello.vue'
-import Info from './Info.vue'
+import Hello from '../components/Hello.vue'
+import Info from '../components/Info.vue'
 </script>
 
 <template>

From eca2530f455d50f6a9220d3b8437b51f43bac3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 20:21:59 +0300
Subject: [PATCH 10/20] Add further info and clarification about the use and
 purpose of the empty entry-meteor.js modules.

---
 .../skel-vue/client/entry-meteor.js           | 22 ++++++++++++-------
 .../skel-vue/server/entry-meteor.js           | 20 ++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/tools/static-assets/skel-vue/client/entry-meteor.js b/tools/static-assets/skel-vue/client/entry-meteor.js
index 418b5a55cb..84b993dc60 100644
--- a/tools/static-assets/skel-vue/client/entry-meteor.js
+++ b/tools/static-assets/skel-vue/client/entry-meteor.js
@@ -1,8 +1,14 @@
-// Entrypoint for the Meteor client
-// Generally, this file can be left empty. Vite will add imports for
-// lazy-loaded Meteor packages to this file to ensure they are included in your
-// final production bundle.
-
-// This can also be a good place to put code that you don't want Vite to
-// process, for example, if you run into a compatability issue or need to use
-// nested imports.
\ No newline at end of file
+/**
+ * Entrypoint for the Meteor client
+ *
+ * Generally, this file can be left empty. Vite will add imports for
+ * lazy-loaded Meteor packages to this file to ensure they aren't omitted from
+ * the final production bundle.
+ *
+ * Use ./main.js as the primary entrypoint for your client code to take full
+ * advantage of Vite's plugin and build system.
+ *
+ * This can also be a good place to put code that you don't want Vite to
+ * process, for example, if you run into a compatability issue or need to use
+ * nested imports which Vite doesn't support.
+ */
\ No newline at end of file
diff --git a/tools/static-assets/skel-vue/server/entry-meteor.js b/tools/static-assets/skel-vue/server/entry-meteor.js
index 48af245a74..51caf2b4fa 100644
--- a/tools/static-assets/skel-vue/server/entry-meteor.js
+++ b/tools/static-assets/skel-vue/server/entry-meteor.js
@@ -1,8 +1,12 @@
-// Entrypoint for the Meteor server
-// Generally, this file can be left empty. Vite will add imports for
-// lazy-loaded Meteor packages to this file to ensure they are included in your
-// final production bundle.
-
-// This can also be a good place to put code that you don't want Vite to
-// process, for example, if you run into a compatability issue or need to use
-// nested imports.
\ No newline at end of file
+/**
+ * Entrypoint for the Meteor server
+ * Generally, this file can be left empty. Vite will add imports for your app's
+ * server bundle here during both development and production build.
+ *
+ * Use ./main.js as the primary entrypoint for your app to take full advantage
+ * of Vite's plugin and build system.
+ *
+ * This can also be a good place to put code that you don't want Vite to
+ * process, for example, if you run into a compatability issue or need to use
+ * nested imports.
+ */
\ No newline at end of file

From c9dbbfce3648b780b7389cd5f8bbccbb43de306f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 20:26:37 +0300
Subject: [PATCH 11/20] Use .mjs for Solid.js skeleton app's Vite config

---
 .../static-assets/skel-solid/{vite.config.js => vite.config.mjs}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tools/static-assets/skel-solid/{vite.config.js => vite.config.mjs} (100%)

diff --git a/tools/static-assets/skel-solid/vite.config.js b/tools/static-assets/skel-solid/vite.config.mjs
similarity index 100%
rename from tools/static-assets/skel-solid/vite.config.js
rename to tools/static-assets/skel-solid/vite.config.mjs

From dc20c497d08327e06010bad5a640c461508247a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 20:36:42 +0300
Subject: [PATCH 12/20] Follow same filepath convention for client main module
 as with the server

---
 tools/static-assets/skel-solid/client/main.js  | 1 +
 tools/static-assets/skel-solid/client/main.jsx | 1 -
 tools/static-assets/skel-solid/vite.config.mjs | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 tools/static-assets/skel-solid/client/main.js
 delete mode 100644 tools/static-assets/skel-solid/client/main.jsx

diff --git a/tools/static-assets/skel-solid/client/main.js b/tools/static-assets/skel-solid/client/main.js
new file mode 100644
index 0000000000..44bcc64d55
--- /dev/null
+++ b/tools/static-assets/skel-solid/client/main.js
@@ -0,0 +1 @@
+import '../imports/ui/main';
\ No newline at end of file
diff --git a/tools/static-assets/skel-solid/client/main.jsx b/tools/static-assets/skel-solid/client/main.jsx
deleted file mode 100644
index 97d382a9bd..0000000000
--- a/tools/static-assets/skel-solid/client/main.jsx
+++ /dev/null
@@ -1 +0,0 @@
-// main entry point is in imports/ui/main.jsx
diff --git a/tools/static-assets/skel-solid/vite.config.mjs b/tools/static-assets/skel-solid/vite.config.mjs
index 5752984348..e0215dbb10 100644
--- a/tools/static-assets/skel-solid/vite.config.mjs
+++ b/tools/static-assets/skel-solid/vite.config.mjs
@@ -8,7 +8,7 @@ export default defineConfig({
     solidPlugin(),
     solidSvg({ defaultExport: 'component' }),
     meteor({
-      clientEntry: 'imports/ui/main.jsx',
+      clientEntry: 'client/main.js',
       serverEntry: 'server/main.js',
       enableExperimentalFeatures: true,
       stubValidation: {

From efb7961a3e2d900139c268ea94d592e50b4c0d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 20:45:26 +0300
Subject: [PATCH 13/20] Move client main.css file into imports/ui to avoid
 potential confusion when imported explicitly.

I believe Meteor will by default process all .css files within the client directory. If the user adds a direct import for this file, it could end up getting processed twice - once by Meteor and a second time by Vite.

I assume it's likely that users will end up including an explicit import as it is a requirement if they end up adding TailwindCSS to their app.
---
 tools/static-assets/skel-solid/{client => imports/ui}/main.css | 0
 tools/static-assets/skel-solid/imports/ui/main.jsx             | 1 +
 2 files changed, 1 insertion(+)
 rename tools/static-assets/skel-solid/{client => imports/ui}/main.css (100%)

diff --git a/tools/static-assets/skel-solid/client/main.css b/tools/static-assets/skel-solid/imports/ui/main.css
similarity index 100%
rename from tools/static-assets/skel-solid/client/main.css
rename to tools/static-assets/skel-solid/imports/ui/main.css
diff --git a/tools/static-assets/skel-solid/imports/ui/main.jsx b/tools/static-assets/skel-solid/imports/ui/main.jsx
index 99eb6c43d7..044f1aee69 100644
--- a/tools/static-assets/skel-solid/imports/ui/main.jsx
+++ b/tools/static-assets/skel-solid/imports/ui/main.jsx
@@ -2,6 +2,7 @@
 import { render } from 'solid-js/web';
 import { App } from './App';
 import { Meteor } from "meteor/meteor";
+import './main.css';
 
 Meteor.startup(() => {
   render(() => <App/>, document.getElementById('root'));

From 96bd00c92811ae9db8d14e7cfc57ca9dca377651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 20:48:16 +0300
Subject: [PATCH 14/20] Add docblocks to empty meteor-entry.js modules with
 some general information about their purpose.

---
 .../skel-solid/client/entry-meteor.js              | 14 ++++++++++++++
 .../skel-solid/server/entry-meteor.js              | 12 ++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/tools/static-assets/skel-solid/client/entry-meteor.js b/tools/static-assets/skel-solid/client/entry-meteor.js
index e69de29bb2..84b993dc60 100644
--- a/tools/static-assets/skel-solid/client/entry-meteor.js
+++ b/tools/static-assets/skel-solid/client/entry-meteor.js
@@ -0,0 +1,14 @@
+/**
+ * Entrypoint for the Meteor client
+ *
+ * Generally, this file can be left empty. Vite will add imports for
+ * lazy-loaded Meteor packages to this file to ensure they aren't omitted from
+ * the final production bundle.
+ *
+ * Use ./main.js as the primary entrypoint for your client code to take full
+ * advantage of Vite's plugin and build system.
+ *
+ * This can also be a good place to put code that you don't want Vite to
+ * process, for example, if you run into a compatability issue or need to use
+ * nested imports which Vite doesn't support.
+ */
\ No newline at end of file
diff --git a/tools/static-assets/skel-solid/server/entry-meteor.js b/tools/static-assets/skel-solid/server/entry-meteor.js
index e69de29bb2..51caf2b4fa 100644
--- a/tools/static-assets/skel-solid/server/entry-meteor.js
+++ b/tools/static-assets/skel-solid/server/entry-meteor.js
@@ -0,0 +1,12 @@
+/**
+ * Entrypoint for the Meteor server
+ * Generally, this file can be left empty. Vite will add imports for your app's
+ * server bundle here during both development and production build.
+ *
+ * Use ./main.js as the primary entrypoint for your app to take full advantage
+ * of Vite's plugin and build system.
+ *
+ * This can also be a good place to put code that you don't want Vite to
+ * process, for example, if you run into a compatability issue or need to use
+ * nested imports.
+ */
\ No newline at end of file

From 8214e3cf94b2fdb746f5ea1c9c73017434c12614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Vatle?= <Jorgen@WcAServices.net>
Date: Sun, 6 Jul 2025 22:01:23 +0300
Subject: [PATCH 15/20] Enable SWC for Vue skeleton app

---
 tools/static-assets/skel-vue/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/static-assets/skel-vue/package.json b/tools/static-assets/skel-vue/package.json
index 1f573e0e5b..71ab24f296 100644
--- a/tools/static-assets/skel-vue/package.json
+++ b/tools/static-assets/skel-vue/package.json
@@ -16,6 +16,7 @@
     "vue-router": "^4.2.5"
   },
   "meteor": {
+    "modern": true,
     "mainModule": {
       "client": "client/entry-meteor.js",
       "server": "server/entry-meteor.js"

From 85a61d7818005fe1d4406f4ed14edb498ab3e97b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Italo=20Jos=C3=A9?= <italo.i@live.com>
Date: Mon, 7 Jul 2025 09:10:29 -0300
Subject: [PATCH 16/20] Update
 tools/static-assets/skel-solid/server/entry-meteor.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 tools/static-assets/skel-solid/server/entry-meteor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/static-assets/skel-solid/server/entry-meteor.js b/tools/static-assets/skel-solid/server/entry-meteor.js
index 51caf2b4fa..8a066f8e94 100644
--- a/tools/static-assets/skel-solid/server/entry-meteor.js
+++ b/tools/static-assets/skel-solid/server/entry-meteor.js
@@ -7,6 +7,6 @@
  * of Vite's plugin and build system.
  *
  * This can also be a good place to put code that you don't want Vite to
- * process, for example, if you run into a compatability issue or need to use
+ * process, for example, if you run into a compatibility issue or need to use
  * nested imports.
  */
\ No newline at end of file

From 427ae4d0b95ed35d221be75f9defdfb1093d9f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Italo=20Jos=C3=A9?= <italo.i@live.com>
Date: Mon, 7 Jul 2025 09:10:43 -0300
Subject: [PATCH 17/20] Update
 tools/static-assets/skel-solid/client/entry-meteor.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 tools/static-assets/skel-solid/client/entry-meteor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/static-assets/skel-solid/client/entry-meteor.js b/tools/static-assets/skel-solid/client/entry-meteor.js
index 84b993dc60..0ec3ddc121 100644
--- a/tools/static-assets/skel-solid/client/entry-meteor.js
+++ b/tools/static-assets/skel-solid/client/entry-meteor.js
@@ -9,6 +9,6 @@
  * advantage of Vite's plugin and build system.
  *
  * This can also be a good place to put code that you don't want Vite to
- * process, for example, if you run into a compatability issue or need to use
+ * process, for example, if you run into a compatibility issue or need to use
  * nested imports which Vite doesn't support.
  */
\ No newline at end of file

From edaf6616ffb3933e8ffe6416deeec761b994a368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Italo=20Jos=C3=A9?= <italo.i@live.com>
Date: Mon, 7 Jul 2025 09:11:00 -0300
Subject: [PATCH 18/20] Update
 tools/static-assets/skel-vue/client/entry-meteor.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 tools/static-assets/skel-vue/client/entry-meteor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/static-assets/skel-vue/client/entry-meteor.js b/tools/static-assets/skel-vue/client/entry-meteor.js
index 84b993dc60..0ec3ddc121 100644
--- a/tools/static-assets/skel-vue/client/entry-meteor.js
+++ b/tools/static-assets/skel-vue/client/entry-meteor.js
@@ -9,6 +9,6 @@
  * advantage of Vite's plugin and build system.
  *
  * This can also be a good place to put code that you don't want Vite to
- * process, for example, if you run into a compatability issue or need to use
+ * process, for example, if you run into a compatibility issue or need to use
  * nested imports which Vite doesn't support.
  */
\ No newline at end of file

From 1a420ee2131d4950a2f50e6c21615af32ad0ef0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Italo=20Jos=C3=A9?= <italo.i@live.com>
Date: Mon, 7 Jul 2025 09:11:08 -0300
Subject: [PATCH 19/20] Update
 tools/static-assets/skel-vue/server/entry-meteor.js

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 tools/static-assets/skel-vue/server/entry-meteor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/static-assets/skel-vue/server/entry-meteor.js b/tools/static-assets/skel-vue/server/entry-meteor.js
index 51caf2b4fa..8a066f8e94 100644
--- a/tools/static-assets/skel-vue/server/entry-meteor.js
+++ b/tools/static-assets/skel-vue/server/entry-meteor.js
@@ -7,6 +7,6 @@
  * of Vite's plugin and build system.
  *
  * This can also be a good place to put code that you don't want Vite to
- * process, for example, if you run into a compatability issue or need to use
+ * process, for example, if you run into a compatibility issue or need to use
  * nested imports.
  */
\ No newline at end of file

From 986a4d32928616282c34d4a70871cb75a02be726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 7 Jul 2025 17:26:52 +0200
Subject: [PATCH 20/20] prefer copy from local skeleton if exists

---
 tools/cli/commands.js | 132 +++++++++++++++++++++++-------------------
 1 file changed, 73 insertions(+), 59 deletions(-)

diff --git a/tools/cli/commands.js b/tools/cli/commands.js
index b4d9d9d567..d81c03ffb5 100644
--- a/tools/cli/commands.js
+++ b/tools/cli/commands.js
@@ -1203,71 +1203,85 @@ main.registerCommand({
     toIgnore.push(/(\.html|\.js|\.css)/);
   }
 
-  try {
-    // Prototype option should use local skeleton.
-    // Maybe we should use a different skeleton for prototype
-    if (options.prototype) throw new Error("Using prototype option");
-    // if using the release option we should use the default skeleton
-    // using it as it was before 2.x
-    if (release.explicit) throw new Error("Using release option");
+  const copyFromLocalSkeleton = async () => {
+    await files.cp_r(
+      skeletonPath,
+      appPath,
+      {
+        transformFilename: function (f) {
+          return transform(f);
+        },
+        transformContents: function (contents, f) {
+          // check if this app is just for prototyping if it is then we need to add autopublish and insecure in the packages file
+          if (/packages/.test(f)) {
+            const prototypePackages = () =>
+              "autopublish             # Publish all data to the clients (for prototyping)\n" +
+              "insecure                # Allow all DB writes from clients (for prototyping)";
 
-    await setupExampleByURL(`https://github.com/meteor/skel-${skeleton}`);
-  } catch (e) {
+            // XXX: if there is the need to add more options maybe we should have a better abstraction for this if-else
+            if (options.prototype) {
+              return Buffer.from(
+                contents.toString().replace(/~prototype~/g, prototypePackages())
+              );
+            } else {
+              return Buffer.from(contents.toString().replace(/~prototype~/g, ""));
+            }
+          }
+          if (/(\.html|\.[jt]sx?|\.css)/.test(f)) {
+            return Buffer.from(transform(contents.toString()));
+          } else {
+            return contents;
+          }
+        },
+        ignore: toIgnore,
+        preserveSymlinks: true,
+      }
+    );
+  };
 
-    if (
-      e.message !== "Using prototype option" &&
-      e.message !== "Using release option"
-    ) {
-      // something has happened while creating the app using git clone
-      Console.error(
-        `Something has happened while creating your app using git clone.
+  // Check if the local skeleton path exists
+  const skeletonPath = files.pathJoin(
+    __dirnameConverted,
+    "..",
+    "static-assets",
+    `skel-${skeleton}`
+  );
+
+  const useLocalSkeleton = files.exists(skeletonPath) ||
+    options.prototype ||
+    release.explicit;
+  if (useLocalSkeleton) {
+    // Use local skeleton
+    await copyFromLocalSkeleton();
+  } else {
+    try {
+      // Prototype option should use local skeleton.
+      // Maybe we should use a different skeleton for prototype
+      if (options.prototype) throw new Error("Using prototype option");
+      // if using the release option we should use the default skeleton
+      // using it as it was before 2.x
+      if (release.explicit) throw new Error("Using release option");
+
+      // If local skeleton doesn't exist, use setupExampleByURL
+      await setupExampleByURL(`https://github.com/meteor/skel-${skeleton}`);
+    } catch (e) {
+      if (
+        e.message !== "Using prototype option" &&
+        e.message !== "Using release option"
+      ) {
+        // something has happened while creating the app using git clone
+        Console.error(
+          `Something has happened while creating your app using git clone.
          Will use cached version of skeletons.
          Error message: `,
-        e.message
-      );
+          e.message
+        );
+      }
+      // For prototype or release options, use local skeleton
+      await copyFromLocalSkeleton();
     }
-
-       // TODO: decide if this should stay here or not.
-       await files.cp_r(
-        files.pathJoin(
-          __dirnameConverted,
-          "..",
-          "static-assets",
-          `skel-${skeleton}`
-        ),
-        appPath,
-        {
-          transformFilename: function (f) {
-            return transform(f);
-          },
-          transformContents: function (contents, f) {
-            // check if this app is just for prototyping if it is then we need to add autopublish and insecure in the packages file
-            if (/packages/.test(f)) {
-              const prototypePackages = () =>
-                "autopublish             # Publish all data to the clients (for prototyping)\n" +
-                "insecure                # Allow all DB writes from clients (for prototyping)";
-
-              // XXX: if there is the need to add more options maybe we should have a better abstraction for this if-else
-              if (options.prototype) {
-                return Buffer.from(
-                  contents.toString().replace(/~prototype~/g, prototypePackages())
-                );
-              } else {
-                return Buffer.from(contents.toString().replace(/~prototype~/g, ""));
-              }
-            }
-            if (/(\.html|\.[jt]sx?|\.css)/.test(f)) {
-              return Buffer.from(transform(contents.toString()));
-            } else {
-              return contents;
-            }
-          },
-          ignore: toIgnore,
-          preserveSymlinks: true,
-        }
-      );
-      await setupMessages();
   }
+  await setupMessages();
 
   Console.info("");
 });