From c35b16a9a491ffbd093bf3e759e94cdbc960fe9c Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 31 Aug 2023 04:46:44 +0200 Subject: [PATCH] Remove joinPaths function (#26833) Extract from https://github.com/go-gitea/gitea/pull/25940. `assetUrlPrefix` is guaranteed to not contain trailing slashes, making this function unneeded. --- web_src/js/bootstrap.js | 4 +--- web_src/js/utils.js | 10 ---------- web_src/js/utils.test.js | 41 +--------------------------------------- 3 files changed, 2 insertions(+), 53 deletions(-) diff --git a/web_src/js/bootstrap.js b/web_src/js/bootstrap.js index 43075ab241..15e5b21204 100644 --- a/web_src/js/bootstrap.js +++ b/web_src/js/bootstrap.js @@ -1,11 +1,9 @@ -import {joinPaths} from './utils.js'; - // DO NOT IMPORT window.config HERE! // to make sure the error handler always works, we should never import `window.config`, because some user's custom template breaks it. // This sets up the URL prefix used in webpack's chunk loading. // This file must be imported before any lazy-loading is being attempted. -__webpack_public_path__ = joinPaths(window?.config?.assetUrlPrefix ?? '/', '/'); +__webpack_public_path__ = `${window.config?.assetUrlPrefix ?? '/assets'}/`; export function showGlobalErrorMessage(msg) { const pageContent = document.querySelector('.page-content'); diff --git a/web_src/js/utils.js b/web_src/js/utils.js index 4655b8eacc..1b701e1c6a 100644 --- a/web_src/js/utils.js +++ b/web_src/js/utils.js @@ -11,16 +11,6 @@ export function extname(path = '') { return ext || ''; } -// join a list of path segments with slashes, ensuring no double slashes -export function joinPaths(...parts) { - let str = ''; - for (const part of parts) { - if (!part) continue; - str = !str ? part : `${str.replace(/\/$/, '')}/${part.replace(/^\//, '')}`; - } - return str; -} - // test whether a variable is an object export function isObject(obj) { return Object.prototype.toString.call(obj) === '[object Object]'; diff --git a/web_src/js/utils.test.js b/web_src/js/utils.test.js index 6648b669c7..db9b1a14a3 100644 --- a/web_src/js/utils.test.js +++ b/web_src/js/utils.test.js @@ -1,6 +1,6 @@ import {expect, test} from 'vitest'; import { - basename, extname, isObject, stripTags, joinPaths, parseIssueHref, + basename, extname, isObject, stripTags, parseIssueHref, parseUrl, translateMonth, translateDay, blobToDataURI, toAbsoluteUrl, encodeURLEncodedBase64, decodeURLEncodedBase64, } from './utils.js'; @@ -18,45 +18,6 @@ test('extname', () => { expect(extname('file.js')).toEqual('.js'); }); -test('joinPaths', () => { - expect(joinPaths('', '')).toEqual(''); - expect(joinPaths('', 'b')).toEqual('b'); - expect(joinPaths('', '/b')).toEqual('/b'); - expect(joinPaths('', '/b/')).toEqual('/b/'); - expect(joinPaths('a', '')).toEqual('a'); - expect(joinPaths('/a', '')).toEqual('/a'); - expect(joinPaths('/a/', '')).toEqual('/a/'); - expect(joinPaths('a', 'b')).toEqual('a/b'); - expect(joinPaths('a', '/b')).toEqual('a/b'); - expect(joinPaths('/a', '/b')).toEqual('/a/b'); - expect(joinPaths('/a', '/b')).toEqual('/a/b'); - expect(joinPaths('/a/', '/b')).toEqual('/a/b'); - expect(joinPaths('/a', '/b/')).toEqual('/a/b/'); - expect(joinPaths('/a/', '/b/')).toEqual('/a/b/'); - - expect(joinPaths('', '', '')).toEqual(''); - expect(joinPaths('', 'b', '')).toEqual('b'); - expect(joinPaths('', 'b', 'c')).toEqual('b/c'); - expect(joinPaths('', '', 'c')).toEqual('c'); - expect(joinPaths('', '/b', '/c')).toEqual('/b/c'); - expect(joinPaths('/a', '', '/c')).toEqual('/a/c'); - expect(joinPaths('/a', '/b', '')).toEqual('/a/b'); - - expect(joinPaths('', '/')).toEqual('/'); - expect(joinPaths('a', '/')).toEqual('a/'); - expect(joinPaths('', '/', '/')).toEqual('/'); - expect(joinPaths('/', '/')).toEqual('/'); - expect(joinPaths('/', '')).toEqual('/'); - expect(joinPaths('/', 'b')).toEqual('/b'); - expect(joinPaths('/', 'b/')).toEqual('/b/'); - expect(joinPaths('/', '', '/')).toEqual('/'); - expect(joinPaths('/', 'b', '/')).toEqual('/b/'); - expect(joinPaths('/', 'b/', '/')).toEqual('/b/'); - expect(joinPaths('a', '/', '/')).toEqual('a/'); - expect(joinPaths('/', '/', 'c')).toEqual('/c'); - expect(joinPaths('/', '/', 'c/')).toEqual('/c/'); -}); - test('isObject', () => { expect(isObject({})).toBeTruthy(); expect(isObject([])).toBeFalsy();