sails-hook-shipwright 0.2.1 → 0.3.0

package/index.js

@@ -19,28 +19,28 @@ module.exports = function defineShipwrightHook(sails) {
     const files = data.allFiles
     return files
   }
-  function generateScripts() {
-    const manifestFiles = getManifestFiles()
-    let scripts = []
-    manifestFiles.forEach((file) => {
-      if (file.endsWith('.js')) {
-        scripts.push(`<script type="text/javascript" src="${file}"></script>`)
-      }
-    })
-    return scripts.join('\n')
-  }
 
-  function generateStyles() {
-    const manifestFiles = getManifestFiles()
-    let styles = []
-    manifestFiles.forEach((file) => {
-      if (file.endsWith('.css')) {
-        styles.push(`<link rel="stylesheet" href="${file}">`)
-      }
-    })
-    return styles.join('\n')
-  }
   return {
+    generateScripts: function generateScripts() {
+      const manifestFiles = getManifestFiles()
+      let scripts = []
+      manifestFiles.forEach((file) => {
+        if (file.endsWith('.js')) {
+          scripts.push(`<script type="text/javascript" src="${file}"></script>`)
+        }
+      })
+      return scripts.join('\n')
+    },
+    generateStyles: function generateStyles() {
+      const manifestFiles = getManifestFiles()
+      let styles = []
+      manifestFiles.forEach((file) => {
+        if (file.endsWith('.css')) {
+          styles.push(`<link rel="stylesheet" href="${file}">`)
+        }
+      })
+      return styles.join('\n')
+    },
     defaults: {
       shipwright: {
         build: {}
@@ -50,6 +50,7 @@ module.exports = function defineShipwrightHook(sails) {
      * Runs when this Sails app loads/lifts.
      */
     initialize: async function () {
+      const hook = this
       const appPath = sails.config.appPath
       const defaultConfigs = defineConfig({
         source: {
@@ -125,10 +126,9 @@ module.exports = function defineShipwrightHook(sails) {
           const rsbuildDevServer = await rsbuild.createDevServer()
           sails.after('hook:http:loaded', async () => {
             sails.hooks.http.app.use(rsbuildDevServer.middlewares)
-            sails.hooks.http.server.on(
-              'upgrade',
-              rsbuildDevServer.onHTTPUpgrade
-            )
+            rsbuildDevServer.connectWebSocket({
+              server: sails.hooks.http.server
+            })
           })
           sails.on('lifted', async () => {
             await rsbuildDevServer.afterListen()
@@ -139,7 +139,10 @@ module.exports = function defineShipwrightHook(sails) {
           sails.after('lifted', () => {})
         }
         sails.config.views.locals = {
-          shipwright: { scripts: generateScripts, styles: generateStyles }
+          shipwright: {
+            scripts: hook.generateScripts,
+            styles: hook.generateStyles
+          }
         }
       } catch (error) {
         sails.log.error(error)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sails-hook-shipwright",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "The modern asset pipeline for Sails",
   "main": "index.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "hookName": "shipwright"
   },
   "dependencies": {
-    "@rsbuild/core": "^0.7.10"
+    "@rsbuild/core": "^1.0.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^18.4.3",