bugfix: Allow baseUrl to be remote #531
Conversation
|
This pull request is being automatically deployed with Vercel (learn more). 🔍 Inspect: https://vercel.com/pikapkg/snowpack/okkch6346 |
drwpow
force-pushed
the
drwpow/remote-base-url
branch
from
a8749b3
to
2b8aeca
Compare
drwpow
force-pushed
the
drwpow/remote-base-url
branch
from
2b8aeca
to
cf9bb0e
Compare
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <link rel="icon" href="https://cdn.pika.dev/favicon.ico" /> |
There was a problem hiding this comment.
👆 proof it’s working. That would have been https:/cdn.pika.dev otherwise
| @@ -0,0 +1,3 @@ | |||
| import {flatten} from "https://cdn.pika.dev/web_modules/array-flatten.js"; | |||
drwpow
force-pushed
the
drwpow/remote-base-url
branch
from
cf9bb0e
to
0f0f820
Compare
drwpow
force-pushed
the
drwpow/remote-base-url
branch
from
0f0f820
to
0a1efb4
Compare
| @@ -4,7 +4,7 @@ import {SnowpackConfig} from '../config'; | |||
| import {findMatchingMountScript, ImportMap} from '../util'; | |||
| import srcFileExtensionMapping from './src-file-extension-mapping'; | |||
| const cwd = process.cwd(); | |||
| const URL_HAS_PROTOCOL_REGEX = /^\w:\/\./; | |||
| const URL_HAS_PROTOCOL_REGEX = /^(\w+:)?\/\//; | |||
There was a problem hiding this comment.
Just realized there was a bug in this RegEx. \w matches a word character, not a word. So \w+ is needed.
I also removed the character trailing the // (the .). I think that’s OK, because this was only used in a .test() below? I needed to remove that to strip just the protocol, not the protocol + 1 trailing char below.
| @@ -77,13 +77,18 @@ export function createImportResolver({ | |||
| return spec; | |||
| } | |||
| if (dependencyImportMap && dependencyImportMap.imports[spec]) { | |||
| // if baseURL is remote, handle that outside of path.posix.join() | |||
| const protocolMatch = config.buildOptions.baseUrl.match(URL_HAS_PROTOCOL_REGEX); | |||
There was a problem hiding this comment.
Didn’t notice the existing RegEx here. Reused what was here, with the bugfix (above)
drwpow
force-pushed
the
drwpow/remote-base-url
branch
from
0a1efb4
to
4af6c0b
Compare
If a user has a remote URL (
https://cdn.pika.dev) as either theirhomepageor theirbuildOptions.baseUrl, we accidentally ruin that import withpath.posix.join()(https://cdn.pika.devbecomeshttps:/cdn.pika.dev). This fixes that.