From 54c291efa07603ebf1d7fe6b60ae00551d64de93 Mon Sep 17 00:00:00 2001
From: Drew Powers <1369770+drwpow@users.noreply.github.com>
Date: Tue, 15 Jun 2021 15:06:29 -0600
Subject: [PATCH] Handle script module resolution (#438)

Fixes #104
---
 .changeset/kind-baboons-melt.md               |  5 ++++
 packages/astro/src/build.ts                   |  3 +++
 .../src/compiler/transform/module-scripts.ts  | 17 ++++++++++++-
 packages/astro/test/astro-resolve.test.js     | 24 +++++++++++++++++--
 .../fixtures/astro-resolve/public/absolute.js |  1 +
 .../astro-resolve/src/pages/relative.js       |  1 +
 .../astro-resolve/src/pages/scripts.astro     | 20 ++++++++++++++++
 7 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/kind-baboons-melt.md
 create mode 100644 packages/astro/test/fixtures/astro-resolve/public/absolute.js
 create mode 100644 packages/astro/test/fixtures/astro-resolve/src/pages/relative.js
 create mode 100644 packages/astro/test/fixtures/astro-resolve/src/pages/scripts.astro

diff --git a/.changeset/kind-baboons-melt.md b/.changeset/kind-baboons-melt.md
new file mode 100644
index 0000000000..018148358d
--- /dev/null
+++ b/.changeset/kind-baboons-melt.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix <script type="module"> resolution
diff --git a/packages/astro/src/build.ts b/packages/astro/src/build.ts
index ef26c5a5ce..1f11a6acff 100644
--- a/packages/astro/src/build.ts
+++ b/packages/astro/src/build.ts
@@ -110,6 +110,9 @@ export async function build(astroConfig: AstroConfig, logging: LogOptions = defa
           scanPromises.push(
             runtime.load(url).then((result) => {
               if (result.statusCode !== 200) {
+                if (result.statusCode === 404) {
+                  throw new Error(`${buildState[id].srcPath.href}: could not find "${path.basename(url)}"`);
+                }
                 // there shouldn’t be a build error here
                 throw (result as any).error || new Error(`unexpected status ${result.statusCode} when loading ${url}`);
               }
diff --git a/packages/astro/src/compiler/transform/module-scripts.ts b/packages/astro/src/compiler/transform/module-scripts.ts
index 46defb1bd9..98385b1055 100644
--- a/packages/astro/src/compiler/transform/module-scripts.ts
+++ b/packages/astro/src/compiler/transform/module-scripts.ts
@@ -24,10 +24,25 @@ export default function ({ compileOptions, filename }: { compileOptions: Compile
             }
 
             let src = getAttrValue(node.attributes, 'src');
-            if (!src || !src.startsWith('.')) {
+
+            // scenario 1: if missing "src", ignore
+            if (!src) {
               return;
             }
 
+            // scenario 2: if absolute path, ignore
+            if (src.startsWith('/')) {
+              return;
+            }
+
+            // scenario 3: if remote URL, ignore
+            try {
+              new URL(src); // if this succeeds, this is a complete, valid URL
+              return;
+            } catch (err) {
+              // do nothing
+            }
+
             const srcUrl = new URL(src, fileUrl);
             const absoluteUrl = `/_astro/${srcUrl.href.replace(astroConfig.projectRoot.href, '')}`;
             setAttrValue(node.attributes, 'src', absoluteUrl);
diff --git a/packages/astro/test/astro-resolve.test.js b/packages/astro/test/astro-resolve.test.js
index ea9a307e62..d98573120f 100644
--- a/packages/astro/test/astro-resolve.test.js
+++ b/packages/astro/test/astro-resolve.test.js
@@ -1,5 +1,6 @@
 import { suite } from 'uvu';
 import * as assert from 'uvu/assert';
+import { doc } from './test-utils.js';
 import { setupBuild } from './helpers.js';
 
 const Resolution = suite('Astro Resolution');
@@ -9,11 +10,30 @@ setupBuild(Resolution, './fixtures/astro-resolve');
 Resolution('Assets', async (context) => {
   await context.build();
 
-  // public/ asset resolved
+  // test 1: public/ asset resolved
   assert.ok(await context.readFile('/svg.svg'));
 
-  // asset in src/pages resolved (and didn’t overwrite /svg.svg)
+  // test 2: asset in src/pages resolved (and didn’t overwrite /svg.svg)
   assert.ok(await context.readFile('/_astro/src/pages/svg.svg'));
 });
 
+Resolution('<script type="module">', async (context) => {
+  await context.build();
+
+  // public/ asset resolved
+  const $ = doc(await context.readFile('/scripts/index.html'));
+
+  // test 1: not `type="module"` left alone
+  assert.equal($('script[src="./relative.js"]').attr('type'), undefined);
+
+  // test 2: inline script left alone
+  assert.equal($('script:not([type]):not([src])').length, 1);
+
+  // test 3: relative script resolved
+  assert.equal($('script[type="module"][src="/_astro/src/pages/relative.js"]').length, 2); // we have 2 of these!
+
+  // test 4: absolute script left alone
+  assert.equal($('script[type="module"][src="/absolute.js"]').length, 1);
+});
+
 Resolution.run();
diff --git a/packages/astro/test/fixtures/astro-resolve/public/absolute.js b/packages/astro/test/fixtures/astro-resolve/public/absolute.js
new file mode 100644
index 0000000000..9892d29e5b
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-resolve/public/absolute.js
@@ -0,0 +1 @@
+console.log('I’m absolute');
diff --git a/packages/astro/test/fixtures/astro-resolve/src/pages/relative.js b/packages/astro/test/fixtures/astro-resolve/src/pages/relative.js
new file mode 100644
index 0000000000..c264d183c1
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-resolve/src/pages/relative.js
@@ -0,0 +1 @@
+console.log('I’m relative');
diff --git a/packages/astro/test/fixtures/astro-resolve/src/pages/scripts.astro b/packages/astro/test/fixtures/astro-resolve/src/pages/scripts.astro
new file mode 100644
index 0000000000..603fe6b91d
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-resolve/src/pages/scripts.astro
@@ -0,0 +1,20 @@
+<html>
+  <head></head>
+
+  <body>
+    <!-- not `type="module"` -->
+    <script src="./relative.js"></script>
+
+    <!-- no `src` -->
+    <script></script>
+
+    <!-- type="module" with NO "./" -->
+    <script type="module" src="relative.js"></script>
+
+    <!-- type="module" WITH leading "./" -->
+    <script type="module" src="./relative.js"></script>
+
+    <!-- absolute URL -->
+    <script type="module" src="/absolute.js"></script>
+  </body>
+</html>