Merge pull request nullstack#358 from nullstack/next

Mortaro · web-flow · commit 355f6ca86113 · 2023-06-13T12:01:18.000-03:00
diff --git a/client/worker.js b/client/worker.js
@@ -34,25 +34,34 @@ const workerProxyHandler = {
 const proxy = new Proxy(worker, workerProxyHandler)
 
 async function register() {
-  if ('serviceWorker' in navigator) {
-    const request = `/service-worker.js`
-    try {
-      proxy.registration = await navigator.serviceWorker.register(request, { scope: '/' })
-      if (environment.development) {
-        proxy.registration.unregister()
-      }
-    } catch (error) {
-      console.error(error)
-    }
+  if (!environment.production) return
+  const request = `/service-worker.js`
+  try {
+    proxy.registration = await navigator.serviceWorker.register(request, { scope: '/' })
+  } catch (error) {
+    console.error(error)
+  }
+}
+
+async function unregister() {
+  if (!environment.development) return
+  const registrations = await navigator.serviceWorker.getRegistrations()
+  for (let registration of registrations) {
+    window.location.reload()
+    console.log("SW FOUND", { registration })
+    registration.unregister();
   }
 }
 
 if (worker.enabled) {
-  window.addEventListener('beforeinstallprompt', function (event) {
-    event.preventDefault()
-    proxy.installation = event
-  })
-  register()
+  if ('serviceWorker' in navigator) {
+    window.addEventListener('beforeinstallprompt', async function (event) {
+      event.preventDefault()
+      proxy.installation = event
+      unregister()
+    })
+    register()
+  }
 }
 
 window.addEventListener('online', () => {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nullstack",
-  "version": "0.19.1",
+  "version": "0.19.2",
   "description": "Feature-Driven Full Stack JavaScript Components",
   "main": "./types/index.d.ts",
   "author": "Mortaro",
diff --git a/server/hmr.js b/server/hmr.js
@@ -1,5 +1,5 @@
 /* eslint-disable nullstack/no-undef */
-import { existsSync, open } from 'fs'
+import { existsSync, open, writeFileSync } from 'fs'
 import path from 'path'
 import logger from '../builders/logger'
 
@@ -54,12 +54,17 @@ export default function hmr(server) {
 
     const instance = webpackDevMiddleware(compiler, webpackDevMiddlewareOptions)
 
-    instance.waitUntilValid(() => {
+    instance.waitUntilValid(async () => {
       progress.stop()
       console.info(
         '\x1b[36m%s\x1b[0m',
         `\n 🚀 Your application is ready at http://${process.env.NULLSTACK_PROJECT_DOMAIN}:${process.env.NULLSTACK_SERVER_PORT || process.env.PORT || 3000}\n`,
       )
+      if (disk) {
+        const content = await server.prerender('/')
+        const target = `${process.cwd()}/.development/index.html`
+        writeFileSync(target, content)
+      }
     })
 
     server.use(instance)
diff --git a/server/template.js b/server/template.js
@@ -65,15 +65,15 @@ export default function ({ head, body, nextMeta, context, instances }) {
     ${project.viewport ? `<meta name="viewport" content="${project.viewport}">` : ''}
     <link rel="stylesheet" href="${cdn(`/client.css?fingerprint=${environment.key}`)}" integrity="${
     integrities['client.css'] || ''
-  }" crossorigin="anonymous">
+  }">
     ${page.schema ? `<script type="application/ld+json">${JSON.stringify(page.schema)}</script>` : ''}
     ${project.icons['180'] ? `<link rel="apple-touch-icon" sizes="180x180" href="${cdn(project.icons['180'])}">` : ''}
     <meta name="msapplication-TileColor" content="${project.backgroundColor || project.color}">
     <meta name="nullstack" content="${encodeURIComponent(sanitizeString(JSON.stringify(state)))}">
     ${head.split('<!--#-->').join('')}
     <script src="${cdn(`/client.js?fingerprint=${environment.key}`)}" integrity="${
     integrities['client.js'] || ''
-  }" defer crossorigin="anonymous"></script>
+  }" defer></script>
   </head>
   <body ${renderAttributes(nextMeta.body)}>
     ${environment.mode === 'spa' ? '<div id="application"></div>' : body}
diff --git a/server/worker.js b/server/worker.js
@@ -21,7 +21,7 @@ import settings from './settings'
 
 const worker = {}
 
-worker.enabled = environment.production
+worker.enabled = true
 worker.fetching = false
 worker.preload = []
 worker.staleWhileRevalidate = []
diff --git a/webpack/devtool.js b/webpack/devtool.js
@@ -1,5 +1,8 @@
 function devtool(options) {
   if (options.environment === 'development') {
+    if (options.disk) {
+      return 'inline-cheap-module-source-map'
+    } 
     return 'eval-cheap-module-source-map'
   } else {
     return 'hidden-source-map'
diff --git a/webpack/entry.js b/webpack/entry.js
@@ -5,7 +5,7 @@ function client(options) {
     return options.entry
   }
   return [
-    'webpack-hot-middleware/client?log=false&path=/nullstack/hmr&noInfo=true&quiet=true&timeout=1000&reload=true',
+    `${require.resolve('webpack-hot-middleware/client')}?log=false&path=/nullstack/hmr&noInfo=true&quiet=true&timeout=1000&reload=true`,
     path.posix.join(options.configFolder, 'shared', 'accept.js'),
     options.entry
   ]
@@ -30,4 +30,4 @@ function entry(options) {
   }
 }
 
-module.exports = entry
+module.exports = entry
diff --git a/workers/activate.js b/workers/activate.js
@@ -4,7 +4,7 @@ function activate(event) {
       const cacheNames = await caches.keys()
       const cachesToDelete = cacheNames.filter((cacheName) => cacheName !== self.context.environment.key)
       await Promise.all(cachesToDelete.map((cacheName) => caches.delete(cacheName)))
-      if (self.registration.navigationPreload) {
+      if ('navigationPreload' in self.registration) {
         await self.registration.navigationPreload.enable()
       }
       self.clients.claim()

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nullstack",`
`3`		`- "version": "0.19.1",`
	`3`	`+ "version": "0.19.2",`
`4`	`4`	`"description": "Feature-Driven Full Stack JavaScript Components",`
`5`	`5`	`"main": "./types/index.d.ts",`
`6`	`6`	`"author": "Mortaro",`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ function client(options) {`
`5`	`5`	`return options.entry`
`6`	`6`	`}`
`7`	`7`	`return [`
`8`		`- 'webpack-hot-middleware/client?log=false&path=/nullstack/hmr&noInfo=true&quiet=true&timeout=1000&reload=true',`
	`8`	+ `${require.resolve('webpack-hot-middleware/client')}?log=false&path=/nullstack/hmr&noInfo=true&quiet=true&timeout=1000&reload=true`,
`9`	`9`	`path.posix.join(options.configFolder, 'shared', 'accept.js'),`
`10`	`10`	`options.entry`
`11`	`11`	`]`
`@@ -30,4 +30,4 @@ function entry(options) {`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-module.exports = entry`
	`33`	`+module.exports = entry`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ function activate(event) {`
`4`	`4`	`const cacheNames = await caches.keys()`
`5`	`5`	`const cachesToDelete = cacheNames.filter((cacheName) => cacheName !== self.context.environment.key)`
`6`	`6`	`await Promise.all(cachesToDelete.map((cacheName) => caches.delete(cacheName)))`
`7`		`- if (self.registration.navigationPreload) {`
	`7`	`+ if ('navigationPreload' in self.registration) {`
`8`	`8`	`await self.registration.navigationPreload.enable()`
`9`	`9`	`}`
`10`	`10`	`self.clients.claim()`