Skip to content
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

Jump to bottom

Maryia/Loading favicons based on size & excluded them from service worker #5172

Merged
merged 7 commits into from
Apr 11, 2022
Merged

Maryia/Loading favicons based on size & excluded them from service worker #5172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
016ce36
Maryia/Loading favicons based on size & excluded them from service wo…
maryia-deriv-archive Mar 18, 2022
0a83c43
Maryia/exclude favicon.ico from service worker
maryia-deriv-archive Mar 18, 2022
b2c122a
Maryia/refactoring
maryia-deriv-archive Mar 18, 2022
77ec880
Maryia/commented out unused htmlInjectConfig that causes duplication …
maryia-deriv-archive Mar 18, 2022
9a5cc42
Maryia/removed unused htmlInjectConfig from trader config
maryia-deriv-archive Mar 19, 2022
bb6eca0
Merge branch 'master' into 54892_loading_extra_favicons
maryia-deriv-archive Mar 21, 2022
e919abb
Merge branch '54892_loading_extra_favicons' of github.com:maryia-deri…
maryia-deriv Apr 8, 2022
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
30 changes: 26 additions & 4 deletions packages/core/build/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const copyConfig = base => {
to: 'favicon.ico',
toType: 'file',
},
{ from: path.resolve(__dirname, '../src/public/images/favicons/'), to: 'public/images/favicons' },
{ from: path.resolve(__dirname, '../src/public/images/favicons/'), to: 'public/images/favicons/' },
{
from: path.resolve(__dirname, '../src/public/images/common/static_images/'),
to: 'public/images/common',
Expand Down Expand Up @@ -132,6 +132,8 @@ const generateSWConfig = is_release => ({
/sitemap\.xml$/,
/robots\.txt$/,
/manifest\.json$/,
/^public\/images\/favicons\//,
/^favicon\.ico$/,
/^apple-app-site-association/,
/^assetlinks.json/,
/^.well-known\//,
Expand Down Expand Up @@ -180,13 +182,33 @@ const htmlInjectConfig = () => ({
},
},
{
path: 'public/images/favicons',
glob: '*',
globPath: path.resolve(__dirname, '../src/public/images/favicons'),
path: 'favicon.ico',
attributes: {
rel: 'icon',
},
},
...[
{ name: 'favicon', rel: 'icon', size: '16' },
{ name: 'favicon', rel: 'icon', size: '32' },
{ name: 'favicon', rel: 'icon', size: '96' },
{ name: 'favicon', rel: 'icon', size: '160' },
{ name: 'favicon', rel: 'icon', size: '192' },
{ name: 'apple-touch-icon', size: '57' },
{ name: 'apple-touch-icon', size: '60' },
{ name: 'apple-touch-icon', size: '72' },
{ name: 'apple-touch-icon', size: '76' },
{ name: 'apple-touch-icon', size: '114' },
{ name: 'apple-touch-icon', size: '120' },
{ name: 'apple-touch-icon', size: '144' },
{ name: 'apple-touch-icon', size: '152' },
{ name: 'apple-touch-icon', size: '180' },
].map(({ name, rel, size }) => ({
path: `public/images/favicons/${name}-${size}.png`,
attributes: {
rel: rel || name,
sizes: `${size}x${size}`,
},
})),
],
append: false,
});
Expand Down
17 changes: 1 addition & 16 deletions packages/trader/build/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const { IS_RELEASE } = require('./constants');
const generateSWConfig = () => ({
importWorkboxFrom: 'local',
cleanupOutdatedCaches: true,
exclude: [/CNAME$/, /index\.html$/, /404\.html$/],
exclude: [/CNAME$/, /index\.html$/, /404\.html$/, /^public\/images\/favicons\//, /^favicon\.ico$/],
skipWaiting: true,
clientsClaim: true,
});
Expand All @@ -24,20 +24,6 @@ const htmlOutputConfig = () => ({
},
});

const htmlInjectConfig = () => ({
links: [
{
path: 'public/images/favicons',
glob: '*',
globPath: path.resolve(__dirname, '../src/public/images/favicons'),
attributes: {
rel: 'icon',
},
},
],
append: false,
});

const cssConfig = () => ({
filename: 'trader/css/trader.main.[contenthash].css',
chunkFilename: 'trader/css/trader.[name].[contenthash].css',
Expand All @@ -52,7 +38,6 @@ const stylelintConfig = () => ({

module.exports = {
htmlOutputConfig,
htmlInjectConfig,
cssConfig,
stylelintConfig,
generateSWConfig,
Expand Down