diff --git a/create-sails-generator/generators/page/index.js b/create-sails-generator/generators/page/index.js index 812d5c69..a98c6268 100644 --- 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 index 7eb879c2..193697b3 100644 --- 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 index 2d5940d1..1f025d35 100644 --- 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 deleted file mode 100644 index 5f9c93ab..00000000 --- a/templates/mellow-react/assets/dependencies/sockets.js +++ /dev/null @@ -1,6 +0,0 @@ -// Wrap instantiation of sails.io.js in a module, so it can be safely shared -// required from different modules even if they're nested within each other. -var io = require('sails.io.js/sails.io.js')( - require('socket.io-client/dist/socket.io.js') -) -module.exports = io diff --git a/templates/mellow-react/package-lock.json b/templates/mellow-react/package-lock.json index 792405e8..96401fc9 100644 --- a/templates/mellow-react/package-lock.json +++ b/templates/mellow-react/package-lock.json @@ -21,11 +21,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" @@ -118,38 +118,38 @@ } }, "node_modules/@module-federation/runtime": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@module-federation/runtime/-/runtime-0.0.8.tgz", - "integrity": "sha512-Hi9g10aHxHdQ7CbchSvke07YegYwkf162XPOmixNmJr5Oy4wVa2d9yIVSrsWFhBRbbvM5iJP6GrSuEq6HFO3ug==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@module-federation/runtime/-/runtime-0.1.6.tgz", + "integrity": "sha512-nj6a+yJ+QxmcE89qmrTl4lphBIoAds0PFPVGnqLRWflwAP88jrCcrrTqRhARegkFDL+wE9AE04+h6jzlbIfMKg==", "dev": true, "dependencies": { - "@module-federation/sdk": "0.0.8" + "@module-federation/sdk": "0.1.6" } }, "node_modules/@module-federation/runtime-tools": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@module-federation/runtime-tools/-/runtime-tools-0.0.8.tgz", - "integrity": "sha512-tqx3wlVHnpWLk+vn22c0x9Nv1BqdZnoS6vdMb53IsVpbQIFP70nhhvymHUyFuPkoLzMFidS7GpG58DYT/4lvCw==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@module-federation/runtime-tools/-/runtime-tools-0.1.6.tgz", + "integrity": "sha512-7ILVnzMIa0Dlc0Blck5tVZG1tnk1MmLnuZpLOMpbdW+zl+N6wdMjjHMjEZFCUAJh2E5XJ3BREwfX8Ets0nIkLg==", "dev": true, "dependencies": { - "@module-federation/runtime": "0.0.8", - "@module-federation/webpack-bundler-runtime": "0.0.8" + "@module-federation/runtime": "0.1.6", + "@module-federation/webpack-bundler-runtime": "0.1.6" } }, "node_modules/@module-federation/sdk": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@module-federation/sdk/-/sdk-0.0.8.tgz", - "integrity": "sha512-lkasywBItjUTNT0T0IskonDE2E/2tXE9UhUCPVoDL3NteDUSFGg4tpkF+cey1pD8mHh0XJcGrCuOW7s96peeAg==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@module-federation/sdk/-/sdk-0.1.6.tgz", + "integrity": "sha512-qifXpyYLM7abUeEOIfv0oTkguZgRZuwh89YOAYIZJlkP6QbRG7DJMQvtM8X2yHXm9PTk0IYNnOJH0vNQCo6auQ==", "dev": true }, "node_modules/@module-federation/webpack-bundler-runtime": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/@module-federation/webpack-bundler-runtime/-/webpack-bundler-runtime-0.0.8.tgz", - "integrity": "sha512-ULwrTVzF47+6XnWybt6SIq97viEYJRv4P/DByw5h7PSX9PxSGyMm5pHfXdhcb7tno7VknL0t2V8F48fetVL9kA==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@module-federation/webpack-bundler-runtime/-/webpack-bundler-runtime-0.1.6.tgz", + "integrity": "sha512-K5WhKZ4RVNaMEtfHsd/9CNCgGKB0ipbm/tgweNNeC11mEuBTNxJ09Y630vg3WPkKv9vfMCuXg2p2Dk+Q/KWTSA==", "dev": true, "dependencies": { - "@module-federation/runtime": "0.0.8", - "@module-federation/sdk": "0.0.8" + "@module-federation/runtime": "0.1.6", + "@module-federation/sdk": "0.1.6" } }, "node_modules/@nodelib/fs.scandir": { @@ -188,16 +188,16 @@ } }, "node_modules/@rsbuild/core": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@rsbuild/core/-/core-0.6.2.tgz", - "integrity": "sha512-FWNeVclbXRxEdOAsgNl+hvm1UKCvshR6uK1+BLYOu4QI2lmYkl/JnB3IhjyIMEIsLVU+H1QsxegvIwID7DeC5A==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@rsbuild/core/-/core-0.7.3.tgz", + "integrity": "sha512-Zf49scJ706Zu6PEA/nl99XLEgouNacK4RzF4ckqQalR+FW5iyc9/WYTQYUWf/g7IhQsYy61W/5pv3ddEkCjzYA==", "dev": true, "dependencies": { - "@rsbuild/shared": "0.6.2", - "@rspack/core": "0.6.1", + "@rsbuild/shared": "0.7.3", + "@rspack/core": "0.7.1", "@swc/helpers": "0.5.3", "core-js": "~3.36.0", - "html-webpack-plugin": "npm:html-rspack-plugin@5.6.2", + "html-webpack-plugin": "npm:html-rspack-plugin@5.7.2", "postcss": "^8.4.38" }, "bin": { @@ -208,51 +208,55 @@ } }, "node_modules/@rsbuild/plugin-react": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@rsbuild/plugin-react/-/plugin-react-0.6.2.tgz", - "integrity": "sha512-L33wNb4gLGvHKwgj2bok1b6hWlv7e6bLwBPFRzkoddj8nPvx7h5mRoTqLCUHVLTdJEGRVzZg6H9+JQOOr3Ff7g==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@rsbuild/plugin-react/-/plugin-react-0.7.3.tgz", + "integrity": "sha512-v1eVRyyw8T0EXW19bGbc6IJMD0+jRiEpvSdVkivRFVvVW5wqNnEajBoFMvfhoHw7VywVkH1CFhjSFX6omAe+fw==", "dev": true, "dependencies": { - "@rsbuild/shared": "0.6.2", - "@rspack/plugin-react-refresh": "0.6.1", - "react-refresh": "^0.14.0" + "@rsbuild/shared": "0.7.3", + "@rspack/plugin-react-refresh": "0.7.1", + "react-refresh": "^0.14.2" }, "peerDependencies": { - "@rsbuild/core": "^0.6.2" + "@rsbuild/core": "^0.7.3" } }, "node_modules/@rsbuild/shared": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@rsbuild/shared/-/shared-0.6.2.tgz", - "integrity": "sha512-9p+RbD8brV4SPhOo+ccmbNXURkkn0bxJ17SSp0iOT6vGhYrglKBAtqg+XvWOTaumqrVMvfIzyCCeePveRQ5VOg==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/@rsbuild/shared/-/shared-0.7.3.tgz", + "integrity": "sha512-TBD0rlZOayK0clLwmcTMMXXEIR6R8rNHmSLglPd3lZaBBim8yhDgudR5gNUFvO5zOefaV1SBj/Mr1uQqSyHzOg==", "dev": true, "dependencies": { - "@rspack/core": "0.6.1", - "caniuse-lite": "^1.0.30001607", + "@rspack/core": "0.7.1", + "caniuse-lite": "^1.0.30001625", + "html-webpack-plugin": "npm:html-rspack-plugin@5.7.2", "postcss": "^8.4.38" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" } }, "node_modules/@rspack/binding": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-0.6.1.tgz", - "integrity": "sha512-Kh81wjmT7r0JiFrqyMOkuve5Pwm4Mq44m6+tywE15bDTpahDIDQ3x18fZqeSTWG4t3P0fhvljsiWWAlPvwyjOg==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/binding/-/binding-0.7.1.tgz", + "integrity": "sha512-4C9qRDytKIaExmCExTHPQlONeZMHQK/fyXGlVo/WIK/OLQj6XDshJ0Jk7YHE6XNwai3m3LwNNkEFeluMLVO1yQ==", "dev": true, "optionalDependencies": { - "@rspack/binding-darwin-arm64": "0.6.1", - "@rspack/binding-darwin-x64": "0.6.1", - "@rspack/binding-linux-arm64-gnu": "0.6.1", - "@rspack/binding-linux-arm64-musl": "0.6.1", - "@rspack/binding-linux-x64-gnu": "0.6.1", - "@rspack/binding-linux-x64-musl": "0.6.1", - "@rspack/binding-win32-arm64-msvc": "0.6.1", - "@rspack/binding-win32-ia32-msvc": "0.6.1", - "@rspack/binding-win32-x64-msvc": "0.6.1" + "@rspack/binding-darwin-arm64": "0.7.1", + "@rspack/binding-darwin-x64": "0.7.1", + "@rspack/binding-linux-arm64-gnu": "0.7.1", + "@rspack/binding-linux-arm64-musl": "0.7.1", + "@rspack/binding-linux-x64-gnu": "0.7.1", + "@rspack/binding-linux-x64-musl": "0.7.1", + "@rspack/binding-win32-arm64-msvc": "0.7.1", + "@rspack/binding-win32-ia32-msvc": "0.7.1", + "@rspack/binding-win32-x64-msvc": "0.7.1" } }, "node_modules/@rspack/binding-darwin-arm64": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-0.6.1.tgz", - "integrity": "sha512-VbNGprAwNDrddEzGUuy6c+Q9DVlLj8jbtKsBK8maw0ERH7csX+RiH8iK+mUUf3TVMB7egRPODCBgzluyh4smYw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-0.7.1.tgz", + "integrity": "sha512-nuTZ720C33OZL0otuGy0RYw/AmX7UF/Siq7Kq/sy5T6jtHX7Yy/RWEZG3pKlZWDgbvjHw4jZ+4M9/arTRgMacQ==", "cpu": [ "arm64" ], @@ -263,9 +267,9 @@ ] }, "node_modules/@rspack/binding-darwin-x64": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-0.6.1.tgz", - "integrity": "sha512-JPRSVUEHxPPNaD8H1e5dCinu/ST5UKF0PTfxL4yElbwWnujWRYhoXZAqEEImDTFIHl8pzf5asUEUt01UGpLuqw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-0.7.1.tgz", + "integrity": "sha512-GRDmYOUx24dZ5UlayZvMHNySK9m2WUpVkR0rPURI0XMG64+OqOwgbaopmgrDKgMNCOmpieR0q6zP4X5cBH4CNA==", "cpu": [ "x64" ], @@ -276,9 +280,9 @@ ] }, "node_modules/@rspack/binding-linux-arm64-gnu": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.6.1.tgz", - "integrity": "sha512-XM3qcxuoH3cETolV1xE8ig169K8hJ5xUcll3bJ0xAmDOdqzXIjnlcKiXWEJbgDY5VFwOqh27SoB3xxXQQv6KPQ==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.7.1.tgz", + "integrity": "sha512-w4pbei0AQZfw5JhbkELY9r4a+jY3fVNfgI+NxqVEcx3oglHfM5bPW0zw6c8B4hMAFEF83+YTvI9yIsPOfUtt0w==", "cpu": [ "arm64" ], @@ -289,9 +293,9 @@ ] }, "node_modules/@rspack/binding-linux-arm64-musl": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.6.1.tgz", - "integrity": "sha512-WHDZew5i/Vts5MOyFwwjkfZrPehx9d6Zx/dGSsUriyu+bFmJGNnvSPpcpJejL9t0GNsjs1EL7K5fjwXro3qABA==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.7.1.tgz", + "integrity": "sha512-rwGTbhJq0a+uWq0dsgR20+x8XB5Vnj1Ejk2V6XjA5mOVxf8W9zRJx2S0RjDF33o/r4YQE4P26FrOHKkR57nKuw==", "cpu": [ "arm64" ], @@ -302,9 +306,9 @@ ] }, "node_modules/@rspack/binding-linux-x64-gnu": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.6.1.tgz", - "integrity": "sha512-bvexuC7ad2hbIDWRURAdwvMHoJmDLL+W2iaQp2xe7x1WKaGt5fT6ZePAth+f0xro+PuAbnfJ5H3J++xvqvAUHA==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.7.1.tgz", + "integrity": "sha512-7xtSbOGovZ5A9F7sumbSpDby8DYpKHfbfVnGpmjvngiLYUb3tcVEi1JydFjxbIaebd0hhR4h3rdwjPKbFW7ZVw==", "cpu": [ "x64" ], @@ -315,9 +319,9 @@ ] }, "node_modules/@rspack/binding-linux-x64-musl": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-0.6.1.tgz", - "integrity": "sha512-o4P54sUVaHVYyCd6KAUgBNOkBVD39xOyjpK3Ob8+lmrunDAzw6hbE2tMORMm9BfaCeKh+F17VthPjTlFgQsRRg==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-0.7.1.tgz", + "integrity": "sha512-EuOvMlDtpPL4lAetLW0InnZEMdVDoZfZ71vXu1u8/cPlbo32VD76ayymLgOmW0FX4hezKsu40LJKNWjCOmg4eA==", "cpu": [ "x64" ], @@ -328,9 +332,9 @@ ] }, "node_modules/@rspack/binding-win32-arm64-msvc": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.6.1.tgz", - "integrity": "sha512-6OoPlxZH2j+k1JyzO0khbtodJmXgpscx7sa6i2HvUsSWJVxAAjMf2ZdRsDGwMxATp9S9HIDklqV7h2X9/nfIvg==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.7.1.tgz", + "integrity": "sha512-e1ZWVErTmrGOQUM4pEwHymS/d+j9W7aeCrD2Bd8HuR1C4+hjlD7BUHCIosZk64uYYct4jI6qMkPE9vkP9942YA==", "cpu": [ "arm64" ], @@ -341,9 +345,9 @@ ] }, "node_modules/@rspack/binding-win32-ia32-msvc": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.6.1.tgz", - "integrity": "sha512-eJ+WNrEymxFBAB187fFobCS3MUc1afCv0EzAs9LAVPgj2Z3fE8l2XCDUPsRkGtQyh8ftTdyyY9JNqYEIOrx4RQ==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.7.1.tgz", + "integrity": "sha512-RrUMGCAh8aZvmHGs1Y5R3fs2TjK1n20SWyuNVb6rAoPjvPT9cxW71XOxnD0bdJm+NEunR7BzL+IdoKAgkFGDog==", "cpu": [ "ia32" ], @@ -354,9 +358,9 @@ ] }, "node_modules/@rspack/binding-win32-x64-msvc": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.6.1.tgz", - "integrity": "sha512-Wk/p1jwcjICKOGLmUkrbUZTZ5yQuYJEjNhMyAZDBQtQMOqkycOsijw8c/KYEfJTzSK0TuE+5rK5WDqQkGaYFoQ==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.7.1.tgz", + "integrity": "sha512-QNO2gL3XZK5mGjZYVwdEfvBgzJZdQiJ7GR7WGCoVT3duRzueGErTKe1Q0DgDKNN5zzGRgs1FSJFKtKS3eKOGNg==", "cpu": [ "x64" ], @@ -367,24 +371,16 @@ ] }, "node_modules/@rspack/core": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/core/-/core-0.6.1.tgz", - "integrity": "sha512-DBlyxm0cyxJ0WiYLeirdJghLhKovLXDhZiQZovZPTFljd1ZX1lCDvTj11KApmW8eJDoiBi0QDYWRLXeZetGllg==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/core/-/core-0.7.1.tgz", + "integrity": "sha512-ZOVRucpC5FDT00FD5ynEZb7siXVyHnxzoJNhcv67OqtTcaO8e7iQiOE8fHMJM4Z2Ix0zGKQn5/FV9G6MZoH+4w==", "dev": true, "dependencies": { - "@module-federation/runtime-tools": "0.0.8", - "@rspack/binding": "0.6.1", - "browserslist": "^4.21.3", - "enhanced-resolve": "5.12.0", - "events": "^3.3.0", - "graceful-fs": "4.2.10", - "json-parse-even-better-errors": "^3.0.0", - "neo-async": "2.6.2", + "@module-federation/runtime-tools": "0.1.6", + "@rspack/binding": "0.7.1", + "caniuse-lite": "^1.0.30001616", "tapable": "2.2.1", - "watchpack": "^2.4.0", - "webpack-sources": "3.2.3", - "zod": "^3.21.4", - "zod-validation-error": "1.3.1" + "webpack-sources": "3.2.3" }, "engines": { "node": ">=16.0.0" @@ -398,16 +394,10 @@ } } }, - "node_modules/@rspack/core/node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, "node_modules/@rspack/plugin-react-refresh": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@rspack/plugin-react-refresh/-/plugin-react-refresh-0.6.1.tgz", - "integrity": "sha512-yTxsm/tiso3YQRt7kHQbk/b+QZWpBNutWjLBAb7571Wu53p98Jlv9rhYKpuXgQQWGKxCPXQcR1fAd5zbvU0UMQ==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@rspack/plugin-react-refresh/-/plugin-react-refresh-0.7.1.tgz", + "integrity": "sha512-PVolWxsoFVeEEYfrLaJnPuLuz/pan/yzMow68UBMsk5667FzP5014AE+DIoOh2pIOFD+U3P+ujgz+sJNQ2CCnA==", "dev": true, "peerDependencies": { "react-refresh": ">=0.10.0 <1.0.0" @@ -785,38 +775,6 @@ "node": ">=8" } }, - "node_modules/browserslist": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", - "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "caniuse-lite": "^1.0.30001587", - "electron-to-chromium": "^1.4.668", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.13" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, "node_modules/bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -861,9 +819,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001610", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz", - "integrity": "sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==", + "version": "1.0.30001629", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz", + "integrity": "sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw==", "dev": true, "funding": [ { @@ -1419,12 +1377,6 @@ "node": ">=0.10.0" } }, - "node_modules/electron-to-chromium": { - "version": "1.4.737", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.737.tgz", - "integrity": "sha512-QvLTxaLHKdy5YxvixAw/FfHq2eWLUL9KvsPjp0aHK1gI5d3EDuDgITkvj0nFO2c6zUY3ZqVAJQiBYyQP9tQpfw==", - "dev": true - }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -1520,19 +1472,6 @@ "ms": "^2.1.1" } }, - "node_modules/enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/es-define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", @@ -1552,15 +1491,6 @@ "node": ">= 0.4" } }, - "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -1582,15 +1512,6 @@ "node": ">= 0.6" } }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "engines": { - "node": ">=0.8.x" - } - }, "node_modules/express": { "version": "4.17.3", "resolved": "https://registry.npmjs.org/express/-/express-4.17.3.tgz", @@ -2062,12 +1983,6 @@ "node": ">=10.13.0" } }, - "node_modules/glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true - }, "node_modules/gopd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", @@ -2172,14 +2087,10 @@ }, "node_modules/html-webpack-plugin": { "name": "html-rspack-plugin", - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/html-rspack-plugin/-/html-rspack-plugin-5.6.2.tgz", - "integrity": "sha512-cPGwV3odvKJ7DBAG/DxF5e0nMMvBl1zGfyDciT2xMETRrIwajwC7LtEB3cf7auoGMK6xJOOLjWJgaKHLu/FzkQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/html-rspack-plugin/-/html-rspack-plugin-5.7.2.tgz", + "integrity": "sha512-uVXGYq19bcsX7Q/53VqXQjCKXw0eUMHlFGDLTaqzgj/ckverfhZQvXyA6ecFBaF9XUH16jfCTCyALYi0lJcagg==", "dev": true, - "dependencies": { - "lodash": "^4.17.21", - "tapable": "^2.0.0" - }, "engines": { "node": ">=10.13.0" }, @@ -2463,15 +2374,6 @@ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, - "node_modules/json-parse-even-better-errors": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz", - "integrity": "sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/jsonfile": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", @@ -2819,18 +2721,6 @@ "node": ">= 0.6" } }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true - }, - "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", - "dev": true - }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -3371,9 +3261,9 @@ } }, "node_modules/react-refresh": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz", - "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz", + "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -3779,12 +3669,12 @@ } }, "node_modules/sails-hook-shipwright": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/sails-hook-shipwright/-/sails-hook-shipwright-0.1.1.tgz", - "integrity": "sha512-FbK5wEn9pz3iR2obmeHFapdQF4ktPtptkSlOmRVRP6UQETRL94XhL/5jNTdC/0AsKGH0F15/5FaQhIUWHundsQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/sails-hook-shipwright/-/sails-hook-shipwright-0.2.0.tgz", + "integrity": "sha512-8qGh6iMeiswBoeywlsTm/wDrG0La2C2GXeGzB+90X2a8UUaLaYy4y5nSNDlfzRtG1SLublvYhpTmg6k0OtqadQ==", "dev": true, "dependencies": { - "@rsbuild/core": "^0.6.2" + "@rsbuild/core": "^0.7.1" } }, "node_modules/sails-hook-sockets": { @@ -4679,36 +4569,6 @@ "node": ">= 0.8" } }, - "node_modules/update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -4755,19 +4615,6 @@ "makeerror": "1.0.x" } }, - "node_modules/watchpack": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz", - "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==", - "dev": true, - "dependencies": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/waterline": { "version": "0.15.2", "resolved": "https://registry.npmjs.org/waterline/-/waterline-0.15.2.tgz", @@ -4982,27 +4829,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", "integrity": "sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==" - }, - "node_modules/zod": { - "version": "3.22.4", - "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz", - "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/colinhacks" - } - }, - "node_modules/zod-validation-error": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-1.3.1.tgz", - "integrity": "sha512-cNEXpla+tREtNdAnNKY4xKY1SGOn2yzyuZMu4O0RQylX9apRpUjNcPkEc3uHIAr5Ct7LenjZt6RzjEH6+JsqVQ==", - "dev": true, - "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "zod": "^3.18.0" - } } } } diff --git a/templates/mellow-react/package.json b/templates/mellow-react/package.json index cc96d33b..0e708169 100644 --- 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 index 057b930e..fc7131e4 100644 --- a/templates/mellow-react/views/app.ejs +++ b/templates/mellow-react/views/app.ejs @@ -4,13 +4,10 @@ - + <%- shipwright.styles() %>
- + <%- shipwright.scripts() %>