From 37ec099886be4640f2a4aa9577f5a0713c1d9747 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Fri, 19 May 2023 20:45:31 -0700 Subject: [PATCH 1/4] chore: remove prepare script --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 837918e8a4cd..8f8d50c01d58 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,6 @@ "format:check": "prettier . --cache --plugin-search-dir=. --check", "test": "vitest run && echo \"manually check that there are no type errors in test/types by opening the files in there\"", "build": "rollup -c && npm run tsd", - "prepare": "npm run build", "dev": "rollup -cw", "posttest": "agadoo internal/index.mjs", "prepublishOnly": "node check_publish_env.js && npm run lint && npm run build && npm test", From 21f86495ef6d2c494e7a06d614b1f030492bd42c Mon Sep 17 00:00:00 2001 From: gtmnayan Date: Sat, 20 May 2023 09:34:45 +0545 Subject: [PATCH 2/4] add build step --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95a481ede741..5a3b34182fc1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,7 @@ jobs: node-version: ${{ matrix.node-version }} cache: pnpm - run: pnpm install --frozen-lockfile + - run: pnpm build - run: pnpm playwright install chromium - run: pnpm test env: From 54e6ec204773b873d2c4ef672365ea16c0b18da8 Mon Sep 17 00:00:00 2001 From: gtmnayan Date: Sat, 20 May 2023 09:38:11 +0545 Subject: [PATCH 3/4] do it the right way --- .github/workflows/ci.yml | 1 - test/helpers.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a3b34182fc1..95a481ede741 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,6 @@ jobs: node-version: ${{ matrix.node-version }} cache: pnpm - run: pnpm install --frozen-lockfile - - run: pnpm build - run: pnpm playwright install chromium - run: pnpm test env: diff --git a/test/helpers.js b/test/helpers.js index 33cf1ac1989e..112c5c28bd82 100644 --- a/test/helpers.js +++ b/test/helpers.js @@ -3,7 +3,7 @@ import * as path from 'node:path'; import glob from 'tiny-glob/sync'; import colors from 'kleur'; import { assert } from 'vitest'; -import { compile } from '../compiler.js'; +import { compile } from '../src/compiler/index.js'; import { fileURLToPath } from 'node:url'; export function try_load_json(file) { From f9271f9be048892a89710d363ff080442ee9631c Mon Sep 17 00:00:00 2001 From: gtmnayan Date: Sat, 20 May 2023 09:39:23 +0545 Subject: [PATCH 4/4] and another --- test/server-side-rendering/ssr-2.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/server-side-rendering/ssr-2.test.js b/test/server-side-rendering/ssr-2.test.js index 9a55cee639cf..a0780f04f6ec 100644 --- a/test/server-side-rendering/ssr-2.test.js +++ b/test/server-side-rendering/ssr-2.test.js @@ -5,7 +5,7 @@ import * as path from 'node:path'; import { setTimeout } from 'node:timers/promises'; import glob from 'tiny-glob/sync'; import { assert, describe, it } from 'vitest'; -import { compile } from '../../compiler.mjs'; +import { compile } from '../../src/compiler/index.js'; import { create_loader, mkdirp, try_load_config } from '../helpers.js'; import { assert_html_equal, assert_html_equal_with_options } from '../html_equal.js';