From 34a257376e1322ae6227eca50fc417779bb1bdf3 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Mon, 18 Oct 2021 14:20:40 -0400 Subject: [PATCH] Upgrade to @astrojs/compiler 0.2.0 (#1584) --- package.json | 2 +- packages/astro/package.json | 2 +- packages/astro/src/runtime/server/index.ts | 2 +- .../runtime/server/{hydration-map.ts => metadata.ts} | 12 +++++++++--- yarn.lock | 8 ++++---- 5 files changed, 16 insertions(+), 10 deletions(-) rename packages/astro/src/runtime/server/{hydration-map.ts => metadata.ts} (86%) diff --git a/package.json b/package.json index 74d0272f3..7fe549e23 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "packages/astro/test/fixtures/custom-elements/my-component-lib" ], "volta": { - "node": "14.16.1", + "node": "14.17.0", "npm": "7.11.2", "yarn": "1.22.10" }, diff --git a/packages/astro/package.json b/packages/astro/package.json index b05db4b8c..8c4db8357 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -52,7 +52,7 @@ "test": "mocha --parallel --timeout 15000" }, "dependencies": { - "@astrojs/compiler": "^0.1.15", + "@astrojs/compiler": "^0.2.0", "@astrojs/language-server": "^0.7.16", "@astrojs/markdown-remark": "^0.3.1", "@astrojs/markdown-support": "0.3.1", diff --git a/packages/astro/src/runtime/server/index.ts b/packages/astro/src/runtime/server/index.ts index afcde3a98..3f41e702a 100644 --- a/packages/astro/src/runtime/server/index.ts +++ b/packages/astro/src/runtime/server/index.ts @@ -6,7 +6,7 @@ import { pathToFileURL } from 'url'; import { valueToEstree } from 'estree-util-value-to-estree'; import * as astring from 'astring'; import shorthash from 'shorthash'; -export { createHydrationMap } from './hydration-map.js'; +export { createMetadata } from './metadata.js'; const { generate, GENERATOR } = astring; diff --git a/packages/astro/src/runtime/server/hydration-map.ts b/packages/astro/src/runtime/server/metadata.ts similarity index 86% rename from packages/astro/src/runtime/server/hydration-map.ts rename to packages/astro/src/runtime/server/metadata.ts index 61f02df28..cb01adb40 100644 --- a/packages/astro/src/runtime/server/hydration-map.ts +++ b/packages/astro/src/runtime/server/metadata.ts @@ -10,7 +10,7 @@ interface ComponentMetadata { componentUrl: string; } -class HydrationMap { +class Metadata { public fileURL: URL; private metadataCache: Map; constructor(fileURL: string, public modules: ModuleInfo[], components: any[]) { @@ -61,6 +61,12 @@ class HydrationMap { } } -export function createHydrationMap(fileURL: string, modules: ModuleInfo[], components: any[]) { - return new HydrationMap(fileURL, modules, components); +interface CreateMetadataOptions { + modules: ModuleInfo[]; + hydratedComponents: any[]; + hoisted: any[]; +} + +export function createMetadata(fileURL: string, options: CreateMetadataOptions) { + return new Metadata(fileURL, options.modules, options.hydratedComponents); } diff --git a/yarn.lock b/yarn.lock index 63c07a028..e5941ce3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -106,10 +106,10 @@ "@algolia/logger-common" "4.10.5" "@algolia/requester-common" "4.10.5" -"@astrojs/compiler@^0.1.15": - version "0.1.15" - resolved "https://registry.yarnpkg.com/@astrojs/compiler/-/compiler-0.1.15.tgz#3d67c1a6591834c76471bd99c3fe49c6173de7fc" - integrity sha512-o8vxpbM4k9oROUN4ylOzjvCX3+g7U9P9Uoemji8VkVP7W/USDhJy56cdDI+ADvb1RxiOlzAnoowoScCPXuHtYQ== +"@astrojs/compiler@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@astrojs/compiler/-/compiler-0.2.0.tgz#79a8ec89d9a2d8089fbdb5515010e1bcdc949035" + integrity sha512-i3bxVI+gSql9Yb1YAMAJODdZ40vvDNtfxJWcidZ243R04BQXVG5X5URzmQz69AuKZTJb6ZGoFZlEle3sw1DK6w== dependencies: typescript "^4.3.5"