From f5513c3c5db8abd06d2d697fff74210ed4b53c39 Mon Sep 17 00:00:00 2001 From: Luke Kaalim Date: Wed, 20 Sep 2023 02:42:50 +1000 Subject: [PATCH 1/4] Transform double quotes in import statements --- src/url-resolve.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/url-resolve.ts b/src/url-resolve.ts index 09a97fd..08ad240 100644 --- a/src/url-resolve.ts +++ b/src/url-resolve.ts @@ -47,6 +47,7 @@ export default function httpsResolve(config: PluginConfig) { transform(code: string) { if (code.indexOf('from \'http') === -1) { + if (code.indexOf('from \'http') === -1 && code.indexOf('from \"http') === -1) { return; } @@ -55,7 +56,11 @@ export default function httpsResolve(config: PluginConfig) { const replaced = code.replaceAll( HTTP_IMPORT_REGEX, (str) => { - return str.replace('from \'', 'from \'' + URL_NAMESPACE); + console.log(`HTTP Detected`, str) + const replaced = str + .replace('from \'', 'from \'' + URL_NAMESPACE) + .replace('from \"', 'from \"' + URL_NAMESPACE); + return replaced; }, ); From 553c2e8a28870db1270ab92999ad2c08ffbb6a2b Mon Sep 17 00:00:00 2001 From: Luke Kaalim Date: Wed, 20 Sep 2023 02:46:17 +1000 Subject: [PATCH 2/4] Update example to demonstrate feature --- examples/url/main.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/url/main.tsx b/examples/url/main.tsx index 510304b..d332ddb 100644 --- a/examples/url/main.tsx +++ b/examples/url/main.tsx @@ -1,4 +1,4 @@ -import React from 'https://esm.sh/react@18.2.0'; +import React from "https://esm.sh/react@18.2.0"; import { createRoot } from 'https://esm.sh/react-dom@18.2.0/client'; import { App } from './local.tsx'; import './style.css'; From 3e9418239d0c46df85e4eb87b9ebaaccbf9beabf Mon Sep 17 00:00:00 2001 From: Luke Kaalim Date: Wed, 20 Sep 2023 03:30:49 +1000 Subject: [PATCH 3/4] Remove console log --- src/url-resolve.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/url-resolve.ts b/src/url-resolve.ts index 08ad240..dbd1bd9 100644 --- a/src/url-resolve.ts +++ b/src/url-resolve.ts @@ -56,11 +56,9 @@ export default function httpsResolve(config: PluginConfig) { const replaced = code.replaceAll( HTTP_IMPORT_REGEX, (str) => { - console.log(`HTTP Detected`, str) - const replaced = str + return str .replace('from \'', 'from \'' + URL_NAMESPACE) .replace('from \"', 'from \"' + URL_NAMESPACE); - return replaced; }, ); From 6f57735cf5c2ea2a31db4aa83fff2141ba4205e9 Mon Sep 17 00:00:00 2001 From: Luke Kaalim Date: Wed, 20 Sep 2023 12:08:29 +1000 Subject: [PATCH 4/4] Remove extra line --- src/url-resolve.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/url-resolve.ts b/src/url-resolve.ts index dbd1bd9..354104a 100644 --- a/src/url-resolve.ts +++ b/src/url-resolve.ts @@ -46,7 +46,6 @@ export default function httpsResolve(config: PluginConfig) { enforce: 'pre' as const, transform(code: string) { - if (code.indexOf('from \'http') === -1) { if (code.indexOf('from \'http') === -1 && code.indexOf('from \"http') === -1) { return; }