Skip to content

🔖 0.16.4 hot reload resolution #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mortaro merged 1 commit into from
Sep 6, 2022
Merged

🔖 0.16.4 hot reload resolution #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions client/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,24 +107,36 @@ export default class Nullstack {

if (module.hot) {
Nullstack.serverHashes ??= {}
Nullstack.serverPings = 0
Nullstack.clientPings = 0
const socket = new WebSocket('ws' + router.base.slice(4) + '/ws');
socket.onmessage = async function (e) {
const data = JSON.parse(e.data)
if (data.type === 'NULLSTACK_SERVER_STARTED' && (Nullstack.needsReload || !environment.hot)) {
window.location.reload()
if (data.type === 'NULLSTACK_SERVER_STARTED') {
Nullstack.serverPings++
if (Nullstack.needsReload || !environment.hot) {
window.location.reload()
}
}
};
Nullstack.updateInstancesPrototypes = function updateInstancesPrototypes(klass, hash, serverHashes) {
Nullstack.updateInstancesPrototypes = function updateInstancesPrototypes(klass, hash, serverHash) {
for (const key in context.instances) {
const instance = context.instances[key]
if (instance.constructor.hash === hash) {
Object.setPrototypeOf(instance, klass.prototype);
}
}
if (Nullstack.serverHashes[hash] && Nullstack.serverHashes[hash] !== serverHashes) {
Nullstack.needsReload = true
if (Nullstack.serverHashes[hash]) {
if (Nullstack.serverHashes[hash] !== serverHash) {
if (Nullstack.clientPings < Nullstack.serverPings) {
window.location.reload()
} else {
Nullstack.needsReload = true
}
}
Nullstack.clientPings++
}
Nullstack.serverHashes[hash] = serverHashes
Nullstack.serverHashes[hash] = serverHash
client.update()
}
Nullstack.hotReload = function hotReload(klass) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nullstack",
"version": "0.16.3",
"version": "0.16.4",
"description": "Full-stack Javascript Components for one-dev armies",
"main": "nullstack.js",
"author": "Mortaro",
Expand Down