summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Matthew Phillips <matthew@skypack.dev> 2022-09-14 13:51:38 -0400
committerGravatar GitHub <noreply@github.com> 2022-09-14 13:51:38 -0400
commitf1efd88ddefe078f64901b1754ebfbaf65d36b51 (patch)
tree18647fb401a9516ff378ddd230e58cc6b57b4fba
parent1bedb9427ebbe92eb74a82fc70cb67a97a250f32 (diff)
downloadastro-f1efd88ddefe078f64901b1754ebfbaf65d36b51.tar.gz
astro-f1efd88ddefe078f64901b1754ebfbaf65d36b51.tar.zst
astro-f1efd88ddefe078f64901b1754ebfbaf65d36b51.zip
Compatiblity between hoisted scripts and tailwind integration (#4755)
* Compatiblity between hoisted scripts and tailwind integration * Adds a changeset
Diffstat
-rw-r--r--.changeset/spotty-ways-cry.md5
-rw-r--r--packages/astro/package.json4
-rw-r--r--packages/astro/test/astro-scripts.test.js19
-rw-r--r--packages/astro/test/fixtures/astro-scripts/astro.config.mjs8
-rw-r--r--packages/astro/test/fixtures/astro-scripts/package.json3
-rw-r--r--packages/astro/test/fixtures/astro-scripts/src/pages/inline-in-page.astro12
-rw-r--r--pnpm-lock.yaml30
7 files changed, 59 insertions, 22 deletions
diff --git a/.changeset/spotty-ways-cry.md b/.changeset/spotty-ways-cry.md
new file mode 100644
index 000000000..a4e02303e
--- /dev/null
+++ 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
index a99312e64..d3226fd58 100644
--- 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
index 1229de5f5..4eaa29a6a 100644
--- 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
new file mode 100644
index 000000000..e841c915c
--- /dev/null
+++ 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
index 6d6da3520..5ec16b38e 100644
--- 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
new file mode 100644
index 000000000..ce9e2733e
--- /dev/null
+++ 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
index c8412144d..b50264c9b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -404,7 +404,7 @@ importers:
recast: ^0.20.5
rehype: ^12.0.1
resolve: ^1.22.0
- rollup: ~2.77.0
+ rollup: ~2.78.0
sass: ^1.52.2
semver: ^7.3.7
shiki: ^0.11.1
@@ -417,7 +417,7 @@ importers:
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
dependencies:
@@ -464,7 +464,7 @@ importers:
recast: 0.20.5
rehype: 12.0.1
resolve: 1.22.1
- rollup: 2.77.3
+ rollup: 2.78.1
semver: 7.3.7
shiki: 0.11.1
sirv: 2.0.2
@@ -475,7 +475,7 @@ importers:
tsconfig-resolver: 3.0.1
unist-util-visit: 4.1.1
vfile: 5.3.5
- vite: 3.0.9_sass@1.54.9
+ vite: 3.1.0_sass@1.54.9
yargs-parser: 21.1.1
zod: 3.19.1
devDependencies:
@@ -1356,8 +1356,10 @@ importers:
packages/astro/test/fixtures/astro-scripts:
specifiers:
+ '@astrojs/tailwind': workspace:*
astro: workspace:*
dependencies:
+ '@astrojs/tailwind': link:../../../../integrations/tailwind
astro: link:../../..
packages/astro/test/fixtures/astro-sitemap-rss:
@@ -15819,14 +15821,6 @@ packages:
dependencies:
estree-walker: 0.6.1
- /rollup/2.77.3:
- resolution: {integrity: sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==}
- engines: {node: '>=10.0.0'}
- hasBin: true
- optionalDependencies:
- fsevents: 2.3.2
- dev: false
-
/rollup/2.78.1:
resolution: {integrity: sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==}
engines: {node: '>=10.0.0'}
@@ -17328,8 +17322,8 @@ packages:
- supports-color
dev: false
- /vite/3.0.9_sass@1.54.9:
- resolution: {integrity: sha512-waYABTM+G6DBTCpYAxvevpG50UOlZuynR0ckTK5PawNVt7ebX6X7wNXHaGIO6wYYFXSM7/WcuFuO2QzhBB6aMw==}
+ /vite/3.1.0:
+ resolution: {integrity: sha512-YBg3dUicDpDWFCGttmvMbVyS9ydjntwEjwXRj2KBFwSB8SxmGcudo1yb8FW5+M/G86aS8x828ujnzUVdsLjs9g==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
@@ -17347,16 +17341,15 @@ packages:
terser:
optional: true
dependencies:
- esbuild: 0.14.54
+ esbuild: 0.15.7
postcss: 8.4.16
resolve: 1.22.1
- rollup: 2.77.3
- sass: 1.54.9
+ rollup: 2.78.1
optionalDependencies:
fsevents: 2.3.2
dev: false
- /vite/3.1.0:
+ /vite/3.1.0_sass@1.54.9:
resolution: {integrity: sha512-YBg3dUicDpDWFCGttmvMbVyS9ydjntwEjwXRj2KBFwSB8SxmGcudo1yb8FW5+M/G86aS8x828ujnzUVdsLjs9g==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
@@ -17379,6 +17372,7 @@ packages:
postcss: 8.4.16
resolve: 1.22.1
rollup: 2.78.1
+ sass: 1.54.9
optionalDependencies:
fsevents: 2.3.2
dev: false
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-12 11:21:22 +0000