From 3d08799706eb89169a2ab3f98f7ba539907ae41e Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Wed, 14 Sep 2022 12:22:42 -0400
Subject: [PATCH] upgrade to vite 3.1
---
packages/astro/package.json | 4 +-
packages/astro/test/astro-scripts.test.js | 6 +-
.../fixtures/astro-scripts/astro.config.mjs | 28 --------
pnpm-lock.yaml | 72 +++++++++----------
4 files changed, 37 insertions(+), 73 deletions(-)
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 55097b7a5..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);
});
});
@@ -151,11 +152,10 @@ describe('Scripts (hoisted and not)', () => {
expect(found).to.equal(1);
});
- it.only('Using injectScript does not interfere', async () => {
+ it('Using injectScript does not interfere', async () => {
let res = await fixture.fetch('/inline-in-page');
let html = await res.text();
let $ = cheerio.load(html);
- //console.log(html);
let found = 0;
let moduleScripts = $('[type=module]');
moduleScripts.each((i, el) => {
diff --git a/packages/astro/test/fixtures/astro-scripts/astro.config.mjs b/packages/astro/test/fixtures/astro-scripts/astro.config.mjs
index 440661908..e841c915c 100644
--- a/packages/astro/test/fixtures/astro-scripts/astro.config.mjs
+++ b/packages/astro/test/fixtures/astro-scripts/astro.config.mjs
@@ -4,33 +4,5 @@ import tailwind from '@astrojs/tailwind';
export default defineConfig({
integrations: [
tailwind()
- // {
- // name: '@test-inject-script',
- // hooks: {
- // 'astro:config:setup'({ injectScript, updateConfig }) {
- // injectScript('page-ssr', `import 'virtual:test';`);
- // updateConfig({
- // vite: {
- // plugins: [
- // {
- // name: '@test-inject-script',
- // resolveId(id) {
- // if(id === 'virtual:test') {
- // return id;
- // }
- // },
- // load(id) {
- // if(id === 'virtual:test') {
- // console.log('loading it');
- // return 'export default void 0;'
- // }
- // }
- // }
- // ]
- // }
- // })
- // }
- // }
- // }
]
})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 00289ea36..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:
@@ -15821,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'}
@@ -17330,34 +17322,6 @@ packages:
- supports-color
dev: false
- /vite/3.0.9_sass@1.54.9:
- resolution: {integrity: sha512-waYABTM+G6DBTCpYAxvevpG50UOlZuynR0ckTK5PawNVt7ebX6X7wNXHaGIO6wYYFXSM7/WcuFuO2QzhBB6aMw==}
- engines: {node: ^14.18.0 || >=16.0.0}
- hasBin: true
- peerDependencies:
- less: '*'
- sass: '*'
- stylus: '*'
- terser: ^5.4.0
- peerDependenciesMeta:
- less:
- optional: true
- sass:
- optional: true
- stylus:
- optional: true
- terser:
- optional: true
- dependencies:
- esbuild: 0.14.54
- postcss: 8.4.16
- resolve: 1.22.1
- rollup: 2.77.3
- sass: 1.54.9
- optionalDependencies:
- fsevents: 2.3.2
- dev: false
-
/vite/3.1.0:
resolution: {integrity: sha512-YBg3dUicDpDWFCGttmvMbVyS9ydjntwEjwXRj2KBFwSB8SxmGcudo1yb8FW5+M/G86aS8x828ujnzUVdsLjs9g==}
engines: {node: ^14.18.0 || >=16.0.0}
@@ -17385,6 +17349,34 @@ packages:
fsevents: 2.3.2
dev: false
+ /vite/3.1.0_sass@1.54.9:
+ resolution: {integrity: sha512-YBg3dUicDpDWFCGttmvMbVyS9ydjntwEjwXRj2KBFwSB8SxmGcudo1yb8FW5+M/G86aS8x828ujnzUVdsLjs9g==}
+ engines: {node: ^14.18.0 || >=16.0.0}
+ hasBin: true
+ peerDependencies:
+ less: '*'
+ sass: '*'
+ stylus: '*'
+ terser: ^5.4.0
+ peerDependenciesMeta:
+ less:
+ optional: true
+ sass:
+ optional: true
+ stylus:
+ optional: true
+ terser:
+ optional: true
+ dependencies:
+ esbuild: 0.15.7
+ postcss: 8.4.16
+ resolve: 1.22.1
+ rollup: 2.78.1
+ sass: 1.54.9
+ optionalDependencies:
+ fsevents: 2.3.2
+ dev: false
+
/vitest/0.20.3:
resolution: {integrity: sha512-cXMjTbZxBBUUuIF3PUzEGPLJWtIMeURBDXVxckSHpk7xss4JxkiiWh5cnIlfGyfJne2Ii3QpbiRuFL5dMJtljw==}
engines: {node: '>=v14.16.0'}