michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Run all smoke tests with the static build (#2609)

Browse source 
* Run all smoke tests with the static build

* Use a direct relative path

* Always use the static build

* Use a path that works in both static and regualr build

* Always download the zip

* astro.build only needs to run once
This commit is contained in:
Matthew Phillips 2022-02-23 08:41:10 -05:00 committed by GitHub
parent a81660e39a
commit 2ad88a9235
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/with-vite-plugin-pwa/src/pages/index.astro
View file

@ -11,6 +11,6 @@
<body> <body>
<h1>Welcome to <a href="https://astro.build/">Astro</a></h1> <h1>Welcome to <a href="https://astro.build/">Astro</a></h1>
<script src={Astro.resolve('../index.ts')} type="module" hoist></script> <script src="/src/index.ts" type="module" hoist></script>
</body> </body>
</html> </html>

60
scripts/smoke/index.js
View file

@ -58,6 +58,20 @@ async function run() {
process.exit(1); process.exit(1);
} }
// Run with the static build too
if(directory.pathname.includes('astro.build')) {
// astro.build uses the static build, so rerunning with the flag actually negates it.
continue;
}
try {
await execa('yarn', ['build', '--', '--experimental-static-build'], { cwd: fileURLToPath(directory), stdout: 'inherit', stderr: 'inherit' });
} catch (err) {
console.log(err);
process.exit(1);
}
console.log(); console.log();
} }
} }
@ -79,42 +93,34 @@ const downloadGithubZip = async (/** @type {GithubOpts} */ opts) => {
/** Expected directory when the zip is downloaded. */ /** Expected directory when the zip is downloaded. */
const githubDir = new URL(`${opts.name}-${opts.branch}`, scriptDir); const githubDir = new URL(`${opts.name}-${opts.branch}`, scriptDir);
/** Whether the expected directory is already available */ console.log('🤖', 'Downloading', `${opts.org}/${opts.name}#${opts.branch}`);
const hasGithubDir = await fs.stat(githubDir).then(
(stats) => stats.isDirectory(),
() => false
);
if (!hasGithubDir) { const buffer = await fetchGithubZip(opts);
console.log('🤖', 'Downloading', `${opts.org}/${opts.name}#${opts.branch}`);
const buffer = await fetchGithubZip(opts); console.log('🤖', 'Extracting', `${opts.org}/${opts.name}#${opts.branch}`);
console.log('🤖', 'Extracting', `${opts.org}/${opts.name}#${opts.branch}`); new Zip(buffer).extractAllTo(fileURLToPath(scriptDir), true);
new Zip(buffer).extractAllTo(fileURLToPath(scriptDir), true); console.log('🤖', 'Preparing', `${opts.org}/${opts.name}#${opts.branch}`);
console.log('🤖', 'Preparing', `${opts.org}/${opts.name}#${opts.branch}`); const astroPackage = await readDirectoryPackage(astroDir);
const astroPackage = await readDirectoryPackage(astroDir); const githubPackage = await readDirectoryPackage(githubDir);
const githubPackage = await readDirectoryPackage(githubDir); if ('astro' in Object(githubPackage.dependencies)) {
githubPackage.dependencies['astro'] = astroPackage.version;
if ('astro' in Object(githubPackage.dependencies)) {
githubPackage.dependencies['astro'] = astroPackage.version;
}
if ('astro' in Object(githubPackage.devDependencies)) {
githubPackage.devDependencies['astro'] = astroPackage.version;
}
if ('astro' in Object(githubPackage.peerDependencies)) {
githubPackage.peerDependencies['astro'] = astroPackage.version;
}
await writeDirectoryPackage(githubDir, githubPackage);
} }
if ('astro' in Object(githubPackage.devDependencies)) {
githubPackage.devDependencies['astro'] = astroPackage.version;
}
if ('astro' in Object(githubPackage.peerDependencies)) {
githubPackage.peerDependencies['astro'] = astroPackage.version;
}
await writeDirectoryPackage(githubDir, githubPackage);
return githubDir; return githubDir;
}; };