Skip to content

fix: make aztec.js bundleable by vite #10744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
olehmisar wants to merge 2 commits into from
Closed

fix: make aztec.js bundleable by vite #10744

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6c8823
fix: make aztec.js bundleable by vite
olehmisar Dec 14, 2024
e7ac911
Merge branch 'master' into om/fix-vite-bundling
olehmisar Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions yarn-project/foundation/src/url/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import { sep } from 'path';
import path from 'path';

/**
* File URI to Path function.
Expand All @@ -34,7 +34,7 @@ export function fileURLToPath(uri: string): string {
const rest = decodeURI(uri.substring(7));
const firstSlash = rest.indexOf('/');
let host = rest.substring(0, firstSlash);
let path = rest.substring(firstSlash + 1);
let pathname = rest.substring(firstSlash + 1);

// 2. Scheme Definition
// As a special case, <host> can be the string "localhost" or the empty
Expand All @@ -45,7 +45,7 @@ export function fileURLToPath(uri: string): string {
}

if (host) {
host = sep + sep + host;
host = path.sep + path.sep + host;
}

// 3.2 Drives, drive letters, mount points, file system root
Expand All @@ -55,19 +55,19 @@ export function fileURLToPath(uri: string): string {
// "file:///c|/tmp/test.txt". In some cases, the colon is left
// unchanged, as in "file:///c:/tmp/test.txt". In other cases, the
// colon is simply omitted, as in "file:///c/tmp/test.txt".
path = path.replace(/^(.+)\|/, '$1:');
pathname = pathname.replace(/^(.+)\|/, '$1:');

// for Windows, we need to invert the path separators from what a URI uses
if (sep === '\\') {
path = path.replace(/\//g, '\\');
if (path.sep === '\\') {
pathname = pathname.replace(/\//g, '\\');
}

if (/^.+:/.test(path)) {
if (/^.+:/.test(pathname)) {
// has Windows drive at beginning of path
} else {
// unix path…
path = sep + path;
pathname = path.sep + pathname;
}

return host + path;
return host + pathname;
}