Revert "Make dev builds faster (#227)"
This reverts commit 8c88ec6383
.
Fix #240
This commit is contained in:
parent
ead3527d2a
commit
163d9cecba
3 changed files with 28 additions and 77 deletions
|
@ -1,6 +1,8 @@
|
|||
const webpack = require('webpack')
|
||||
const path = require('path')
|
||||
const CopyPlugin = require('copy-webpack-plugin')
|
||||
const HtmlWebpackPlugin = require('html-webpack-plugin')
|
||||
const WorkboxPlugin = require('workbox-webpack-plugin')
|
||||
// https://webpack.js.org/guides/production/
|
||||
|
||||
const config = {
|
||||
|
@ -18,9 +20,11 @@ const config = {
|
|||
), // Hack to allow creating the client in a browser
|
||||
express: false,
|
||||
net: 'net-browserify',
|
||||
fs: 'memfs'
|
||||
fs: 'memfs',
|
||||
jose: false
|
||||
},
|
||||
fallback: {
|
||||
jose: false,
|
||||
zlib: require.resolve('browserify-zlib'),
|
||||
stream: require.resolve('stream-browserify'),
|
||||
buffer: require.resolve('buffer/'),
|
||||
|
@ -55,32 +59,27 @@ const config = {
|
|||
new webpack.NormalModuleReplacementPlugin(
|
||||
/prismarine-viewer[/|\\]viewer[/|\\]lib[/|\\]utils/,
|
||||
'./utils.web.js'
|
||||
)
|
||||
],
|
||||
// The directories that can be optionally symlinked
|
||||
[Symbol.for('webpack_directories')]: [
|
||||
{ from: path.join(__dirname, '/node_modules/prismarine-viewer/public/blocksStates/'), to: './blocksStates/' },
|
||||
{ from: path.join(__dirname, '/node_modules/prismarine-viewer/public/textures/'), to: './textures/' },
|
||||
{ from: path.join(__dirname, 'extra-textures/'), to: './extra-textures/' }
|
||||
],
|
||||
// The files that will be copied
|
||||
[Symbol.for('webpack_files')]: [
|
||||
{ from: path.join(__dirname, '/styles.css'), to: './styles.css' },
|
||||
{ from: path.join(__dirname, '/node_modules/prismarine-viewer/public/worker.js'), to: './' },
|
||||
{ from: path.join(__dirname, '/node_modules/prismarine-viewer/public/supportedVersions.json'), to: './' },
|
||||
{ from: path.join(__dirname, 'assets/'), to: './' },
|
||||
{ from: path.join(__dirname, 'config.json'), to: './config.json' }
|
||||
],
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.m?js/,
|
||||
resolve: {
|
||||
fullySpecified: false
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
),
|
||||
new WorkboxPlugin.GenerateSW({
|
||||
// these options encourage the ServiceWorkers to get in there fast
|
||||
// and not allow any straggling "old" SWs to hang around
|
||||
clientsClaim: true,
|
||||
skipWaiting: true,
|
||||
include: ['index.html', 'manifest.json'] // not caching a lot as anyway this works only online
|
||||
}),
|
||||
new CopyPlugin({
|
||||
patterns: [
|
||||
{ from: path.join(__dirname, '/styles.css'), to: './styles.css' },
|
||||
{ from: path.join(__dirname, '/node_modules/prismarine-viewer/public/blocksStates/'), to: './blocksStates/' },
|
||||
{ from: path.join(__dirname, '/node_modules/prismarine-viewer/public/textures/'), to: './textures/' },
|
||||
{ from: path.join(__dirname, '/node_modules/prismarine-viewer/public/worker.js'), to: './' },
|
||||
{ from: path.join(__dirname, '/node_modules/prismarine-viewer/public/supportedVersions.json'), to: './' },
|
||||
{ from: path.join(__dirname, 'assets/'), to: './' },
|
||||
{ from: path.join(__dirname, 'extra-textures/'), to: './extra-textures/' },
|
||||
{ from: path.join(__dirname, 'config.json'), to: './config.json' }
|
||||
]
|
||||
})
|
||||
]
|
||||
}
|
||||
|
||||
module.exports = config
|
||||
|
|
|
@ -1,36 +1,7 @@
|
|||
const { merge } = require('webpack-merge')
|
||||
const common = require('./webpack.common.js')
|
||||
const CopyPlugin = require('copy-webpack-plugin')
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
|
||||
class SymlinkPlugin {
|
||||
constructor (options) {
|
||||
this.directories = options.directories ?? []
|
||||
}
|
||||
|
||||
apply (compiler) {
|
||||
compiler.hooks.afterEmit.tap(SymlinkPlugin.name, this.afterEmitHook.bind(this))
|
||||
}
|
||||
|
||||
afterEmitHook (compilation) {
|
||||
const dir = compilation.options.context
|
||||
const output = compilation.outputOptions.path
|
||||
for (const { from: _from, to: _to } of this.directories) {
|
||||
const to = path.resolve(output, _to)
|
||||
if (fs.existsSync(to)) {
|
||||
try {
|
||||
fs.unlinkSync(to)
|
||||
} catch (e) {
|
||||
continue
|
||||
}
|
||||
}
|
||||
const from = path.resolve(dir, _from)
|
||||
fs.symlinkSync(from, to, 'junction')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = merge(common, {
|
||||
mode: 'development',
|
||||
devtool: 'inline-source-map',
|
||||
|
@ -41,9 +12,5 @@ module.exports = merge(common, {
|
|||
inline: true,
|
||||
// open: true,
|
||||
hot: true
|
||||
},
|
||||
plugins: [
|
||||
new CopyPlugin({ patterns: common[Symbol.for('webpack_files')] }),
|
||||
new SymlinkPlugin({ directories: common[Symbol.for('webpack_directories')] })
|
||||
]
|
||||
}
|
||||
})
|
||||
|
|
|
@ -1,30 +1,15 @@
|
|||
const { merge } = require('webpack-merge')
|
||||
const common = require('./webpack.common.js')
|
||||
|
||||
const CopyPlugin = require('copy-webpack-plugin')
|
||||
const LodashModuleReplacementPlugin = require('lodash-webpack-plugin')
|
||||
const { CleanWebpackPlugin } = require('clean-webpack-plugin')
|
||||
const webpack = require('webpack')
|
||||
const WorkboxPlugin = require('workbox-webpack-plugin')
|
||||
|
||||
module.exports = merge(common, {
|
||||
mode: 'production',
|
||||
plugins: [
|
||||
new CleanWebpackPlugin(),
|
||||
new webpack.optimize.ModuleConcatenationPlugin(),
|
||||
new LodashModuleReplacementPlugin(),
|
||||
new CopyPlugin({
|
||||
patterns: [
|
||||
...common[Symbol.for('webpack_directories')],
|
||||
...common[Symbol.for('webpack_files')]
|
||||
]
|
||||
}),
|
||||
new WorkboxPlugin.GenerateSW({
|
||||
// these options encourage the ServiceWorkers to get in there fast
|
||||
// and not allow any straggling "old" SWs to hang around
|
||||
clientsClaim: true,
|
||||
skipWaiting: true,
|
||||
include: ['index.html', 'manifest.json'] // not caching a lot as anyway this works only online
|
||||
})
|
||||
new LodashModuleReplacementPlugin()
|
||||
]
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue