chore: resolve merge conflicts

.github/FUNDING.yml

@@ -1,2 +1 @@
 github: DominusKelvin
-patreon: dominuskelvin

README.md

@@ -14,7 +14,7 @@ npx create-sails <project-name>
 ```
 
 <div align="center">
-<a href="https://sailscasts.com/boring"><img src="https://github.com/sailscastshq/boring-stack/blob/main/logo.png" alt="The Boring JavaScript Stack" width="25%" height="25%"></a>
+<a href="https://sailscasts.com/boring"><img src="https://github.com/sailscastshq/boring-stack/blob/main/.github/banner.png" alt="The Boring JavaScript Stack"></a>
 </div>
 
 [The Boring JavaScript Stack](https://sailscasts.com/boring)
@@ -66,21 +66,21 @@ To launch the respective templates on StackBlitz, click on the 'Open in StackBli
 
 ### Vue Starter Template
 
-[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/sailscastshq/boring-stack/tree/develop/templates/mellow-vue)
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/sailscastshq/boring-stack/tree/main/templates/mellow-vue)
 
 ### React Starter Template
 
-[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/sailscastshq/boring-stack/tree/develop/templates/mellow-react)
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/sailscastshq/boring-stack/tree/main/templates/mellow-react)
 
 ### Svelte Starter Template
 
-[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/sailscastshq/boring-stack/tree/develop/templates/mellow-svelte)
+[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/sailscastshq/boring-stack/tree/main/templates/mellow-svelte)
 
 <hr />
 
 ## Watch Kelvin's Introduction to The Boring JavaScript Stack
 
-<a href="https://youtu.be/qX69jEyAIc0"><img src="https://github.com/sailscastshq/boring-stack/blob/main/thumbnail.png" alt="The Boring JavaScript Stack" width="100%"></a>
+<a href="https://youtu.be/qX69jEyAIc0"><img src="https://github.com/sailscastshq/boring-stack/blob/main/.github/thumbnail.png" alt="The Boring JavaScript Stack" width="100%"></a>
 
 [The Boring JavaScript - Kelvin Omereshone at #Sailsconf 2023](https://youtu.be/qX69jEyAIc0)
 
@@ -104,6 +104,10 @@ To launch the respective templates on StackBlitz, click on the 'Open in StackBli
   </p>
 </a>
 
+## Sponsors
+
+If you'd like to become a sponsor, check out [DominusKelvin](https://github.com/sponsors/DominusKelvin) sponsor page and tiers.
+
 ## Thanks
 
 You rock 🤘🏾

package.json

@@ -1,6 +1,6 @@
 {
   "name": "boring-stack",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": "true",
   "description": "The Boring JavaScript Stack 🥱 - an opinionated project starter for fullstack JavaScript",
   "scripts": {

templates/mellow-react/README.md

@@ -1,9 +1,9 @@
-# react
+# mellow-react
 
-This template should help get you started developing with a modern Sails fullstack application with Inertia and React.
+This template should help get you started developing with a modern Sails fullstack application with Sails and React.
 
 This scaffold contains:
 
-- webpack
-- tailwind
-- react
+- Sails
+- React
+- Tailwind

templates/mellow-react/assets/js/pages/index.js

@@ -14,7 +14,6 @@ export default function Index({ name }) {
       <Link href="/example" className="text-purple-600 underline">
         Go to example page
       </Link>
-
       <ul className="flex space-x-4 text-gray-400">
         <li>
           <a
@@ -52,15 +51,6 @@ export default function Index({ name }) {
             Tailwind CSS
           </a>
         </li>
-        <li>
-          <a
-            href="https://webpack.org"
-            target="_blank"
-            className="hover:text-gray-600 hover:underline"
-          >
-            Webpack
-          </a>
-        </li>
       </ul>
     </div>
   )

templates/mellow-react/config/env/production.js

@@ -19,8 +19,6 @@
  * http://sailsjs.com/docs/concepts/deployment
  */
 
-const TerserPlugin = require('terser-webpack-plugin')
-
 module.exports = {
   hookTimeout: 80000,
   /**************************************************************************
@@ -316,20 +314,5 @@ module.exports = {
     // sails_custom__stripeSecret=sk_prod__fake_Nfgh82401348jaDa3lkZ0d9Hm
     // ```
     //--------------------------------------------------------------------------
-  },
-
-  /***************************************************************************
-   *                                                                          *
-   * Override the default webpack plugin list to add the UglifyJsPlugin,      *
-   * which minifies the outputted JavaScript.                                 *
-   *                                                                          *
-   ***************************************************************************/
-
-  webpack: {
-    mode: 'production',
-    optimization: {
-      minimize: true,
-      minimizer: [new TerserPlugin()]
-    }
   }
 }

templates/mellow-react/config/shipwright.js

@@ -0,0 +1,6 @@
+const { pluginReact } = require('@rsbuild/plugin-react')
+module.exports.shipwright = {
+  build: {
+    plugins: [pluginReact()]
+  }
+}

templates/mellow-react/jsconfig.json

@@ -1,6 +1,6 @@
 {
   "include": ["api/**/*", "assets/js/**/*", "types/index.d.ts"],
-
+  "exclude": [".tmp/**/*"],
   "compilerOptions": {
     "types": ["node"],
     "typeRoots": ["./types", "./node_modules/@types"],
@@ -17,7 +17,8 @@
     "noErrorTruncation": true,
     "baseUrl": ".",
     "paths": {
-      "@/*": ["assets/js/*"]
+      "@/*": ["assets/js/*"],
+      "~/*": ["assets/*"]
     }
   }
 }