Compatiblity between hoisted scripts and tailwind integration (#4755)

* Compatiblity between hoisted scripts and tailwind integration * Adds a changeset
withastro · Sep 14, 2022 · f1efd88 · f1efd88
1 parent 1bedb94
commit f1efd88
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 22 deletions.
diff --git a/.changeset/spotty-ways-cry.md b/.changeset/spotty-ways-cry.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Upgrade to Vite 3.1
diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -138,7 +138,7 @@
     "recast": "^0.20.5",
     "rehype": "^12.0.1",
     "resolve": "^1.22.0",
-    "rollup": "~2.77.0",
+    "rollup": "~2.78.0",
     "semver": "^7.3.7",
     "shiki": "^0.11.1",
     "sirv": "^2.0.2",
@@ -149,7 +149,7 @@
     "tsconfig-resolver": "^3.0.1",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
-    "vite": "3.0.9",
+    "vite": "3.1.0",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"
   },

diff --git a/packages/astro/test/astro-scripts.test.js b/packages/astro/test/astro-scripts.test.js
@@ -119,7 +119,8 @@ describe('Scripts (hoisted and not)', () => {
 			let html = await fixture.readFile('/with-styles/index.html');
 			let $ = cheerio.load(html);
 
-			expect($('link[rel=stylesheet]')).to.have.a.lengthOf(1);
+			// Imported styles + tailwind
+			expect($('link[rel=stylesheet]')).to.have.a.lengthOf(2);
 		});
 	});
 
@@ -150,5 +151,21 @@ describe('Scripts (hoisted and not)', () => {
 			});
 			expect(found).to.equal(1);
 		});
+
+		it('Using injectScript does not interfere', async () => {
+			let res = await fixture.fetch('/inline-in-page');
+			let html = await res.text();
+			let $ = cheerio.load(html);
+			let found = 0;
+			let moduleScripts = $('[type=module]');
+			moduleScripts.each((i, el) => {
+				if (
+					$(el).attr('src').includes('?astro&type=script&index=0&lang.ts')
+				) {
+					found++;
+				}
+			});
+			expect(found).to.equal(1);
+		});
 	});
 });
diff --git a/packages/astro/test/fixtures/astro-scripts/astro.config.mjs b/packages/astro/test/fixtures/astro-scripts/astro.config.mjs
@@ -0,0 +1,8 @@
+import { defineConfig } from 'astro/config';
+import tailwind from '@astrojs/tailwind';
+
+export default defineConfig({
+	integrations: [
+		tailwind()
+	]
+})
diff --git a/packages/astro/test/fixtures/astro-scripts/package.json b/packages/astro/test/fixtures/astro-scripts/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "astro": "workspace:*"
+    "astro": "workspace:*",
+    "@astrojs/tailwind": "workspace:*"
   }
 }
diff --git a/packages/astro/test/fixtures/astro-scripts/src/pages/inline-in-page.astro b/packages/astro/test/fixtures/astro-scripts/src/pages/inline-in-page.astro
@@ -0,0 +1,12 @@
+
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+	<h1>Testing</h1>
+	<script>
+		console.log('hi');
+	</script>
+</body>
+</html>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml