diff --git a/.gitignore b/.gitignore index e51401f..1171c82 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ # testing artifacts **/tests/playground/*.mjs +**/*-test-artifact.* # moon .moon/cache diff --git a/@kindspells/astro-shield/package.json b/@kindspells/astro-shield/package.json index 696cb6e..1b4e528 100644 --- a/@kindspells/astro-shield/package.json +++ b/@kindspells/astro-shield/package.json @@ -22,7 +22,10 @@ } }, "imports": { - "#as/*": "./src/*" + "#as/*": { + "types": "./src/*.mts", + "import": "./dist/*.mjs" + } }, "files": ["dist/*"], "scripts": { diff --git a/@kindspells/astro-shield/rollup.config.mjs b/@kindspells/astro-shield/rollup.config.mjs index d057923..7a155bf 100644 --- a/@kindspells/astro-shield/rollup.config.mjs +++ b/@kindspells/astro-shield/rollup.config.mjs @@ -23,13 +23,14 @@ const outputBaseConfig = { export default defineConfig([ { - input: 'src/main.mts', - output: [{ format: 'esm', file: 'dist/main.mjs', sourcemap: true }], + input: 'src/core.mts', + output: [{ format: 'esm', file: 'dist/core.mjs', sourcemap: true }], ...outputBaseConfig, }, { - input: 'src/core.mts', - output: [{ format: 'esm', file: 'dist/core.mjs', sourcemap: true }], + input: 'src/main.mts', + output: [{ format: 'esm', file: 'dist/main.mjs', sourcemap: true }], + external: ['#as/core'], ...outputBaseConfig, }, { @@ -40,6 +41,7 @@ export default defineConfig([ { input: 'src/main.mts', output: [{ format: 'esm', file: 'dist/main.d.mts' }], + external: ['#as/core'], plugins: [dts()], }, ]) diff --git a/@kindspells/astro-shield/src/core.mts b/@kindspells/astro-shield/src/core.mts index fcbd53f..5da7c58 100644 --- a/@kindspells/astro-shield/src/core.mts +++ b/@kindspells/astro-shield/src/core.mts @@ -15,34 +15,15 @@ import type { Plugin } from 'vite' import { doesFileExist, scanDirectory } from './fs.mts' import { patchHeaders } from './headers.mts' import type { + HashesCollection, + Logger, + MiddlewareHashes, + PerPageHashes, SecurityHeadersOptions, SRIOptions, StrictShieldOptions, } from './types.mts' -export type MiddlewareHashes = { - scripts: Map - styles: Map -} - -export type PerPageHashes = { scripts: Set; styles: Set } -export type PerPageHashesCollection = Map - -export type HashesCollection = { - inlineScriptHashes: Set - inlineStyleHashes: Set - extScriptHashes: Set - extStyleHashes: Set - perPageSriHashes: PerPageHashesCollection - perResourceSriHashes: MiddlewareHashes -} - -export type Logger = { - info(msg: string): void - warn(msg: string): void - error(msg: string): void -} - export type HashesModule = { [k in keyof HashesCollection]: HashesCollection[k] extends Set ? string[] | undefined diff --git a/@kindspells/astro-shield/e2e/e2e.test.mts b/@kindspells/astro-shield/src/e2e/e2e.test.mts similarity index 99% rename from @kindspells/astro-shield/e2e/e2e.test.mts rename to @kindspells/astro-shield/src/e2e/e2e.test.mts index 0536650..f135e33 100644 --- a/@kindspells/astro-shield/e2e/e2e.test.mts +++ b/@kindspells/astro-shield/src/e2e/e2e.test.mts @@ -23,9 +23,9 @@ import { it, } from 'vitest' -import type { HashesModule } from '#as/core.mjs' -import { generateSRIHash } from '#as/core.mjs' -import { doesFileExist } from '#as/fs.mjs' +import type { HashesModule } from '../core.mts' +import { generateSRIHash } from '../core.mts' +import { doesFileExist } from '../fs.mts' const execFile = promisify(_execFile) diff --git a/@kindspells/astro-shield/e2e/fixtures/dynamic/astro.config.mjs b/@kindspells/astro-shield/src/e2e/fixtures/dynamic/astro.config.mjs similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/dynamic/astro.config.mjs rename to @kindspells/astro-shield/src/e2e/fixtures/dynamic/astro.config.mjs diff --git a/@kindspells/astro-shield/e2e/fixtures/dynamic/package.json b/@kindspells/astro-shield/src/e2e/fixtures/dynamic/package.json similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/dynamic/package.json rename to @kindspells/astro-shield/src/e2e/fixtures/dynamic/package.json diff --git a/@kindspells/astro-shield/e2e/fixtures/dynamic/src/env.d.ts b/@kindspells/astro-shield/src/e2e/fixtures/dynamic/src/env.d.ts similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/dynamic/src/env.d.ts rename to @kindspells/astro-shield/src/e2e/fixtures/dynamic/src/env.d.ts diff --git a/@kindspells/astro-shield/e2e/fixtures/dynamic/src/pages/index.astro b/@kindspells/astro-shield/src/e2e/fixtures/dynamic/src/pages/index.astro similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/dynamic/src/pages/index.astro rename to @kindspells/astro-shield/src/e2e/fixtures/dynamic/src/pages/index.astro diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid/astro.config.mjs b/@kindspells/astro-shield/src/e2e/fixtures/hybrid/astro.config.mjs similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid/astro.config.mjs rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid/astro.config.mjs diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid/package.json b/@kindspells/astro-shield/src/e2e/fixtures/hybrid/package.json similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid/package.json rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid/package.json diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid/public/code.js b/@kindspells/astro-shield/src/e2e/fixtures/hybrid/public/code.js similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid/public/code.js rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid/public/code.js diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid/src/env.d.ts b/@kindspells/astro-shield/src/e2e/fixtures/hybrid/src/env.d.ts similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid/src/env.d.ts rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid/src/env.d.ts diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid/src/pages/index.astro b/@kindspells/astro-shield/src/e2e/fixtures/hybrid/src/pages/index.astro similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid/src/pages/index.astro rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid/src/pages/index.astro diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid/src/pages/static.astro b/@kindspells/astro-shield/src/e2e/fixtures/hybrid/src/pages/static.astro similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid/src/pages/static.astro rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid/src/pages/static.astro diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid2/astro.config.mjs b/@kindspells/astro-shield/src/e2e/fixtures/hybrid2/astro.config.mjs similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid2/astro.config.mjs rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid2/astro.config.mjs diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid2/package.json b/@kindspells/astro-shield/src/e2e/fixtures/hybrid2/package.json similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid2/package.json rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid2/package.json diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid2/public/code.js b/@kindspells/astro-shield/src/e2e/fixtures/hybrid2/public/code.js similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid2/public/code.js rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid2/public/code.js diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid2/src/env.d.ts b/@kindspells/astro-shield/src/e2e/fixtures/hybrid2/src/env.d.ts similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid2/src/env.d.ts rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid2/src/env.d.ts diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid2/src/pages/index.astro b/@kindspells/astro-shield/src/e2e/fixtures/hybrid2/src/pages/index.astro similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid2/src/pages/index.astro rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid2/src/pages/index.astro diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid2/src/pages/static.astro b/@kindspells/astro-shield/src/e2e/fixtures/hybrid2/src/pages/static.astro similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid2/src/pages/static.astro rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid2/src/pages/static.astro diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid2/src/styles/main.css b/@kindspells/astro-shield/src/e2e/fixtures/hybrid2/src/styles/main.css similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid2/src/styles/main.css rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid2/src/styles/main.css diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid2/src/styles/normalize.css b/@kindspells/astro-shield/src/e2e/fixtures/hybrid2/src/styles/normalize.css similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid2/src/styles/normalize.css rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid2/src/styles/normalize.css diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid3/astro.config.mjs b/@kindspells/astro-shield/src/e2e/fixtures/hybrid3/astro.config.mjs similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid3/astro.config.mjs rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid3/astro.config.mjs diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid3/package.json b/@kindspells/astro-shield/src/e2e/fixtures/hybrid3/package.json similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid3/package.json rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid3/package.json diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid3/public/code.js b/@kindspells/astro-shield/src/e2e/fixtures/hybrid3/public/code.js similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid3/public/code.js rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid3/public/code.js diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid3/src/env.d.ts b/@kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/env.d.ts similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid3/src/env.d.ts rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/env.d.ts diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid3/src/pages/index.astro b/@kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/pages/index.astro similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid3/src/pages/index.astro rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/pages/index.astro diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid3/src/pages/injected.astro b/@kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/pages/injected.astro similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid3/src/pages/injected.astro rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/pages/injected.astro diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid3/src/pages/static.astro b/@kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/pages/static.astro similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid3/src/pages/static.astro rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/pages/static.astro diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid3/src/styles/main.css b/@kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/styles/main.css similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid3/src/styles/main.css rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/styles/main.css diff --git a/@kindspells/astro-shield/e2e/fixtures/hybrid3/src/styles/normalize.css b/@kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/styles/normalize.css similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/hybrid3/src/styles/normalize.css rename to @kindspells/astro-shield/src/e2e/fixtures/hybrid3/src/styles/normalize.css diff --git a/@kindspells/astro-shield/e2e/fixtures/static/astro.config.mjs b/@kindspells/astro-shield/src/e2e/fixtures/static/astro.config.mjs similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/static/astro.config.mjs rename to @kindspells/astro-shield/src/e2e/fixtures/static/astro.config.mjs diff --git a/@kindspells/astro-shield/e2e/fixtures/static/package.json b/@kindspells/astro-shield/src/e2e/fixtures/static/package.json similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/static/package.json rename to @kindspells/astro-shield/src/e2e/fixtures/static/package.json diff --git a/@kindspells/astro-shield/e2e/fixtures/static/pnpm-lock.yaml b/@kindspells/astro-shield/src/e2e/fixtures/static/pnpm-lock.yaml similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/static/pnpm-lock.yaml rename to @kindspells/astro-shield/src/e2e/fixtures/static/pnpm-lock.yaml diff --git a/@kindspells/astro-shield/e2e/fixtures/static/src/env.d.ts b/@kindspells/astro-shield/src/e2e/fixtures/static/src/env.d.ts similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/static/src/env.d.ts rename to @kindspells/astro-shield/src/e2e/fixtures/static/src/env.d.ts diff --git a/@kindspells/astro-shield/e2e/fixtures/static/src/pages/index.astro b/@kindspells/astro-shield/src/e2e/fixtures/static/src/pages/index.astro similarity index 100% rename from @kindspells/astro-shield/e2e/fixtures/static/src/pages/index.astro rename to @kindspells/astro-shield/src/e2e/fixtures/static/src/pages/index.astro diff --git a/@kindspells/astro-shield/src/fs.mts b/@kindspells/astro-shield/src/fs.mts index cfce0bc..21f84ee 100644 --- a/@kindspells/astro-shield/src/fs.mts +++ b/@kindspells/astro-shield/src/fs.mts @@ -7,8 +7,7 @@ import { readdir, stat } from 'node:fs/promises' import { resolve } from 'node:path' -import type { HashesCollection, Logger } from './core.mts' -import type { SRIOptions } from './types.mts' +import type { HashesCollection, Logger, SRIOptions } from './types.mts' export const doesFileExist = async (path: string): Promise => { try { diff --git a/@kindspells/astro-shield/src/headers.mts b/@kindspells/astro-shield/src/headers.mts index cc4da3b..5d9242b 100644 --- a/@kindspells/astro-shield/src/headers.mts +++ b/@kindspells/astro-shield/src/headers.mts @@ -1,4 +1,4 @@ -import type { PerPageHashes } from './core.mts' +import type { PerPageHashes } from './types.mts' import type { CSPDirectives, CSPOptions, diff --git a/@kindspells/astro-shield/src/main.mts b/@kindspells/astro-shield/src/main.mts index f6b29fc..812ccbd 100644 --- a/@kindspells/astro-shield/src/main.mts +++ b/@kindspells/astro-shield/src/main.mts @@ -8,7 +8,7 @@ import { fileURLToPath } from 'node:url' import type { AstroIntegration } from 'astro' -import { getAstroConfigSetup, processStaticFiles } from './core.mts' +import { getAstroConfigSetup, processStaticFiles } from '#as/core' import type { ShieldOptions, SRIOptions } from './types.mts' type AstroHooks = AstroIntegration['hooks'] diff --git a/@kindspells/astro-shield/src/state.mts b/@kindspells/astro-shield/src/state.mts index 7c182ec..e2651ff 100644 --- a/@kindspells/astro-shield/src/state.mts +++ b/@kindspells/astro-shield/src/state.mts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -import type { MiddlewareHashes } from './core.mts' +import type { MiddlewareHashes } from './types.mts' let globalHashes: MiddlewareHashes diff --git a/@kindspells/astro-shield/src/tests/core.test.mts b/@kindspells/astro-shield/src/tests/core.test.mts index 0930a03..1524997 100644 --- a/@kindspells/astro-shield/src/tests/core.test.mts +++ b/@kindspells/astro-shield/src/tests/core.test.mts @@ -21,8 +21,8 @@ import { sriHashesEqual, updateDynamicPageSriHashes, updateStaticPageSriHashes, -} from '#as/core.mts' -import { doesFileExist } from '#as/fs.mts' +} from '../core.mts' +import { doesFileExist } from '../fs.mts' type SriHashes = { scripts: Record @@ -615,7 +615,7 @@ describe('updateStaticPageSriHashes', () => { My Test Page - + ` @@ -624,7 +624,7 @@ describe('updateStaticPageSriHashes', () => { My Test Page - + ` @@ -642,7 +642,7 @@ describe('updateStaticPageSriHashes', () => { expect( h.extScriptHashes.has( - 'sha256-Pl+u7V7n6H0yGnuW+XJq9vAtnskDhX+uuHdOPF/MuEU=', + 'sha256-GnAS2y0U5qIXDOpQOY7sE+D1/ncp19EQxwySQzSR/bQ=', ), ).toBe(true) expect(h.inlineScriptHashes.size).toBe(0) diff --git a/@kindspells/astro-shield/src/tests/fs.test.mts b/@kindspells/astro-shield/src/tests/fs.test.mts index 8d316e9..6a01685 100644 --- a/@kindspells/astro-shield/src/tests/fs.test.mts +++ b/@kindspells/astro-shield/src/tests/fs.test.mts @@ -9,9 +9,9 @@ import { relative, resolve } from 'node:path' import { describe, expect, it } from 'vitest' -import type { HashesCollection } from '#as/core.mts' -import { generateSRIHash } from '#as/core.mts' -import { doesFileExist, scanDirectory } from '#as/fs.mts' +import type { HashesCollection } from '../types.mts' +import { generateSRIHash } from '../core.mts' +import { doesFileExist, scanDirectory } from '../fs.mts' const testsDir = new URL('.', import.meta.url).pathname diff --git a/@kindspells/astro-shield/src/tests/headers.test.mts b/@kindspells/astro-shield/src/tests/headers.test.mts index 2709fa0..e963cff 100644 --- a/@kindspells/astro-shield/src/tests/headers.test.mts +++ b/@kindspells/astro-shield/src/tests/headers.test.mts @@ -12,8 +12,8 @@ import { serialiseCspDirectives, serialiseHashes, setSrcDirective, -} from '#as/headers.mjs' -import type { CSPDirectives, SecurityHeadersOptions } from '#as/types.mts' +} from '../headers.mjs' +import type { CSPDirectives, SecurityHeadersOptions } from '../types.mts' describe('serialiseHashes', () => { it('returns an empty string for an empty set', () => { diff --git a/@kindspells/astro-shield/src/tests/main.test.mts b/@kindspells/astro-shield/src/tests/main.test.mts index 3828b22..8a54b7b 100644 --- a/@kindspells/astro-shield/src/tests/main.test.mts +++ b/@kindspells/astro-shield/src/tests/main.test.mts @@ -7,7 +7,7 @@ import type { AstroIntegration } from 'astro' import { describe, expect, it } from 'vitest' -import defaultIntegrationExport, { shield } from '#as/main.mts' +import defaultIntegrationExport, { shield } from '../main.mts' describe('sriCSP', () => { it('is exported as default', () => { diff --git a/@kindspells/astro-shield/src/tests/state.test.mts b/@kindspells/astro-shield/src/tests/state.test.mts index a6016f7..4318a89 100644 --- a/@kindspells/astro-shield/src/tests/state.test.mts +++ b/@kindspells/astro-shield/src/tests/state.test.mts @@ -6,7 +6,7 @@ import { describe, expect, it } from 'vitest' -import { getGlobalHashes } from '#as/state.mts' +import { getGlobalHashes } from '../state.mts' describe('getGlobalHashes', () => { it('returns a singleton', () => { diff --git a/@kindspells/astro-shield/src/types.mts b/@kindspells/astro-shield/src/types.mts index e59f7b1..ba1e455 100644 --- a/@kindspells/astro-shield/src/types.mts +++ b/@kindspells/astro-shield/src/types.mts @@ -111,7 +111,14 @@ export type SRIOptions = { stylesAllowListUrls?: string[] } +type VercelConfig = { + provider: 'vercel' + configFile: string // TODO: auto-discovery? +} + export type SecurityHeadersOptions = { + enableOnStaticPages?: VercelConfig | undefined + /** * - If set, it controls how the CSP (Content Security Policy) header will be * generated in the middleware. @@ -151,3 +158,26 @@ export type StrictShieldOptions = ShieldOptions & { distDir: string sri: SRIOptions & { enableStatic: boolean; enableMiddleware: boolean } } + +export type Logger = { + info(msg: string): void + warn(msg: string): void + error(msg: string): void +} + +export type MiddlewareHashes = { + scripts: Map + styles: Map +} + +export type PerPageHashes = { scripts: Set; styles: Set } +export type PerPageHashesCollection = Map + +export type HashesCollection = { + inlineScriptHashes: Set + inlineStyleHashes: Set + extScriptHashes: Set + extStyleHashes: Set + perPageSriHashes: PerPageHashesCollection + perResourceSriHashes: MiddlewareHashes +} diff --git a/@kindspells/astro-shield/vitest.config.e2e.mts b/@kindspells/astro-shield/vitest.config.e2e.mts index 157c15b..5b9c54d 100644 --- a/@kindspells/astro-shield/vitest.config.e2e.mts +++ b/@kindspells/astro-shield/vitest.config.e2e.mts @@ -8,6 +8,6 @@ import { defineConfig } from 'vitest/config' export default defineConfig({ test: { - include: ['e2e/**/*.test.mts'], + include: ['src/e2e/**/*.test.mts'], }, }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e6e70c6..f0a2cbb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,7 +54,7 @@ importers: specifier: ^2.0.5 version: 2.0.5(@types/node@22.5.4) - '@kindspells/astro-shield/e2e/fixtures/dynamic': + '@kindspells/astro-shield/src/e2e/fixtures/dynamic': dependencies: '@astrojs/node': specifier: ^8.3.3 @@ -65,9 +65,9 @@ importers: devDependencies: '@kindspells/astro-shield': specifier: workspace:* - version: link:../../.. + version: link:../../../.. - '@kindspells/astro-shield/e2e/fixtures/hybrid': + '@kindspells/astro-shield/src/e2e/fixtures/hybrid': dependencies: '@astrojs/node': specifier: ^8.3.3 @@ -78,9 +78,9 @@ importers: devDependencies: '@kindspells/astro-shield': specifier: workspace:* - version: link:../../.. + version: link:../../../.. - '@kindspells/astro-shield/e2e/fixtures/hybrid2': + '@kindspells/astro-shield/src/e2e/fixtures/hybrid2': dependencies: '@astrojs/node': specifier: ^8.3.3 @@ -91,9 +91,9 @@ importers: devDependencies: '@kindspells/astro-shield': specifier: workspace:* - version: link:../../.. + version: link:../../../.. - '@kindspells/astro-shield/e2e/fixtures/hybrid3': + '@kindspells/astro-shield/src/e2e/fixtures/hybrid3': dependencies: '@astrojs/node': specifier: ^8.3.3 @@ -104,9 +104,9 @@ importers: devDependencies: '@kindspells/astro-shield': specifier: workspace:* - version: link:../../.. + version: link:../../../.. - '@kindspells/astro-shield/e2e/fixtures/static': + '@kindspells/astro-shield/src/e2e/fixtures/static': dependencies: astro: specifier: ^4.15.4 @@ -114,7 +114,7 @@ importers: devDependencies: '@kindspells/astro-shield': specifier: workspace:* - version: link:../../.. + version: link:../../../.. docs: dependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 16c2942..6070743 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -5,4 +5,4 @@ packages: - 'docs' - '@kindspells/*' - - '@kindspells/astro-shield/e2e/fixtures/*' + - '@kindspells/astro-shield/src/e2e/fixtures/*'