astro 1.1.6 → 1.2.0

package/dist/vite-plugin-markdown-legacy/index.js

@@ -5,12 +5,13 @@ import fs from "fs";
 import matter from "gray-matter";
 import { fileURLToPath } from "url";
 import { pagesVirtualModuleId } from "../core/app/index.js";
+import { cachedCompilation } from "../core/compile/index.js";
 import { collectErrorMetadata } from "../core/errors.js";
-import { cachedCompilation } from "../vite-plugin-astro/compile.js";
-import {
-  createTransformStyleWithViteFn
-} from "../vite-plugin-astro/styles.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";
+import {
+  createTransformStyles,
+  createViteStyleTransformer
+} from "../vite-style-transform/index.js";
 const MARKDOWN_IMPORT_FLAG = "?mdImport";
 const MARKDOWN_CONTENT_FLAG = "?content";
 function safeMatter(source, id) {
@@ -43,13 +44,16 @@ function markdown({ config, logging }) {
     }
     return false;
   }
-  let transformStyleWithVite;
+  let styleTransformer;
   let viteDevServer;
   return {
     name: "astro:markdown",
     enforce: "pre",
     configResolved(_resolvedConfig) {
-      transformStyleWithVite = createTransformStyleWithViteFn(_resolvedConfig);
+      styleTransformer = createViteStyleTransformer(_resolvedConfig);
+    },
+    configureServer(server) {
+      styleTransformer.viteDevServer = server;
     },
     async resolveId(id, importer, options) {
       if (id.endsWith(`.md${MARKDOWN_CONTENT_FLAG}`)) {
@@ -161,10 +165,12 @@ ${astroResult}
           filename,
           moduleId: id,
           source: astroResult,
-          ssr: Boolean(opts == null ? void 0 : opts.ssr),
-          transformStyleWithVite,
-          viteDevServer,
-          pluginContext: this
+          transformStyle: createTransformStyles(
+            styleTransformer,
+            filename,
+            Boolean(opts == null ? void 0 : opts.ssr),
+            this
+          )
         };
         let transformResult = await cachedCompilation(compileProps);
         let { code: tsResult } = transformResult;

package/dist/vite-style-transform/index.d.ts

@@ -0,0 +1,2 @@
+export type { ViteStyleTransformer } from './style-transform';
+export { createTransformStyles, createViteStyleTransformer } from './style-transform.js';

package/dist/vite-style-transform/index.js

@@ -0,0 +1,5 @@
+import { createTransformStyles, createViteStyleTransformer } from "./style-transform.js";
+export {
+  createTransformStyles,
+  createViteStyleTransformer
+};

package/dist/vite-style-transform/style-transform.d.ts

@@ -0,0 +1,10 @@
+import type { PluginContext } from 'rollup';
+import type { TransformStyle } from '../core/compile/index';
+import { TransformStyleWithVite } from './transform-with-vite.js';
+import type * as vite from 'vite';
+export declare type ViteStyleTransformer = {
+    viteDevServer?: vite.ViteDevServer;
+    transformStyleWithVite: TransformStyleWithVite;
+};
+export declare function createViteStyleTransformer(viteConfig: vite.ResolvedConfig): ViteStyleTransformer;
+export declare function createTransformStyles(viteStyleTransformer: ViteStyleTransformer, filename: string, ssr: boolean, pluginContext: PluginContext): TransformStyle;

package/dist/vite-style-transform/style-transform.js

@@ -0,0 +1,36 @@
+import { fileURLToPath } from "url";
+import { createTransformStyleWithViteFn } from "./transform-with-vite.js";
+function createViteStyleTransformer(viteConfig) {
+  return {
+    transformStyleWithVite: createTransformStyleWithViteFn(viteConfig)
+  };
+}
+function getNormalizedIDForPostCSS(filename) {
+  try {
+    const filenameURL = new URL(`file://${filename}`);
+    return fileURLToPath(filenameURL);
+  } catch (err) {
+    return filename;
+  }
+}
+function createTransformStyles(viteStyleTransformer, filename, ssr, pluginContext) {
+  if (!pluginContext.addWatchFile) {
+    pluginContext.addWatchFile = () => {
+    };
+  }
+  const normalizedID = getNormalizedIDForPostCSS(filename);
+  return async function(styleSource, lang) {
+    const result = await viteStyleTransformer.transformStyleWithVite.call(pluginContext, {
+      id: normalizedID,
+      source: styleSource,
+      lang,
+      ssr,
+      viteDevServer: viteStyleTransformer.viteDevServer
+    });
+    return result;
+  };
+}
+export {
+  createTransformStyles,
+  createViteStyleTransformer
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -82,7 +82,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.23.4",
+    "@astrojs/compiler": "^0.24.0",
     "@astrojs/language-server": "^0.23.0",
     "@astrojs/markdown-remark": "^1.1.1",
     "@astrojs/telemetry": "^1.0.0",
@@ -93,8 +93,11 @@
     "@babel/plugin-transform-react-jsx": "^7.17.12",
     "@babel/traverse": "^7.18.2",
     "@babel/types": "^7.18.4",
-    "@proload/core": "^0.3.2",
+    "@proload/core": "^0.3.3",
     "@proload/plugin-tsm": "^0.2.1",
+    "@types/babel__core": "^7.1.19",
+    "@types/html-escaper": "^3.0.0",
+    "@types/yargs-parser": "^21.0.0",
     "boxen": "^6.2.1",
     "ci-info": "^3.3.1",
     "common-ancestor-path": "^1.0.1",
@@ -139,7 +142,6 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.22.2",
-    "@types/babel__core": "^7.1.19",
     "@types/babel__generator": "^7.6.4",
     "@types/babel__traverse": "^7.17.1",
     "@types/chai": "^4.3.1",
@@ -148,7 +150,6 @@
     "@types/debug": "^4.1.7",
     "@types/diff": "^5.0.2",
     "@types/estree": "^0.0.51",
-    "@types/html-escaper": "^3.0.0",
     "@types/mime": "^2.0.3",
     "@types/mocha": "^9.1.1",
     "@types/parse5": "^6.0.3",
@@ -158,7 +159,6 @@
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
     "@types/unist": "^2.0.6",
-    "@types/yargs-parser": "^21.0.0",
     "ast-types": "^0.14.2",
     "astro-scripts": "0.0.7",
     "chai": "^4.3.6",
@@ -178,7 +178,8 @@
     "dev": "astro-scripts dev --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.ts\"",
     "postbuild": "astro-scripts copy \"src/**/*.astro\"",
     "benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js",
-    "test": "mocha --exit --timeout 20000 --ignore **/lit-element.test.js && mocha --timeout 20000 **/lit-element.test.js",
+    "test:unit": "mocha --exit --timeout 2000 ./test/units/**/*.test.js",
+    "test": "pnpm run test:unit && mocha --exit --timeout 20000 --ignore **/lit-element.test.js && mocha --timeout 20000 **/lit-element.test.js",
     "test:match": "mocha --timeout 20000 -g",
     "test:e2e": "playwright test",
     "test:e2e:match": "playwright test -g"