Update tests for legacy build (#2746)

* move fast-build example into a test fixture for legacy build * update tests for legacy build
withastro · Mar 9, 2022 · 2906110 · 2906110
1 parent c9d84af
commit 2906110
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 79 deletions.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -9,7 +9,6 @@
  "@example/my-component": "0.0.1",
  "@example/docs": "0.0.1",
  "@example/env-vars": "0.0.1",
- "@example/fast-build": "0.0.1",
  "@example/framework-alpine": "0.0.1",
  "@example/framework-lit": "0.0.1",
  "@example/framework-multiple": "0.0.1",

diff --git a/examples/fast-build/.npmrc b/examples/fast-build/.npmrc
diff --git a/examples/fast-build/package.json b/examples/fast-build/package.json
diff --git a/examples/fast-build/src/components/ExternalHoisted.astro b/examples/fast-build/src/components/ExternalHoisted.astro
diff --git a/examples/fast-build/src/images/penguin.jpg b/examples/fast-build/src/images/penguin.jpg
diff --git a/examples/fast-build/src/images/random.jpg b/examples/fast-build/src/images/random.jpg
diff --git a/packages/astro/src/core/config.ts b/packages/astro/src/core/config.ts
@@ -117,7 +117,6 @@ function resolveFlags(flags: Partial<Flags>): CLIFlags {
  // eslint-disable-next-line no-console
  console.warn(`Passing --experimental-static-build is no longer necessary and is now the default. The flag will be removed in a future version of Astro.`);
  }
-
  return {
  projectRoot: typeof flags.projectRoot === 'string' ? flags.projectRoot : undefined,
  site: typeof flags.site === 'string' ? flags.site : undefined,
@@ -126,7 +125,6 @@ function resolveFlags(flags: Partial<Flags>): CLIFlags {
  config: typeof flags.config === 'string' ? flags.config : undefined,
  hostname: typeof flags.hostname === 'string' ? flags.hostname : undefined,
  legacyBuild: typeof flags.legacyBuild === 'boolean' ? flags.legacyBuild : false,
- experimentalStaticBuild: typeof flags.experimentalStaticBuild === 'boolean' ? flags.experimentalStaticBuild : true,
  experimentalSsr: typeof flags.experimentalSsr === 'boolean' ? flags.experimentalSsr : false,
  drafts: typeof flags.drafts === 'boolean' ? flags.drafts : false,
  };
@@ -140,11 +138,10 @@ function mergeCLIFlags(astroConfig: AstroUserConfig, flags: CLIFlags) {
  if (typeof flags.site === 'string') astroConfig.buildOptions.site = flags.site;
  if (typeof flags.port === 'number') astroConfig.devOptions.port = flags.port;
  if (typeof flags.hostname === 'string') astroConfig.devOptions.hostname = flags.hostname;
- if (typeof flags.experimentalStaticBuild === 'boolean') astroConfig.buildOptions.experimentalStaticBuild = flags.experimentalStaticBuild;
+ if (typeof flags.legacyBuild === 'boolean') astroConfig.buildOptions.legacyBuild = flags.legacyBuild;
  if (typeof flags.experimentalSsr === 'boolean') {
  astroConfig.buildOptions.experimentalSsr = flags.experimentalSsr;
  if (flags.experimentalSsr) {
- astroConfig.buildOptions.experimentalStaticBuild = true;
  astroConfig.buildOptions.legacyBuild = false;
  }
  }

diff --git a/examples/fast-build/astro.config.mjs → ...st/fixtures/legacy-build/astro.config.mjs b/examples/fast-build/astro.config.mjs → ...st/fixtures/legacy-build/astro.config.mjs
@@ -1,9 +1,4 @@
-import { imagetools } from 'vite-imagetools';
-
 // @ts-check
 export default /** @type {import('astro').AstroUserConfig} */ ({
  renderers: ['@astrojs/renderer-vue'],
- vite: {
- plugins: [imagetools()],
- },
 });
diff --git a/packages/astro/test/fixtures/legacy-build/package.json b/packages/astro/test/fixtures/legacy-build/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "@astrojs/legacy-build",
+ "version": "0.0.0",
+ "private": true,
+ "dependencies": {
+ "@astrojs/renderer-vue": "^0.4.0",
+ "astro": "workspace:*",
+ "preact": "~10.6.5"
+ }
+}
diff --git a/...les/fast-build/src/components/Counter.vue → ...s/legacy-build/src/components/Counter.vue b/...les/fast-build/src/components/Counter.vue → ...s/legacy-build/src/components/Counter.vue
diff --git a/...es/fast-build/src/components/Greeting.vue → .../legacy-build/src/components/Greeting.vue b/...es/fast-build/src/components/Greeting.vue → .../legacy-build/src/components/Greeting.vue
diff --git a/...-build/src/components/InlineHoisted.astro → ...-build/src/components/InlineHoisted.astro b/...-build/src/components/InlineHoisted.astro → ...-build/src/components/InlineHoisted.astro
diff --git a/...ples/fast-build/src/pages/[pokemon].astro → ...es/legacy-build/src/pages/[pokemon].astro b/...ples/fast-build/src/pages/[pokemon].astro → ...es/legacy-build/src/pages/[pokemon].astro
@@ -2,9 +2,7 @@
 import Greeting from '../components/Greeting.vue';
 
 export async function getStaticPaths() {
- const response = await fetch(`https://pokeapi.co/api/v2/pokemon?limit=2000`);
- const result = await response.json();
- const allPokemon = result.results;
+ const allPokemon = [{name: 'Charmander'}, {name: 'Charmander'}, {name: 'Charizard'}];
  return allPokemon.map(pokemon => ({params: {pokemon: pokemon.name}, props: {pokemon}}));
 }
 ---

diff --git a/examples/fast-build/src/pages/index.astro → ...xtures/legacy-build/src/pages/index.astro b/examples/fast-build/src/pages/index.astro → ...xtures/legacy-build/src/pages/index.astro
@@ -1,11 +1,7 @@
 ---
-import imgUrl from '../images/penguin.jpg';
-import grayscaleUrl from '../images/random.jpg?grayscale=true';
 import Greeting from '../components/Greeting.vue';
 import Counter from '../components/Counter.vue';
-// import { Code } from 'astro/components';
 import InlineHoisted from '../components/InlineHoisted.astro';
-import ExternalHoisted from '../components/ExternalHoisted.astro';
 ---
 
 <html>
@@ -29,12 +25,6 @@ import ExternalHoisted from '../components/ExternalHoisted.astro';
  </style>
  </head>
  <body>
- <section>
- <h1>Images</h1>
-
- <h2>Imported in JS</h2>
- <img src={imgUrl} />
- </section>
 
  <section>
  <h1>Component CSS</h1>
@@ -43,14 +33,10 @@ import ExternalHoisted from '../components/ExternalHoisted.astro';
 
  <section>
  <h1>ImageTools</h1>
- <img src={grayscaleUrl} />
  </section>
 
  <section>
  <h1>Astro components</h1>
- <!-- <Code lang="css" code={`body {
- color: salmon;
-}`} /> -->
  </section>
 
  <section>
@@ -61,7 +47,6 @@ import ExternalHoisted from '../components/ExternalHoisted.astro';
  <section>
  <h1>Hoisted scripts</h1>
  <InlineHoisted />
- <ExternalHoisted />
  </section>
 
  <section class="define-vars">

diff --git a/.../fast-build/src/scripts/external-hoist.ts → ...egacy-build/src/scripts/external-hoist.ts b/.../fast-build/src/scripts/external-hoist.ts → ...egacy-build/src/scripts/external-hoist.ts
diff --git a/examples/fast-build/src/styles/_global.scss → ...ures/legacy-build/src/styles/_global.scss b/examples/fast-build/src/styles/_global.scss → ...ures/legacy-build/src/styles/_global.scss
diff --git a/examples/fast-build/src/styles/global.css → ...xtures/legacy-build/src/styles/global.css b/examples/fast-build/src/styles/global.css → ...xtures/legacy-build/src/styles/global.css
diff --git a/packages/astro/test/legacy-build.test.js b/packages/astro/test/legacy-build.test.js
@@ -0,0 +1,23 @@
+import { expect } from 'chai';
+import cheerio from 'cheerio';
+import { loadFixture } from './test-utils.js';
+
+describe('Legacy Build', () => {
+ let fixture;
+
+ before(async () => {
+ fixture = await loadFixture({
+ projectRoot: './fixtures/legacy-build/',
+ });
+ await fixture.build({buildOptions: {legacyBuild: true}});
+ });
+
+ describe('build', () => {
+ it('is successful', async () => {
+ const html = await fixture.readFile(`/index.html`);
+ const $ = cheerio.load(html);
+ expect($('title').text()).to.equal('Demo app');
+ });
+
+ });
+});
diff --git a/packages/astro/test/static-build-code-component.test.js b/packages/astro/test/static-build-code-component.test.js
@@ -9,9 +9,7 @@ describe('Code component inside static build', () => {
  fixture = await loadFixture({
  projectRoot: './fixtures/static-build-code-component/',
  renderers: [],
- buildOptions: {
- experimentalStaticBuild: true,
- },
+ buildOptions: {},
  });
  await fixture.build();
  });

diff --git a/packages/astro/test/static-build-frameworks.test.js b/packages/astro/test/static-build-frameworks.test.js
@@ -13,9 +13,7 @@ describe('Static build - frameworks', () => {
  fixture = await loadFixture({
  projectRoot: './fixtures/static-build-frameworks/',
  renderers: ['@astrojs/renderer-preact', '@astrojs/renderer-react'],
- buildOptions: {
- experimentalStaticBuild: true,
- },
+ buildOptions: {},
  });
  await fixture.build();
  });

diff --git a/packages/astro/test/static-build-page-url-format.test.js b/packages/astro/test/static-build-page-url-format.test.js
@@ -14,7 +14,6 @@ describe("Static build - pageUrlFormat: 'file'", () => {
  projectRoot: './fixtures/static-build-page-url-format/',
  renderers: [],
  buildOptions: {
- experimentalStaticBuild: true,
  site: 'http:https://example.com/subpath/',
  pageUrlFormat: 'file',
  },

diff --git a/packages/astro/test/static-build.test.js b/packages/astro/test/static-build.test.js
@@ -14,7 +14,6 @@ describe('Static build', () => {
  projectRoot: './fixtures/static build/',
  renderers: ['@astrojs/renderer-preact'],
  buildOptions: {
- experimentalStaticBuild: true,
  site: 'http:https://example.com/subpath/',
  },
  ssr: {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml