Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/flyteorg/flyteconsole int…
Browse files Browse the repository at this point in the history
…o update-react-flow-renderer
  • Loading branch information
olga-union committed Apr 21, 2022
2 parents 8d23877 + 8f2e13d commit f1a21d2
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
All notable changes to this project will be documented in this file. See
[Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.54.1](http://github.com/lyft/flyteconsole/compare/v0.54.0...v0.54.1) (2022-04-21)


### Bug Fixes

* empty commit to generate release ([#415](http://github.com/lyft/flyteconsole/issues/415)) ([ddcda48](http://github.com/lyft/flyteconsole/commit/ddcda48b3cc7d5721e35fc689c2517deb231d67a))

# [0.54.0](http://github.com/lyft/flyteconsole/compare/v0.53.0...v0.54.0) (2022-04-18)


Expand Down
3 changes: 2 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ if (process.env.NODE_ENV === 'production') {
const clientStats = require('./dist/client-stats.json');
const distPath = path.join(__dirname, 'dist');
app.use(
`${env.BASE_URL}/`,
// This path should be in sync with the `publicPath` from webpack config.
`${env.BASE_URL}/assets`,
expressStaticGzip(distPath, {
maxAge: '1d',
}),
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flyteconsole",
"version": "0.54.0",
"version": "0.54.1",
"description": "The web UI for the Flyte platform",
"repository": {
"type": "git",
Expand Down
10 changes: 7 additions & 3 deletions webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ export const serviceName = process.env.SERVICE_NAME || 'not set';
/** Absolute path to webpack output folder */
export const dist = path.join(__dirname, 'dist');

/** Webpack public path. All emitted assets will have relative path to this path */
export const publicPath = `${env.BASE_URL}/`;
/** Webpack public path. All emitted assets will have relative path to this path
* every time it is changed - the index.js app.use should also be updated.
*/
export const publicPath = `${env.BASE_URL}/assets/`;

/** True if we are in development mode */
export const isDev = env.NODE_ENV === 'development';
Expand Down Expand Up @@ -107,7 +109,9 @@ export const htmlPlugin = new HTMLWebpackPlugin({

export const favIconPlugin = new FavIconWebpackPlugin({
logo: path.resolve(__dirname, 'src/assets/favicon.png'),
prefix: 'assets/', // we can add '[fullhash:8]/' to the end of the file in future
// 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 */
Expand Down

0 comments on commit f1a21d2

Please sign in to comment.