From 791a17fcff69795ef278e422e6c6f7995de60726 Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Tue, 21 Jun 2022 17:44:55 -0500 Subject: [PATCH 01/20] chore: update smoke tests --- .github/workflows/ci.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3725184351d..16ba5dc21d68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -185,11 +185,18 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + + - name: Checkout docs + uses: actions/checkout@v3 with: - submodules: 'recursive' + repository: withastro/docs + path: smoke/docs - - name: Update submodules - run: git submodule update --remote + - name: Checkout astro.build + uses: actions/checkout@v3 + with: + repository: withastro/astro.build + path: smoke/astro.build - name: Setup PNPM uses: pnpm/action-setup@v2.2.1 From b3e67788ea81d2340fd187c0bcb1cc1e00f666f9 Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Tue, 21 Jun 2022 17:53:39 -0500 Subject: [PATCH 02/20] chore: bump smoke tests to node@16 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16ba5dc21d68..9999d5f98d08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -181,7 +181,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - node_version: [14] + node_version: [16] steps: - name: Checkout uses: actions/checkout@v3 From 758365ca1371d0c8c6bd17b8eda52df1a7ccbab8 Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Wed, 22 Jun 2022 10:31:14 -0500 Subject: [PATCH 03/20] chore: remove gitmodules --- .gitmodules | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 28a12af2dd2f..000000000000 --- a/.gitmodules +++ /dev/null @@ -1,8 +0,0 @@ -[submodule "smoke/docs"] - path = smoke/docs - url = git@github.com:withastro/docs.git - branch = main -[submodule "smoke/astro.build"] - path = smoke/astro.build - url = git@github.com:withastro/astro.build.git - branch = main From fd2d14fe5999d3eddbbcc6406193c54df30863ce Mon Sep 17 00:00:00 2001 From: Nate Moore Date: Thu, 30 Jun 2022 17:28:54 -0400 Subject: [PATCH 04/20] chore(ci): prefer node@14 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9999d5f98d08..16ba5dc21d68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -181,7 +181,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - node_version: [16] + node_version: [14] steps: - name: Checkout uses: actions/checkout@v3 From 9de2dd9bceb877dd11bb9f99bb43de45aa77f863 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 17:11:42 -0400 Subject: [PATCH 05/20] wip: remove path from smoke clone step --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16ba5dc21d68..b990bd471d22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -190,13 +190,11 @@ jobs: uses: actions/checkout@v3 with: repository: withastro/docs - path: smoke/docs - name: Checkout astro.build uses: actions/checkout@v3 with: repository: withastro/astro.build - path: smoke/astro.build - name: Setup PNPM uses: pnpm/action-setup@v2.2.1 From 44eb5c115f0a1fd45ec3cca0bb5cda81d466db07 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 17:13:08 -0400 Subject: [PATCH 06/20] feat: run build:examples from test:smoke --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71e246956474..3dd25da0bc5f 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "test": "turbo run test --output-logs=new-only --concurrency=1", "test:match": "cd packages/astro && pnpm run test:match", "test:templates": "turbo run test --filter=create-astro --concurrency=1", - "test:smoke": "node scripts/smoke/index.js", + "test:smoke": "pnpm run build:examples", "test:vite-ci": "turbo run test --output-logs=new-only --no-deps --scope=astro --concurrency=1", "test:e2e": "cd packages/astro && pnpm playwright install && pnpm run test:e2e", "test:e2e:match": "cd packages/astro && pnpm playwright install && pnpm run test:e2e:match", From e772a3916bbc207daf58e52298c7d988500fffc8 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 17:27:32 -0400 Subject: [PATCH 07/20] fix: remove no-frozen-lockfile --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b990bd471d22..afa0ae0adbea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -206,7 +206,7 @@ jobs: cache: 'pnpm' - name: Install dependencies - run: pnpm install --no-frozen-lockfile + run: pnpm install - name: Build Packages run: pnpm run build From 2d537515025729e64b8423952f0a9447df5cd499 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 17:33:30 -0400 Subject: [PATCH 08/20] fix: checkout monorepo last for pnpm setup --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afa0ae0adbea..3ad88a4e2352 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -183,9 +183,6 @@ jobs: os: [ubuntu-latest, windows-latest] node_version: [14] steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Checkout docs uses: actions/checkout@v3 with: @@ -196,6 +193,9 @@ jobs: with: repository: withastro/astro.build + - name: Checkout + uses: actions/checkout@v3 + - name: Setup PNPM uses: pnpm/action-setup@v2.2.1 From 1aa90411c055ff87d81da83eb4aa706a6bd5f151 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 17:37:18 -0400 Subject: [PATCH 09/20] wip: replace @astrojs/markdown/remark import from md --- packages/astro/package.json | 1 + packages/astro/src/vite-plugin-markdown/index.ts | 5 ++++- pnpm-lock.yaml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/astro/package.json b/packages/astro/package.json index 4d8fc426fc22..a19f5009265d 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -108,6 +108,7 @@ "estree-walker": "^3.0.1", "execa": "^6.1.0", "fast-glob": "^3.2.11", + "github-slugger": "^1.4.0", "gray-matter": "^4.0.3", "html-entities": "^2.3.3", "html-escaper": "^3.0.3", diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts index c2078d937e1e..9f95a75bf4f5 100644 --- a/packages/astro/src/vite-plugin-markdown/index.ts +++ b/packages/astro/src/vite-plugin-markdown/index.ts @@ -161,7 +161,10 @@ export default function markdown({ config }: AstroPluginOptions): Plugin { const { layout = '', components = '', setup = '', ...content } = frontmatter; content.astro = metadata; const prelude = `--- -import { slug as $$slug } from '@astrojs/markdown-remark/ssr-utils'; +import Slugger from 'github-slugger'; +function $$slug(value: string): string { + return slugger.slug(value); +} ${layout ? `import Layout from '${layout}';` : ''} ${components ? `import * from '${components}';` : ''} ${hasInjectedScript ? `import '${PAGE_SSR_SCRIPT_ID}';` : ''} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a61a77b80d0..8645f31bc38a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -515,6 +515,7 @@ importers: estree-walker: ^3.0.1 execa: ^6.1.0 fast-glob: ^3.2.11 + github-slugger: ^1.4.0 gray-matter: ^4.0.3 html-entities: ^2.3.3 html-escaper: ^3.0.3 @@ -575,6 +576,7 @@ importers: estree-walker: 3.0.1 execa: 6.1.0 fast-glob: 3.2.11 + github-slugger: 1.4.0 gray-matter: 4.0.3 html-entities: 2.3.3 html-escaper: 3.0.3 From c576afcfe82ecba0636edc5d7a1d0f5774af7882 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 17:38:39 -0400 Subject: [PATCH 10/20] fix: remove type defs from generated file --- packages/astro/src/vite-plugin-markdown/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts index 9f95a75bf4f5..954a937a6d13 100644 --- a/packages/astro/src/vite-plugin-markdown/index.ts +++ b/packages/astro/src/vite-plugin-markdown/index.ts @@ -162,7 +162,7 @@ export default function markdown({ config }: AstroPluginOptions): Plugin { content.astro = metadata; const prelude = `--- import Slugger from 'github-slugger'; -function $$slug(value: string): string { +function $$slug(value) { return slugger.slug(value); } ${layout ? `import Layout from '${layout}';` : ''} From 7d466d71d641860d3a88f13e182331974cd09d5e Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 17:40:57 -0400 Subject: [PATCH 11/20] fix: function order --- packages/astro/src/vite-plugin-markdown/index.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts index 954a937a6d13..ab0547bb2350 100644 --- a/packages/astro/src/vite-plugin-markdown/index.ts +++ b/packages/astro/src/vite-plugin-markdown/index.ts @@ -162,14 +162,15 @@ export default function markdown({ config }: AstroPluginOptions): Plugin { content.astro = metadata; const prelude = `--- import Slugger from 'github-slugger'; -function $$slug(value) { - return slugger.slug(value); -} ${layout ? `import Layout from '${layout}';` : ''} ${components ? `import * from '${components}';` : ''} ${hasInjectedScript ? `import '${PAGE_SSR_SCRIPT_ID}';` : ''} ${setup} +function $$slug(value) { + return slugger.slug(value); +} + const $$content = ${JSON.stringify(content)} ---`; const imports = `${layout ? `import Layout from '${layout}';` : ''} From 8b9602383e7cfef9fdc4220bafc0a7a52793af13 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 17:41:57 -0400 Subject: [PATCH 12/20] chore: remove ssr-utils export --- packages/markdown/remark/package.json | 3 +-- packages/markdown/remark/src/ssr-utils.ts | 8 -------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 packages/markdown/remark/src/ssr-utils.ts diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json index 2ba4f64adf3b..1c943c9b76a6 100644 --- a/packages/markdown/remark/package.json +++ b/packages/markdown/remark/package.json @@ -13,8 +13,7 @@ "homepage": "https://astro.build", "main": "./dist/index.js", "exports": { - ".": "./dist/index.js", - "./ssr-utils": "./dist/ssr-utils.js" + ".": "./dist/index.js" }, "scripts": { "prepublish": "pnpm build", diff --git a/packages/markdown/remark/src/ssr-utils.ts b/packages/markdown/remark/src/ssr-utils.ts deleted file mode 100644 index 1491e24a5117..000000000000 --- a/packages/markdown/remark/src/ssr-utils.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** Utilities used in deployment-ready SSR bundles */ -import Slugger from 'github-slugger'; - -const slugger = new Slugger(); -/** @see {@link "/packages/astro/vite-plugin-markdown"} */ -export function slug(value: string): string { - return slugger.slug(value); -} From 4cf383f25b4a717552024b0ef1207d0a6a0ae56a Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 18:10:10 -0400 Subject: [PATCH 13/20] wip: remove windows from smoke test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ad88a4e2352..e6d59eb0f72d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,7 +180,7 @@ jobs: needs: build strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest] node_version: [14] steps: - name: Checkout docs From 35f127158f6dba97930217e83d261e62e3972e1c Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 18:10:19 -0400 Subject: [PATCH 14/20] fix: instantiate slugger in snippet --- packages/astro/src/vite-plugin-markdown/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts index ab0547bb2350..ffaa8afc7acd 100644 --- a/packages/astro/src/vite-plugin-markdown/index.ts +++ b/packages/astro/src/vite-plugin-markdown/index.ts @@ -167,6 +167,7 @@ ${components ? `import * from '${components}';` : ''} ${hasInjectedScript ? `import '${PAGE_SSR_SCRIPT_ID}';` : ''} ${setup} +const slugger = new Slugger(); function $$slug(value) { return slugger.slug(value); } From e8f630a449c4e998f74c4c6ff0587f7f89b935f2 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 18:57:55 -0400 Subject: [PATCH 15/20] fix: exclude with-mdx from smoke (for now) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3dd25da0bc5f..f7c60edd394c 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "test": "turbo run test --output-logs=new-only --concurrency=1", "test:match": "cd packages/astro && pnpm run test:match", "test:templates": "turbo run test --filter=create-astro --concurrency=1", - "test:smoke": "pnpm run build:examples", + "test:smoke": "turbo run build --filter=@example/* --filter=!@example/with-mdx --output-logs=new-only", "test:vite-ci": "turbo run test --output-logs=new-only --no-deps --scope=astro --concurrency=1", "test:e2e": "cd packages/astro && pnpm playwright install && pnpm run test:e2e", "test:e2e:match": "cd packages/astro && pnpm playwright install && pnpm run test:e2e:match", From 02e0e1d748e1ed64537d9f55af678df3baf5d034 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 19:00:30 -0400 Subject: [PATCH 16/20] fix: add quotes on filter flag for safety --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7c60edd394c..c75678e9794b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "test": "turbo run test --output-logs=new-only --concurrency=1", "test:match": "cd packages/astro && pnpm run test:match", "test:templates": "turbo run test --filter=create-astro --concurrency=1", - "test:smoke": "turbo run build --filter=@example/* --filter=!@example/with-mdx --output-logs=new-only", + "test:smoke": "turbo run build --filter=\"@example/*\" --filter=\"!@example/with-mdx\" --output-logs=new-only", "test:vite-ci": "turbo run test --output-logs=new-only --no-deps --scope=astro --concurrency=1", "test:e2e": "cd packages/astro && pnpm playwright install && pnpm run test:e2e", "test:e2e:match": "cd packages/astro && pnpm playwright install && pnpm run test:e2e:match", From ee6671eb6f970e720d3be8ec4fe0159200f6140d Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 19:11:16 -0400 Subject: [PATCH 17/20] chore: changeset --- .changeset/famous-moons-kick.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/famous-moons-kick.md diff --git a/.changeset/famous-moons-kick.md b/.changeset/famous-moons-kick.md new file mode 100644 index 000000000000..410d1f83e9a3 --- /dev/null +++ b/.changeset/famous-moons-kick.md @@ -0,0 +1,6 @@ +--- +'astro': patch +'@astrojs/markdown-remark': patch +--- + +Tooling: reintroduce smoke test across example projects From 9529b1a45c007286c22861e106b82200545e4198 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 19:12:31 -0400 Subject: [PATCH 18/20] wip: try reintroducing windows smoke --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6d59eb0f72d..3ad88a4e2352 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,7 +180,7 @@ jobs: needs: build strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-latest, windows-latest] node_version: [14] steps: - name: Checkout docs From a7d035b7ca3678ab1108cd565712c8e7c520ceed Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 19:22:51 -0400 Subject: [PATCH 19/20] sad chore: remove client: directive from with-mdx --- examples/with-mdx/src/pages/index.mdx | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/with-mdx/src/pages/index.mdx b/examples/with-mdx/src/pages/index.mdx index 36cde1e95f61..b82572b48f25 100644 --- a/examples/with-mdx/src/pages/index.mdx +++ b/examples/with-mdx/src/pages/index.mdx @@ -14,4 +14,4 @@ Written by: {new Intl.ListFormat('en').format(authors.map(d => d.name))}. Published on: {new Intl.DateTimeFormat('en', {dateStyle: 'long'}).format(published)}. -## This is a counter! +## This is a counter! diff --git a/package.json b/package.json index c75678e9794b..e55c59a1c98e 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "test": "turbo run test --output-logs=new-only --concurrency=1", "test:match": "cd packages/astro && pnpm run test:match", "test:templates": "turbo run test --filter=create-astro --concurrency=1", - "test:smoke": "turbo run build --filter=\"@example/*\" --filter=\"!@example/with-mdx\" --output-logs=new-only", + "test:smoke": "turbo run build --filter=\"@example/*\" --output-logs=new-only", "test:vite-ci": "turbo run test --output-logs=new-only --no-deps --scope=astro --concurrency=1", "test:e2e": "cd packages/astro && pnpm playwright install && pnpm run test:e2e", "test:e2e:match": "cd packages/astro && pnpm playwright install && pnpm run test:e2e:match", From 568aa723cda861f425a137984a5810c8a6561956 Mon Sep 17 00:00:00 2001 From: bholmesdev Date: Mon, 11 Jul 2022 19:23:36 -0400 Subject: [PATCH 20/20] Revert "wip: try reintroducing windows smoke" This reverts commit 9529b1a45c007286c22861e106b82200545e4198. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ad88a4e2352..e6d59eb0f72d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,7 +180,7 @@ jobs: needs: build strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest] node_version: [14] steps: - name: Checkout docs