mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(editor): fix BASE_PATH for Vite dev mode (#4342)

Browse source 
* 🐛 Fix `BASE_PATH` for Vite dev mode

* don't use the string `/{{BASE_PATH}}/` as it gets replaces in build

* fix the static urls on windows

* ffs node 14

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
This commit is contained in:
Iván Ovejero 2022-10-14 10:05:25 +02:00 committed by GitHub
parent 32fb298e82
commit 24288a554d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/src/Server.ts
View file

@ -1800,7 +1800,7 @@ class App {
const srcFile = await readFile(filePath, 'utf8'); const srcFile = await readFile(filePath, 'utf8');
let payload = srcFile let payload = srcFile
.replace(basePathRegEx, n8nPath) .replace(basePathRegEx, n8nPath)
.replace(/\/static\//g, pathJoin(n8nPath, 'static/')); .replace(/\/static\//g, n8nPath + 'static/');
if (filePath.endsWith('index.html')) { if (filePath.endsWith('index.html')) {
payload = payload.replace(closingTitleTag, closingTitleTag + scriptsString); payload = payload.replace(closingTitleTag, closingTitleTag + scriptsString);
} }

3
packages/editor-ui/src/router.ts
View file

@ -55,8 +55,7 @@ function getTemplatesRedirect(store: Store<IRootState>) {
const router = new Router({ const router = new Router({
mode: 'history', mode: 'history',
// @ts-ignore base: import.meta.env.DEV ? '/' : window.BASE_PATH ?? '/',
base: window.BASE_PATH ?? '/',
scrollBehavior(to, from, savedPosition) { scrollBehavior(to, from, savedPosition) {
// saved position == null means the page is NOT visited from history (back button) // saved position == null means the page is NOT visited from history (back button)
if (savedPosition === null && to.name === VIEWS.TEMPLATES && to.meta) { if (savedPosition === null && to.name === VIEWS.TEMPLATES && to.meta) {

4
packages/editor-ui/src/shims.d.ts vendored
View file

@ -5,6 +5,10 @@ declare module 'markdown-it-emoji';
declare module 'markdown-it-task-lists'; declare module 'markdown-it-task-lists';
declare global { declare global {
interface Window {
BASE_PATH: string;
}
namespace JSX { namespace JSX {
// tslint:disable no-empty-interface // tslint:disable no-empty-interface
interface Element extends VNode {} interface Element extends VNode {}