Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions client/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import element from '../shared/element'
import fragment from '../shared/fragment'
import generateTree from '../shared/generateTree'
import { loadPlugins, useClientPlugins } from '../shared/plugins'
import dangerouslySilenceHmr from '../shared/silenceHmr'
import client from './client'
import context, { generateContext } from './context'
import environment from './environment'
Expand Down Expand Up @@ -107,8 +106,6 @@ export default class Nullstack {
}

if (module.hot) {
dangerouslySilenceHmr()

function pingAndReload() {
const source = new window.EventSource('/nullstack/hmr')
let shouldReconnect = false
Expand Down
12 changes: 12 additions & 0 deletions loaders/shut-up-loader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = function removeStaticFromClient(source) {
const injection = `
const console = {
log: () => {},
error: () => {},
debug: () => {},
info: () => {},
warn: () => {}
};
`
return injection + source
}
4 changes: 0 additions & 4 deletions server/hmr.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@
import { existsSync } from 'fs'
import path from 'path'

import dangerouslySilenceHmr from '../shared/silenceHmr'

export default function hmr(server) {
if (module.hot) {
dangerouslySilenceHmr()

const customConfig = path.resolve(process.cwd(), 'webpack.config.js')
const webpackConfigs = existsSync(customConfig)
? __non_webpack_require__(customConfig)
Expand Down
13 changes: 0 additions & 13 deletions shared/silenceHmr.js

This file was deleted.

22 changes: 16 additions & 6 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ function getLoader(loader) {
return path.posix.join(loaders, loader)
}

const originalLog = console.log
global.console.log = function (...args) {
if (args[0] && args[0].toString().startsWith('[nodemon-webpack-plugin]')) return
originalLog(...args)
}

function cacheFactory(args, folder, name) {
if (args.cache || args.environment === 'development') {
return {
Expand Down Expand Up @@ -374,6 +368,14 @@ function server(env, argv) {
resourceQuery: /raw/,
type: 'asset/source',
},
{
test: /webpack[\\\/]hot/,
loader: getLoader('shut-up-loader.js')
},
{
test: /webpack-hot-middleware/,
loader: getLoader('shut-up-loader.js')
}
],
},
target: 'node',
Expand Down Expand Up @@ -500,6 +502,14 @@ function client(env, argv) {
test: /\.(njs|nts|jsx|tsx)$/,
loader: getLoader('transform-node-ref.js'),
},
{
test: /webpack[\\\/]hot/,
loader: getLoader('shut-up-loader.js')
},
{
test: /webpack-hot-middleware/,
loader: getLoader('shut-up-loader.js')
}
],
},
target: 'web',
Expand Down