Merge branch 'release/0.3.0'

sailscastshq · Jun 6, 2024 · 599d879 · 599d879
2 parents a828d6a + 28927b9
commit 599d879
Show file tree

Hide file tree

Showing 15 changed files with 348 additions and 1,748 deletions.
diff --git a/create-sails-generator/generators/page/index.js b/create-sails-generator/generators/page/index.js
@@ -36,7 +36,6 @@ module.exports = {
 
     scope.pageRelPath = roughName.replace(/\.+/g, '/')
     scope.pagePath = scope.pageRelPath
-    console.log(scope.pagePath)
     scope.pageRelPath += getFileExtensionForUi(uiFramework)
     scope.uiFramework = uiFramework
     if (uiFramework == 'react') {

diff --git a/create-sails-generator/package.json b/create-sails-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-sails-generator",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Sails generator for The Boring JavaScript Stack.",
   "scripts": {
     "test": "node --test"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "boring-stack",
-  "version": "0.2.7",
+  "version": "0.3.0",
   "private": "true",
   "description": "The Boring JavaScript Stack 🥱 - an opinionated project starter for fullstack JavaScript",
   "scripts": {

diff --git a/templates/mellow-react/assets/dependencies/sockets.js b/templates/mellow-react/assets/dependencies/sockets.js
diff --git a/templates/mellow-react/package-lock.json b/templates/mellow-react/package-lock.json
diff --git a/templates/mellow-react/package.json b/templates/mellow-react/package.json
@@ -18,11 +18,11 @@
     "sails-hook-sockets": "^2.0.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-react": "^0.6.2",
+    "@rsbuild/plugin-react": "^0.7.3",
     "create-sails-generator": "^0.0.1",
     "prettier": "^2.6.2",
     "prettier-plugin-tailwindcss": "^0.1.11",
-    "sails-hook-shipwright": "^0.1.1",
+    "sails-hook-shipwright": "^0.2.0",
     "sails.io.js": "^1.2.1",
     "socket.io-client": "^2.2.0",
     "tailwindcss": "^3.0.24"

diff --git a/templates/mellow-react/views/app.ejs b/templates/mellow-react/views/app.ejs
@@ -4,13 +4,10 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="stylesheet" href="/css/app.css?version=<%=page.version%>" />
+    <%- shipwright.styles() %>
   </head>
   <body>
     <div id="app" data-page="<%= JSON.stringify(page) %>"></div>
-    <script
-      type="text/javascript"
-      src="/js/app.js?version=<%=page.version%>"
-    ></script>
+    <%- shipwright.scripts() %>
   </body>
 </html>
diff --git a/templates/mellow-svelte/assets/dependencies/sockets.js b/templates/mellow-svelte/assets/dependencies/sockets.js