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

fix(491): remove favicon package + use favicon.svg by default #537

Merged
merged 2 commits into from
Jul 1, 2022
Merged

fix(491): remove favicon package + use favicon.svg by default #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f81855b
fix(491): remove favicon package + use favicon.svg by default
anrusina Jul 1, 2022
bc1c154
chore: resolve yarn.lock merge conflict
anrusina Jul 1, 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
3 changes: 1 addition & 2 deletions packages/zapp/console/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
"compression-webpack-plugin": "^9.2.0",
"contrast": "^1.0.1",
"copy-to-clipboard": "^3.0.8",
"copy-webpack-plugin": "^11.0.0",
"cronstrue": "^1.31.0",
"d3-dag": "^0.3.4",
"d3-shape": "^1.2.2",
Expand All @@ -116,8 +117,6 @@
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.3.0",
"favicons": "^6.2.0",
"favicons-webpack-plugin": "^5.0.2",
"fork-ts-checker-webpack-plugin": "^7.2.1",
"html-webpack-plugin": "^5.5.0",
"husky": "^4.2.5",
Expand Down
Binary file added packages/zapp/console/src/assets/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file removed packages/zapp/console/src/assets/favicon.png
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions packages/zapp/console/src/assets/favicon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions packages/zapp/console/src/assets/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,27 @@
href="https://fonts.googleapis.com/css?family=Lato:300,400,700|Open+Sans:400,700"
rel="stylesheet"
/>
<!-- Minimal set of favicons, aligned with https://evilmartians.com/chronicles/how-to-favicon-in-2021-six-files-that-fit-most-needs -->
<link
rel="manifest"
href="<%= htmlWebpackPlugin.options.publicPath %>/manifest.webmanifest"
/>
<!-- 16x16, 32x32 -->
<link
rel="icon"
href="<%= htmlWebpackPlugin.options.publicPath %>/favicon.ico"
sizes="any"
/>
<link
rel="icon"
href="<%= htmlWebpackPlugin.options.publicPath %>/favicon.svg"
type="image/svg+xml"
/>
<!-- 180x180 -->
<link
rel="apple-touch-icon"
href="<%= htmlWebpackPlugin.options.publicPath %>/apple-touch-icon.png"
/>
</head>
<body>
<div id="react-app"></div>
Expand Down
Binary file added packages/zapp/console/src/assets/public/apple-touch-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/zapp/console/src/assets/public/icon-192.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/zapp/console/src/assets/public/icon-512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions packages/zapp/console/src/assets/public/manifest.webmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "My website",
"icons": [
{ "src": "/icon-192.png", "type": "image/png", "sizes": "192x192" },
{ "src": "/icon-512.png", "type": "image/png", "sizes": "512x512" }
]
}
18 changes: 9 additions & 9 deletions packages/zapp/console/webpack.common.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import * as webpack from 'webpack';
import { processEnv as env, ASSETS_PATH as publicPath } from './env';

const { StatsWriterPlugin } = require('webpack-stats-plugin');
const FavIconWebpackPlugin = require('favicons-webpack-plugin');
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const CopyPlugin = require('copy-webpack-plugin');
const nodeExternals = require('webpack-node-externals');

/** Current service name */
Expand Down Expand Up @@ -39,13 +39,6 @@ export const imageAndFontsRule: webpack.RuleSetRule = {
type: 'asset/resource',
};

export const favIconPlugin = new FavIconWebpackPlugin({
logo: path.resolve(__dirname, 'src/assets/favicon.png'),
// we can add '[fullhash:8]/' to the end of the file in future
// if this one will be changed - ensure that OneClick will still be working
prefix: './',
});

/** Write client stats to a JSON file for production */
export const statsWriterPlugin = new StatsWriterPlugin({
filename: 'client-stats.json',
Expand Down Expand Up @@ -133,9 +126,16 @@ export const clientConfig: webpack.Configuration = {
},
plugins: [
new ForkTsCheckerWebpackPlugin({ typescript: { configFile, build: true } }),
favIconPlugin,
statsWriterPlugin,
getDefinePlugin(false),
new CopyPlugin({
patterns: [
// copy all to root, to ensure FlyteOneClick support
{ from: './src/assets/public', to: '' },
{ from: './src/assets/favicon.ico', to: '' },
{ from: './src/assets/favicon.svg', to: '' },
],
}),
],
};

Expand Down
8 changes: 7 additions & 1 deletion packages/zapp/console/webpack.dev.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ import * as webpack from 'webpack';
import * as HTMLWebpackPlugin from 'html-webpack-plugin';
import * as path from 'path';
import chalk from 'chalk';
import { LOCAL_DEV_HOST, CERTIFICATE_PATH, ADMIN_API_USE_SSL } from './env';
import {
LOCAL_DEV_HOST,
CERTIFICATE_PATH,
ADMIN_API_USE_SSL,
ASSETS_PATH as publicPath,
} from './env';

const { merge } = require('webpack-merge');
const fs = require('fs');
Expand Down Expand Up @@ -64,6 +69,7 @@ export const clientConfig: webpack.Configuration = merge(common.default.clientCo
plugins: [
new HTMLWebpackPlugin({
template: './src/assets/index.html',
publicPath,
inject: 'body',
minify: false,
hash: false,
Expand Down
2 changes: 2 additions & 0 deletions packages/zapp/console/webpack.prod.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as webpack from 'webpack';
import * as CompressionWebpackPlugin from 'compression-webpack-plugin';
import * as HTMLWebpackPlugin from 'html-webpack-plugin';
import { ASSETS_PATH as publicPath } from './env';

const { merge } = require('webpack-merge');

Expand Down Expand Up @@ -48,6 +49,7 @@ export const clientConfig: webpack.Configuration = merge(common.default.clientCo
}),
new HTMLWebpackPlugin({
template: './src/assets/index.html',
publicPath,
inject: 'body',
minify: {
minifyCSS: true,
Expand Down
Loading