From f7dbdbb37bf2fb91aa8c29a281a81506959e833d Mon Sep 17 00:00:00 2001 From: Peter Pan Date: Sat, 13 Jun 2020 17:12:23 +0800 Subject: [PATCH] fix: graph export style missing (#665) * fix: graph export style missing * bump 2.0.0-beta.6 * build: use stable channel of rust toolchain --- frontend/packages/core/components/Navbar.tsx | 2 +- frontend/packages/core/pages/_app.tsx | 6 +----- frontend/packages/netron/src/view.js | 2 +- frontend/packages/netron/webpack.config.js | 9 +-------- frontend/packages/server/index.ts | 8 +++++++- frontend/packages/wasm/Cargo.toml | 2 +- frontend/scripts/install.sh | 2 +- visualdl/version.py | 2 +- 8 files changed, 14 insertions(+), 19 deletions(-) diff --git a/frontend/packages/core/components/Navbar.tsx b/frontend/packages/core/components/Navbar.tsx index 7c4f27d1..3f956d3c 100644 --- a/frontend/packages/core/components/Navbar.tsx +++ b/frontend/packages/core/components/Navbar.tsx @@ -110,7 +110,7 @@ const Navbar: FunctionComponent = () => { if (process.env.API_TOKEN_KEY) { const id = getApiToken(); if (id) { - path += `?${process.env.API_TOKEN_KEY}=${id}`; + path += `?${process.env.API_TOKEN_KEY}=${encodeURIComponent(id)}`; } } return path; diff --git a/frontend/packages/core/pages/_app.tsx b/frontend/packages/core/pages/_app.tsx index 72ef7c30..1299dc50 100644 --- a/frontend/packages/core/pages/_app.tsx +++ b/frontend/packages/core/pages/_app.tsx @@ -1,12 +1,11 @@ import App, {AppContext, AppProps} from 'next/app'; -import {GlobalStyle, iconFontPath} from '~/utils/style'; import {Router, appWithTranslation} from '~/utils/i18n'; import {fetcher, getApiToken, setApiToken} from '~/utils/fetch'; +import {GlobalStyle} from '~/utils/style'; import Head from 'next/head'; import Layout from '~/components/Layout'; import NProgress from 'nprogress'; -import Preloader from '~/components/Preloader'; import React from 'react'; import {SWRConfig} from 'swr'; import {ToastContainer} from 'react-toastify'; @@ -52,9 +51,6 @@ class VDLApp extends App { return ( <> - {['ttf', 'woff', 'svg'].map(ext => ( - - ))} {process.env.title} diff --git a/frontend/packages/netron/src/view.js b/frontend/packages/netron/src/view.js index 85bddd03..60f4f02a 100644 --- a/frontend/packages/netron/src/view.js +++ b/frontend/packages/netron/src/view.js @@ -695,7 +695,7 @@ view.View = class { if (this._activeGraph && (extension == 'png' || extension == 'svg')) { const graphElement = this._host.document.getElementById('canvas'); const exportElement = graphElement.cloneNode(true); - this.applyStyleSheet(exportElement, 'view-grapher.css'); + this.applyStyleSheet(exportElement, 'style.css'); exportElement.setAttribute('id', 'export'); exportElement.removeAttribute('width'); exportElement.removeAttribute('height'); diff --git a/frontend/packages/netron/webpack.config.js b/frontend/packages/netron/webpack.config.js index 2a8c0f43..41faac89 100644 --- a/frontend/packages/netron/webpack.config.js +++ b/frontend/packages/netron/webpack.config.js @@ -35,12 +35,6 @@ module.exports = { name: 'vendors', test: /[\\/]node_modules[\\/](?!netron)/, chunks: 'all' - }, - styles: { - name: 'styles', - test: /\.scss$/, - chunks: 'all', - enforce: true } } } @@ -58,8 +52,7 @@ module.exports = { pako: 'pako' }), new MiniCssExtractPlugin({ - filename: '[name].[contenthash].css', - chunkFilename: '[id].[contenthash].css' + filename: '[name].css' }), new HtmlWebpackPlugin({ filename: 'index.html', diff --git a/frontend/packages/server/index.ts b/frontend/packages/server/index.ts index 70f328f3..ed341aa0 100644 --- a/frontend/packages/server/index.ts +++ b/frontend/packages/server/index.ts @@ -38,7 +38,13 @@ async function start() { if (backend) { const {createProxyMiddleware} = await import('http-proxy-middleware'); - server.use(config.env.API_URL, createProxyMiddleware({target: backend, changeOrigin: true})); + server.use( + config.env.API_URL, + createProxyMiddleware({ + target: backend, + changeOrigin: true + }) + ); } else if (isDev) { const {default: mock} = await import('@visualdl/mock'); server.use(config.env.API_URL, mock({delay: delay ? () => Math.random() * delay : 0})); diff --git a/frontend/packages/wasm/Cargo.toml b/frontend/packages/wasm/Cargo.toml index e2234433..e17d7500 100644 --- a/frontend/packages/wasm/Cargo.toml +++ b/frontend/packages/wasm/Cargo.toml @@ -55,7 +55,7 @@ console_error_panic_hook = "0.1.6" # These crates are used for running unit tests. [dev-dependencies] wasm-bindgen-test = "0.3.6" -futures = "0.3.4" +futures = "0.3.5" js-sys = "0.3.36" wasm-bindgen-futures = "0.4.9" diff --git a/frontend/scripts/install.sh b/frontend/scripts/install.sh index 572e55cd..8312c88e 100755 --- a/frontend/scripts/install.sh +++ b/frontend/scripts/install.sh @@ -5,7 +5,7 @@ set -e # rust toolchain # https://rustup.rs/ if ! hash rustup 2>/dev/null; then - curl https://sh.rustup.rs -sSf | sh -s -- --no-modify-path --default-toolchain nightly -y + curl https://sh.rustup.rs -sSf | sh -s -- --no-modify-path -y PATH="$HOME/.cargo/bin:$PATH" fi diff --git a/visualdl/version.py b/visualdl/version.py index 2b5ba6ef..c66cfb9c 100644 --- a/visualdl/version.py +++ b/visualdl/version.py @@ -13,4 +13,4 @@ # limitations under the License. # ======================================================================= -vdl_version = '2.0.0-beta.4' +vdl_version = '2.0.0-beta.6' -- GitLab