From 9ca240845327e55e7ba67dc87fcc541eea421dd2 Mon Sep 17 00:00:00 2001 From: saul Date: Wed, 29 Mar 2023 10:39:54 +1300 Subject: [PATCH] Change default join to posix. --- src/utils/path-join.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/utils/path-join.js b/src/utils/path-join.js index 6652bf0..880cc21 100644 --- a/src/utils/path-join.js +++ b/src/utils/path-join.js @@ -1,13 +1,12 @@ -const posixReg = /((?<=\/)\/+)|(^\.\/)|((?<=\/)\.\/)/g -const win32Reg = /((?<=\\)\\+)|(^\.\\)|((?<=\\)\.\\)/g +export const posixJoin = (...paths) => paths + .join('/') + .replace(/((?<=\/)\/+)|(^\.\/)|((?<=\/)\.\/)/g, '') || '.' -const createJoin = isWin => (...paths) => isWin ? - paths.join('\\').replace(/\//g, '\\').replace(win32Reg, '') : - paths.join('/').replace(posixReg, '') +export const win32Join = (...paths) => paths + .join('\\') + .replace(/\//g, '\\') + .replace(/((?<=\\)\\+)|(^\.\\)|((?<=\\)\.\\)/g, '') || '.' -export const join = createJoin(typeof process !== 'undefined' && process?.platform === 'win32') +export const join = posixJoin -export const posixJoin = createJoin(false) -export const win32Join = createJoin(true) - -export default join +export default posixJoin