From 99aa0eda19cb96ee8d181e75d2086107f337be27 Mon Sep 17 00:00:00 2001 From: Kouji Takao Date: Wed, 28 Aug 2024 22:39:59 +0900 Subject: [PATCH] fix: unregister pwa on dev-server --- src/playground/index.ejs | 21 +++++++++++++++++++++ webpack.config.js | 15 ++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/playground/index.ejs b/src/playground/index.ejs index d63e7eb026e..baeeed9fc69 100644 --- a/src/playground/index.ejs +++ b/src/playground/index.ejs @@ -37,6 +37,7 @@ + <% if (htmlWebpackPlugin.options.pwa) { %> + <% } else { %> + + <% } %> diff --git a/webpack.config.js b/webpack.config.js index 55627e0c8a0..5cdc444040a 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -117,21 +117,24 @@ const buildConfig = baseConfig.clone() chunks: ['gui'], template: 'src/playground/index.ejs', title: 'Smalruby', - originTrials: JSON.parse(fs.readFileSync(path.resolve(__dirname, 'origin-trials.json'))) + originTrials: JSON.parse(fs.readFileSync('origin-trials.json')), + pwa: process.env.NODE_ENV === 'production' })) .addPlugin(new HtmlWebpackPlugin({ chunks: ['gui'], template: 'src/playground/index.ejs', filename: 'ja.html', title: 'スモウルビー', - originTrials: JSON.parse(fs.readFileSync(path.resolve(__dirname, 'origin-trials.json'))) + originTrials: JSON.parse(fs.readFileSync('origin-trials.json')), + pwa: process.env.NODE_ENV === 'production' })) .addPlugin(new HtmlWebpackPlugin({ chunks: ['player'], filename: 'player.html', template: 'src/playground/index.ejs', title: 'Smalruby: Player Example', - originTrials: JSON.parse(fs.readFileSync(path.resolve(__dirname, 'origin-trials.json'))) + originTrials: JSON.parse(fs.readFileSync('origin-trials.json')), + pwa: process.env.NODE_ENV === 'production' })) .addPlugin(new CopyWebpackPlugin({ patterns: [ @@ -145,7 +148,9 @@ const buildConfig = baseConfig.clone() context: 'src/examples' } ] - })) + })); + +const buildWithPwaConfig = buildConfig.clone() .addPlugin( new WorkboxPlugin.GenerateSW({ disableDevLogs: !process.env.DEBUG, @@ -188,5 +193,5 @@ const buildConfig = baseConfig.clone() const buildDist = process.env.NODE_ENV === 'production' || process.env.BUILD_MODE === 'dist'; module.exports = buildDist ? - [buildConfig.get(), distConfig.get()] : + [buildWithPwaConfig.get(), distConfig.get()] : buildConfig.get();