Skip to content

fix: Correcting SW flag in dev #1534

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
ForsakenHarmony merged 8 commits into from
Mar 8, 2021
+50 −42
Merged

fix: Correcting SW flag in dev #1534

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
644db4b
fix: Correcing SW flag in dev
rschristian Feb 7, 2021
6e6d4ba
refactor: Extracting prod & dev into common config
rschristian Feb 7, 2021
7a98d0e
docs: Adding changeset
rschristian Feb 7, 2021
9096171
Merge branch 'master' into fix/swOnDev
rschristian Feb 7, 2021
2ae9c94
Merge branch 'master' into fix/swOnDev
ForsakenHarmony Feb 25, 2021
341b3f6
Merge branch 'master' into fix/swOnDev
ForsakenHarmony Feb 25, 2021
b3625ea
refactor: (Hopefully) improving readability
rschristian Feb 26, 2021
fae2269
Merge branch 'master' into fix/swOnDev
rschristian Mar 8, 2021
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
5 changes: 5 additions & 0 deletions .changeset/twenty-months-smash.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'preact-cli': patch
---

Fixes SW flag in dev
88 changes: 46 additions & 42 deletions packages/cli/lib/lib/webpack/webpack-client-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@ async function clientConfig(env) {
polyfills: resolve(__dirname, './polyfills'),
};

let swPath;
if (env.sw) {
swPath = join(__dirname, '..', '..', '..', 'sw', 'sw.js');
const userSwPath = join(src, 'sw.js');
if (existsSync(userSwPath)) {
swPath = userSwPath;
} else {
warn(`Could not find sw.js in ${src}. Using the default service worker.`);
}
}

return {
entry: entry,
output: {
Expand Down Expand Up @@ -83,6 +94,9 @@ async function clientConfig(env) {
},

plugins: [
new webpack.DefinePlugin({
'process.env.ES_BUILD': false,
}),
new PushManifestPlugin(env),
...(await renderHTMLPlugin(env)),
...getBabelEsmPlugin(env),
Expand All @@ -103,6 +117,38 @@ async function clientConfig(env) {
},
].filter(Boolean)
),
...(env.sw
Copy link
Member

@ForsakenHarmony ForsakenHarmony Feb 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this makes things a lot less readable

Copy link
Member Author

@rschristian rschristian Feb 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nested ternary?

Yeah, sorry, can't remember why I did it like that. I'll try to fix that up tomorrow (3am here)

Copy link
Member Author

@rschristian rschristian Feb 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed an update, hopefully that's more readable.

? env.esm
? [
new InjectManifest({
swSrc: swPath,
swDest: 'sw-esm.js',
include: [
/200\.html$/,
/\.esm.js$/,
/\.css$/,
/\.(png|jpg|svg|gif|webp)$/,
],
webpackCompilationPlugins: [
new webpack.DefinePlugin({
'process.env.ESM': true,
}),
],
}),
]
: [
new InjectManifest({
swSrc: join(src, 'sw.js'),
include: [
/200\.html$/,
/\.js$/,
/\.css$/,
/\.(png|jpg|svg|gif|webp)$/,
],
exclude: [/\.esm\.js$/],
}),
]
: []),
],
};
}
Expand Down Expand Up @@ -156,17 +202,6 @@ function getBabelEsmPlugin(config) {

function isProd(config) {
let limit = 200 * 1000; // 200kb
const { src, sw } = config;
let swPath;
if (sw) {
swPath = join(__dirname, '..', '..', '..', 'sw', 'sw.js');
const userSwPath = join(src, 'sw.js');
if (existsSync(userSwPath)) {
swPath = userSwPath;
} else {
warn(`Could not find sw.js in ${src}. Using the default service worker.`);
}
}
const prodConfig = {
performance: Object.assign(
{
Expand All @@ -180,7 +215,6 @@ function isProd(config) {
plugins: [
new webpack.DefinePlugin({
'process.env.ADD_SW': config.sw,
'process.env.ES_BUILD': false,
'process.env.ESM': config.esm,
'process.env.PRERENDER': config.prerender,
}),
Expand Down Expand Up @@ -222,36 +256,6 @@ function isProd(config) {
},
};

if (config.esm && config.sw) {
prodConfig.plugins.push(
new InjectManifest({
swSrc: swPath,
swDest: 'sw-esm.js',
include: [
/200\.html$/,
/\.esm.js$/,
/\.css$/,
/\.(png|jpg|svg|gif|webp)$/,
],
webpackCompilationPlugins: [
new webpack.DefinePlugin({
'process.env.ESM': true,
}),
],
})
);
}

if (config.sw) {
prodConfig.plugins.push(
new InjectManifest({
swSrc: swPath,
include: [/200\.html$/, /\.js$/, /\.css$/, /\.(png|jpg|svg|gif|webp)$/],
exclude: [/\.esm\.js$/],
})
);
}

if (config['inline-css']) {
prodConfig.plugins.push(
new CrittersPlugin({
Expand Down