michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable Windows tests (#1712)

Browse source
This commit is contained in:
Drew Powers 2021-11-02 08:13:36 -06:00 • committed by GitHub
parent 758c712f01
commit c0d9ed832e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 366 additions and 358 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.github/workflows/ci.yml vendored
View file

@ -18,19 +18,18 @@ jobs:
matrix: matrix:
os: [ubuntu-latest] os: [ubuntu-latest]
node_version: [12, 14, 16] node_version: [12, 14, 16]
# TODO: uncomment this (Vite has trouble resolving imports on Windows) include:
# include: - os: windows-latest
# - os: windows-latest node_version: 16
# node_version: 14
fail-fast: false fail-fast: false
env: env:
LANG: en-us LANG: en-us
name: 'Test: node-${{ matrix.node_version }}, ${{ matrix.os }}' name: 'Test: node-${{ matrix.node_version }}, ${{ matrix.os }}'
steps: steps:
- name: Checkout - name: Check out code using Git
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Set node version to ${{ matrix.node_version }} - name: Set Node version to ${{ matrix.node_version }}
uses: actions/setup-node@v2 uses: actions/setup-node@v2
with: with:
node-version: ${{ matrix.node_version }} node-version: ${{ matrix.node_version }}
@ -50,16 +49,16 @@ jobs:
lint: lint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: 'Lint: node-14, ubuntu-latest' name: 'Lint: node-16, ubuntu-latest'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Set node version to 14 - name: Set Node version to 16
uses: actions/setup-node@v2 uses: actions/setup-node@v2
with: with:
node-version: 14 node-version: 16
cache: 'yarn' cache: 'yarn'
- name: Debug - name: Debug
@ -79,14 +78,15 @@ jobs:
# runs-on: ubuntu-latest # runs-on: ubuntu-latest
# name: 'Smoke: node-14, ubuntu-latest' # name: 'Smoke: node-14, ubuntu-latest'
# steps: # steps:
# - uses: actions/checkout@v2 # - name: Check out code using Git
# uses: actions/checkout@v2
# with: # with:
# fetch-depth: 0 # fetch-depth: 0
# - name: Set node version to 14 # - name: Set Node version to 16
# uses: actions/setup-node@v2 # uses: actions/setup-node@v2
# with: # with:
# node-version: 14 # node-version: 16
# cache: 'yarn' # cache: 'yarn'
# - name: Debug # - name: Debug

18
.github/workflows/format.yml vendored
View file

@ -5,24 +5,26 @@ on:
branches: branches:
- main - main
env:
node_version: 14
jobs: jobs:
format: format:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - name: Check out code using Git
uses: actions/checkout@v2
with: with:
ref: ${{ github.head_ref }} ref: ${{ github.head_ref }}
- uses: actions/setup-node@v2 - name: Set Node version to 16
uses: actions/setup-node@v2
with: with:
node-version: ${{ env.node_version }} node-version: 16
- run: yarn --frozen-lockfile --ignore-engines cache: 'yarn'
- name: Install dependencies
run: yarn --frozen-lockfile --ignore-engines
env: env:
CI: true CI: true
- run: yarn lerna run build --scope @astrojs/parser - run: yarn lerna run build --scope @astrojs/parser
- run: yarn format - name: Format code
run: yarn format
- name: Commit changes - name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4 uses: stefanzweifel/git-auto-commit-action@v4
with: with:

7
.github/workflows/release.yml vendored
View file

@ -10,16 +10,17 @@ jobs:
name: Changelog name: Changelog
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out branch - name: Check out code using Git
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
fetch-depth: 0 # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits fetch-depth: 0 # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
- name: Set up Node.js 14.x - name: Set Node version to 14
uses: actions/setup-node@v2 uses: actions/setup-node@v2
with: with:
node-version: 14.x node-version: 14.x
cache: 'yarn'
- name: Install dependencies - name: Install dependencies
run: yarn --frozen-lockfile --ignore-engines run: yarn --frozen-lockfile --ignore-engines
env: env:

22
.github/workflows/stat.yml vendored
View file

@ -1,26 +1,26 @@
name: 'Collect Stats' name: 'Collect Stats'
on: on:
schedule: schedule:
# * is a special character in YAML so you have to quote this string # * is a special character in YAML so you have to quote this string
- cron: '0 12 * * *' - cron: '0 12 * * *'
env:
node_version: 14
jobs: jobs:
stat: stat:
if: github.repository == 'snowpackjs/astro' if: github.repository == 'snowpackjs/astro'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# Check out code using git - name: Check out code using Git
- uses: actions/checkout@v2 uses: actions/checkout@v2
# Install Node 14 - name: Set Node version to 16
- uses: actions/setup-node@v1 uses: actions/setup-node@v2
with: with:
version: 14 node-version: 16
- run: yarn install --frozen-lockfile --ignore-engines --ignore-scripts cache: 'yarn'
- run: node scripts/stats/index.js - name: Install dependencies
run: yarn install --frozen-lockfile --ignore-engines --ignore-scripts
- name: Collect stats
run: node scripts/stats/index.js
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Commit changes - name: Commit changes

6
packages/astro/src/core/build/index.ts
View file

@ -142,7 +142,11 @@ class AstroBuilder {
target: 'es2020', // must match an esbuild target target: 'es2020', // must match an esbuild target
}, },
plugins: [ plugins: [
rollupPluginHTML({ input, extractAssets: false }) as any, // "any" needed for CI; also we don’t need typedefs for this anyway rollupPluginHTML({
rootDir: viteConfig.root,
input,
extractAssets: false,
}) as any, // "any" needed for CI; also we don’t need typedefs for this anyway
...(viteConfig.plugins || []), ...(viteConfig.plugins || []),
], ],
publicDir: viteConfig.publicDir, publicDir: viteConfig.publicDir,

7
packages/astro/src/core/ssr/index.ts
View file

@ -79,7 +79,8 @@ export async function ssr({ astroConfig, filePath, logging, mode, origin, pathna
// Important: This needs to happen first, in case a renderer provides polyfills. // Important: This needs to happen first, in case a renderer provides polyfills.
const renderers = await resolveRenderers(viteServer, astroConfig); const renderers = await resolveRenderers(viteServer, astroConfig);
// Load the module from the Vite SSR Runtime. // Load the module from the Vite SSR Runtime.
const mod = (await viteServer.ssrLoadModule(fileURLToPath(filePath))) as ComponentInstance; const viteFriendlyURL = `/@fs${filePath.pathname}`;
const mod = (await viteServer.ssrLoadModule(viteFriendlyURL)) as ComponentInstance;
// Handle dynamic routes // Handle dynamic routes
let params: Params = {}; let params: Params = {};
let pageProps: Props = {}; let pageProps: Props = {};
@ -174,7 +175,7 @@ export async function ssr({ astroConfig, filePath, logging, mode, origin, pathna
} }
// inject CSS // inject CSS
[...getStylesForID(fileURLToPath(filePath), viteServer)].forEach((href) => { [...getStylesForID(filePath.pathname, viteServer)].forEach((href) => {
tags.push({ tags.push({
tag: 'link', tag: 'link',
attrs: { type: 'text/css', rel: 'stylesheet', href }, attrs: { type: 'text/css', rel: 'stylesheet', href },
@ -187,7 +188,7 @@ export async function ssr({ astroConfig, filePath, logging, mode, origin, pathna
// run transformIndexHtml() in dev to run Vite dev transformations // run transformIndexHtml() in dev to run Vite dev transformations
if (mode === 'development') { if (mode === 'development') {
html = await viteServer.transformIndexHtml(fileURLToPath(filePath), html, pathname); html = await viteServer.transformIndexHtml(filePath.pathname, html, pathname);
} }
return html; return html;

3
packages/astro/src/vite-plugin-astro/index.ts
View file

@ -46,7 +46,8 @@ export default function astro({ config, devServer }: AstroPluginOptions): vite.P
} }
// pages and layouts should be transformed as full documents (implicit <head> <body> etc) // pages and layouts should be transformed as full documents (implicit <head> <body> etc)
// everything else is treated as a fragment // everything else is treated as a fragment
const isPage = id.startsWith(fileURLToPath(config.pages)) || id.startsWith(fileURLToPath(config.layouts)); const normalizedID = fileURLToPath(new URL(`file://${id}`));
const isPage = normalizedID.startsWith(fileURLToPath(config.pages)) || id.startsWith(fileURLToPath(config.layouts));
let source = await fs.promises.readFile(id, 'utf8'); let source = await fs.promises.readFile(id, 'utf8');
let tsResult: TransformResult | undefined; let tsResult: TransformResult | undefined;

637
packages/astro/vendor/vite/dist/node/chunks/dep-35df7f96.js vendored
View file

@ -90,155 +90,155 @@ function commonjsRequire (path) {
var ansiStyles$2 = {exports: {}}; var ansiStyles$2 = {exports: {}};
var colorName$1 = { var colorName$1 = {
"aliceblue": [240, 248, 255], "aliceblue": [240, 248, 255],
"antiquewhite": [250, 235, 215], "antiquewhite": [250, 235, 215],
"aqua": [0, 255, 255], "aqua": [0, 255, 255],
"aquamarine": [127, 255, 212], "aquamarine": [127, 255, 212],
"azure": [240, 255, 255], "azure": [240, 255, 255],
"beige": [245, 245, 220], "beige": [245, 245, 220],
"bisque": [255, 228, 196], "bisque": [255, 228, 196],
"black": [0, 0, 0], "black": [0, 0, 0],
"blanchedalmond": [255, 235, 205], "blanchedalmond": [255, 235, 205],
"blue": [0, 0, 255], "blue": [0, 0, 255],
"blueviolet": [138, 43, 226], "blueviolet": [138, 43, 226],
"brown": [165, 42, 42], "brown": [165, 42, 42],
"burlywood": [222, 184, 135], "burlywood": [222, 184, 135],
"cadetblue": [95, 158, 160], "cadetblue": [95, 158, 160],
"chartreuse": [127, 255, 0], "chartreuse": [127, 255, 0],
"chocolate": [210, 105, 30], "chocolate": [210, 105, 30],
"coral": [255, 127, 80], "coral": [255, 127, 80],
"cornflowerblue": [100, 149, 237], "cornflowerblue": [100, 149, 237],
"cornsilk": [255, 248, 220], "cornsilk": [255, 248, 220],
"crimson": [220, 20, 60], "crimson": [220, 20, 60],
"cyan": [0, 255, 255], "cyan": [0, 255, 255],
"darkblue": [0, 0, 139], "darkblue": [0, 0, 139],
"darkcyan": [0, 139, 139], "darkcyan": [0, 139, 139],
"darkgoldenrod": [184, 134, 11], "darkgoldenrod": [184, 134, 11],
"darkgray": [169, 169, 169], "darkgray": [169, 169, 169],
"darkgreen": [0, 100, 0], "darkgreen": [0, 100, 0],
"darkgrey": [169, 169, 169], "darkgrey": [169, 169, 169],
"darkkhaki": [189, 183, 107], "darkkhaki": [189, 183, 107],
"darkmagenta": [139, 0, 139], "darkmagenta": [139, 0, 139],
"darkolivegreen": [85, 107, 47], "darkolivegreen": [85, 107, 47],
"darkorange": [255, 140, 0], "darkorange": [255, 140, 0],
"darkorchid": [153, 50, 204], "darkorchid": [153, 50, 204],
"darkred": [139, 0, 0], "darkred": [139, 0, 0],
"darksalmon": [233, 150, 122], "darksalmon": [233, 150, 122],
"darkseagreen": [143, 188, 143], "darkseagreen": [143, 188, 143],
"darkslateblue": [72, 61, 139], "darkslateblue": [72, 61, 139],
"darkslategray": [47, 79, 79], "darkslategray": [47, 79, 79],
"darkslategrey": [47, 79, 79], "darkslategrey": [47, 79, 79],
"darkturquoise": [0, 206, 209], "darkturquoise": [0, 206, 209],
"darkviolet": [148, 0, 211], "darkviolet": [148, 0, 211],
"deeppink": [255, 20, 147], "deeppink": [255, 20, 147],
"deepskyblue": [0, 191, 255], "deepskyblue": [0, 191, 255],
"dimgray": [105, 105, 105], "dimgray": [105, 105, 105],
"dimgrey": [105, 105, 105], "dimgrey": [105, 105, 105],
"dodgerblue": [30, 144, 255], "dodgerblue": [30, 144, 255],
"firebrick": [178, 34, 34], "firebrick": [178, 34, 34],
"floralwhite": [255, 250, 240], "floralwhite": [255, 250, 240],
"forestgreen": [34, 139, 34], "forestgreen": [34, 139, 34],
"fuchsia": [255, 0, 255], "fuchsia": [255, 0, 255],
"gainsboro": [220, 220, 220], "gainsboro": [220, 220, 220],
"ghostwhite": [248, 248, 255], "ghostwhite": [248, 248, 255],
"gold": [255, 215, 0], "gold": [255, 215, 0],
"goldenrod": [218, 165, 32], "goldenrod": [218, 165, 32],
"gray": [128, 128, 128], "gray": [128, 128, 128],
"green": [0, 128, 0], "green": [0, 128, 0],
"greenyellow": [173, 255, 47], "greenyellow": [173, 255, 47],
"grey": [128, 128, 128], "grey": [128, 128, 128],
"honeydew": [240, 255, 240], "honeydew": [240, 255, 240],
"hotpink": [255, 105, 180], "hotpink": [255, 105, 180],
"indianred": [205, 92, 92], "indianred": [205, 92, 92],
"indigo": [75, 0, 130], "indigo": [75, 0, 130],
"ivory": [255, 255, 240], "ivory": [255, 255, 240],
"khaki": [240, 230, 140], "khaki": [240, 230, 140],
"lavender": [230, 230, 250], "lavender": [230, 230, 250],
"lavenderblush": [255, 240, 245], "lavenderblush": [255, 240, 245],
"lawngreen": [124, 252, 0], "lawngreen": [124, 252, 0],
"lemonchiffon": [255, 250, 205], "lemonchiffon": [255, 250, 205],
"lightblue": [173, 216, 230], "lightblue": [173, 216, 230],
"lightcoral": [240, 128, 128], "lightcoral": [240, 128, 128],
"lightcyan": [224, 255, 255], "lightcyan": [224, 255, 255],
"lightgoldenrodyellow": [250, 250, 210], "lightgoldenrodyellow": [250, 250, 210],
"lightgray": [211, 211, 211], "lightgray": [211, 211, 211],
"lightgreen": [144, 238, 144], "lightgreen": [144, 238, 144],
"lightgrey": [211, 211, 211], "lightgrey": [211, 211, 211],
"lightpink": [255, 182, 193], "lightpink": [255, 182, 193],
"lightsalmon": [255, 160, 122], "lightsalmon": [255, 160, 122],
"lightseagreen": [32, 178, 170], "lightseagreen": [32, 178, 170],
"lightskyblue": [135, 206, 250], "lightskyblue": [135, 206, 250],
"lightslategray": [119, 136, 153], "lightslategray": [119, 136, 153],
"lightslategrey": [119, 136, 153], "lightslategrey": [119, 136, 153],
"lightsteelblue": [176, 196, 222], "lightsteelblue": [176, 196, 222],
"lightyellow": [255, 255, 224], "lightyellow": [255, 255, 224],
"lime": [0, 255, 0], "lime": [0, 255, 0],
"limegreen": [50, 205, 50], "limegreen": [50, 205, 50],
"linen": [250, 240, 230], "linen": [250, 240, 230],
"magenta": [255, 0, 255], "magenta": [255, 0, 255],
"maroon": [128, 0, 0], "maroon": [128, 0, 0],
"mediumaquamarine": [102, 205, 170], "mediumaquamarine": [102, 205, 170],
"mediumblue": [0, 0, 205], "mediumblue": [0, 0, 205],
"mediumorchid": [186, 85, 211], "mediumorchid": [186, 85, 211],
"mediumpurple": [147, 112, 219], "mediumpurple": [147, 112, 219],
"mediumseagreen": [60, 179, 113], "mediumseagreen": [60, 179, 113],
"mediumslateblue": [123, 104, 238], "mediumslateblue": [123, 104, 238],
"mediumspringgreen": [0, 250, 154], "mediumspringgreen": [0, 250, 154],
"mediumturquoise": [72, 209, 204], "mediumturquoise": [72, 209, 204],
"mediumvioletred": [199, 21, 133], "mediumvioletred": [199, 21, 133],
"midnightblue": [25, 25, 112], "midnightblue": [25, 25, 112],
"mintcream": [245, 255, 250], "mintcream": [245, 255, 250],
"mistyrose": [255, 228, 225], "mistyrose": [255, 228, 225],
"moccasin": [255, 228, 181], "moccasin": [255, 228, 181],
"navajowhite": [255, 222, 173], "navajowhite": [255, 222, 173],
"navy": [0, 0, 128], "navy": [0, 0, 128],
"oldlace": [253, 245, 230], "oldlace": [253, 245, 230],
"olive": [128, 128, 0], "olive": [128, 128, 0],
"olivedrab": [107, 142, 35], "olivedrab": [107, 142, 35],
"orange": [255, 165, 0], "orange": [255, 165, 0],
"orangered": [255, 69, 0], "orangered": [255, 69, 0],
"orchid": [218, 112, 214], "orchid": [218, 112, 214],
"palegoldenrod": [238, 232, 170], "palegoldenrod": [238, 232, 170],
"palegreen": [152, 251, 152], "palegreen": [152, 251, 152],
"paleturquoise": [175, 238, 238], "paleturquoise": [175, 238, 238],
"palevioletred": [219, 112, 147], "palevioletred": [219, 112, 147],
"papayawhip": [255, 239, 213], "papayawhip": [255, 239, 213],
"peachpuff": [255, 218, 185], "peachpuff": [255, 218, 185],
"peru": [205, 133, 63], "peru": [205, 133, 63],
"pink": [255, 192, 203], "pink": [255, 192, 203],
"plum": [221, 160, 221], "plum": [221, 160, 221],
"powderblue": [176, 224, 230], "powderblue": [176, 224, 230],
"purple": [128, 0, 128], "purple": [128, 0, 128],
"rebeccapurple": [102, 51, 153], "rebeccapurple": [102, 51, 153],
"red": [255, 0, 0], "red": [255, 0, 0],
"rosybrown": [188, 143, 143], "rosybrown": [188, 143, 143],
"royalblue": [65, 105, 225], "royalblue": [65, 105, 225],
"saddlebrown": [139, 69, 19], "saddlebrown": [139, 69, 19],
"salmon": [250, 128, 114], "salmon": [250, 128, 114],
"sandybrown": [244, 164, 96], "sandybrown": [244, 164, 96],
"seagreen": [46, 139, 87], "seagreen": [46, 139, 87],
"seashell": [255, 245, 238], "seashell": [255, 245, 238],
"sienna": [160, 82, 45], "sienna": [160, 82, 45],
"silver": [192, 192, 192], "silver": [192, 192, 192],
"skyblue": [135, 206, 235], "skyblue": [135, 206, 235],
"slateblue": [106, 90, 205], "slateblue": [106, 90, 205],
"slategray": [112, 128, 144], "slategray": [112, 128, 144],
"slategrey": [112, 128, 144], "slategrey": [112, 128, 144],
"snow": [255, 250, 250], "snow": [255, 250, 250],
"springgreen": [0, 255, 127], "springgreen": [0, 255, 127],
"steelblue": [70, 130, 180], "steelblue": [70, 130, 180],
"tan": [210, 180, 140], "tan": [210, 180, 140],
"teal": [0, 128, 128], "teal": [0, 128, 128],
"thistle": [216, 191, 216], "thistle": [216, 191, 216],
"tomato": [255, 99, 71], "tomato": [255, 99, 71],
"turquoise": [64, 224, 208], "turquoise": [64, 224, 208],
"violet": [238, 130, 238], "violet": [238, 130, 238],
"wheat": [245, 222, 179], "wheat": [245, 222, 179],
"white": [255, 255, 255], "white": [255, 255, 255],
"whitesmoke": [245, 245, 245], "whitesmoke": [245, 245, 245],
"yellow": [255, 255, 0], "yellow": [255, 255, 0],
"yellowgreen": [154, 205, 50] "yellowgreen": [154, 205, 50]
}; };
/* MIT license */ /* MIT license */
@ -3695,7 +3695,7 @@ class SourceMapTree {
return null; return null;
const source = this.sources[segment[1]]; const source = this.sources[segment[1]];
// So now we can recurse down, until we hit the original source file. // So now we can recurse down, until we hit the original source file.
return source.traceSegment(segment[2], segment[3], return source.traceSegment(segment[2], segment[3],
// A child map's recorded name for this segment takes precedence over the // A child map's recorded name for this segment takes precedence over the
// parent's mapped name. Imagine a mangler changing the name over, etc. // parent's mapped name. Imagine a mangler changing the name over, etc.
segment.length === 5 ? names[segment[4]] : name); segment.length === 5 ? names[segment[4]] : name);
@ -6002,7 +6002,7 @@ async function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false
const { search, hash } = require$$0$8.parse(id); const { search, hash } = require$$0$8.parse(id);
const postfix = (search || '') + (hash || ''); const postfix = (search || '') + (hash || '');
const output = (_b = (_a = config.build) === null || _a === void 0 ? void 0 : _a.rollupOptions) === null || _b === void 0 ? void 0 : _b.output; const output = (_b = (_a = config.build) === null || _a === void 0 ? void 0 : _a.rollupOptions) === null || _b === void 0 ? void 0 : _b.output;
const assetFileNames = (_c = (output && !Array.isArray(output) ? output.assetFileNames : undefined)) !== null && _c !== void 0 ? _c : const assetFileNames = (_c = (output && !Array.isArray(output) ? output.assetFileNames : undefined)) !== null && _c !== void 0 ? _c :
// defaults to '<assetsDir>/[name].[hash][extname]' // defaults to '<assetsDir>/[name].[hash][extname]'
// slightly different from rollup's one ('assets/[name]-[hash][extname]') // slightly different from rollup's one ('assets/[name]-[hash][extname]')
path__default.posix.join(config.build.assetsDir, '[name].[hash][extname]'); path__default.posix.join(config.build.assetsDir, '[name].[hash][extname]');
@ -6036,7 +6036,7 @@ async function urlToBuiltUrl(url, importer, config, pluginContext) {
const file = url.startsWith('/') const file = url.startsWith('/')
? path__default.join(config.root, url) ? path__default.join(config.root, url)
: path__default.join(path__default.dirname(importer), url); : path__default.join(path__default.dirname(importer), url);
return fileToBuiltUrl(file, config, pluginContext, return fileToBuiltUrl(file, config, pluginContext,
// skip public check since we just did it above // skip public check since we just did it above
true); true);
} }
@ -19888,7 +19888,7 @@ function cssPlugin(config) {
? moduleGraph.createFileOnlyEntry(file) ? moduleGraph.createFileOnlyEntry(file)
: await moduleGraph.ensureEntryFromUrl((await fileToUrl(file, config, this)).replace(config.base, '/'))); : await moduleGraph.ensureEntryFromUrl((await fileToUrl(file, config, this)).replace(config.base, '/')));
} }
moduleGraph.updateModuleInfo(thisModule, depModules, moduleGraph.updateModuleInfo(thisModule, depModules,
// The root CSS proxy module is self-accepting and should not // The root CSS proxy module is self-accepting and should not
// have an explicit accept list // have an explicit accept list
new Set(), isSelfAccepting); new Set(), isSelfAccepting);
@ -20104,7 +20104,7 @@ function cssPostPlugin(config) {
} }
return true; return true;
}); });
chunk.code = chunk.code.replace(emptyChunkRE, chunk.code = chunk.code.replace(emptyChunkRE,
// remove css import while preserving source map location // remove css import while preserving source map location
(m) => `/* empty css ${''.padEnd(m.length - 15)}*/`); (m) => `/* empty css ${''.padEnd(m.length - 15)}*/`);
} }
@ -21068,7 +21068,7 @@ function buildImportAnalysisPlugin(config) {
markPos = code.indexOf(preloadMarker); markPos = code.indexOf(preloadMarker);
} }
if (markPos > 0) { if (markPos > 0) {
s.overwrite(markPos - 1, markPos + preloadMarker.length + 1, s.overwrite(markPos - 1, markPos + preloadMarker.length + 1,
// the dep list includes the main chunk, so only need to // the dep list includes the main chunk, so only need to
// preload when there are actual other deps. // preload when there are actual other deps.
deps.size > 1 || deps.size > 1 ||
@ -21179,7 +21179,7 @@ function htmlInlineScriptProxyPlugin(config) {
if (proxyMatch) { if (proxyMatch) {
const index = Number(proxyMatch[1]); const index = Number(proxyMatch[1]);
const file = cleanUrl(id); const file = cleanUrl(id);
const url = file.replace(config.root, ''); const url = file.replace(normalizePath$4(config.root), '');
const result = htmlProxyMap.get(config).get(url)[index]; const result = htmlProxyMap.get(config).get(url)[index];
if (result) { if (result) {
return result; return result;
@ -21319,7 +21319,7 @@ function buildHtmlPlugin(config) {
.map((child) => child.content || '') .map((child) => child.content || '')
.join(''); .join('');
// <script type="module">...</script> // <script type="module">...</script>
const filePath = id.replace(config.root, ''); const filePath = id.replace(normalizePath$4(config.root), '')
addToHTMLProxyCache(config, filePath, inlineModuleIndex, contents); addToHTMLProxyCache(config, filePath, inlineModuleIndex, contents);
js += `\nimport "${id}?html-proxy&index=${inlineModuleIndex}.js"`; js += `\nimport "${id}?html-proxy&index=${inlineModuleIndex}.js"`;
shouldRemove = true; shouldRemove = true;
@ -22936,12 +22936,12 @@ var commondir = function (basedir, relfiles) {
else { else {
var files = basedir; var files = basedir;
} }
var res = files.slice(1).reduce(function (ps, file) { var res = files.slice(1).reduce(function (ps, file) {
if (!file.match(/^([A-Za-z]:)?\/|\\/)) { if (!file.match(/^([A-Za-z]:)?\/|\\/)) {
throw new Error('relative path without a basedir'); throw new Error('relative path without a basedir');
} }
var xs = file.split(/\/+|\\+/); var xs = file.split(/\/+|\\+/);
for ( for (
var i = 0; var i = 0;
@ -22950,7 +22950,6 @@ var commondir = function (basedir, relfiles) {
); );
return ps.slice(0, i); return ps.slice(0, i);
}, files[0].split(/\/+|\\+/)); }, files[0].split(/\/+|\\+/));
// Windows correctly handles paths with forward-slashes // Windows correctly handles paths with forward-slashes
return res.length > 1 ? res.join('/') : '/' return res.length > 1 ? res.join('/') : '/'
}; };
@ -42228,7 +42227,7 @@ async function createPluginContainer({ plugins, logger, root, build: { rollupOpt
errLocation = numberToPos(ctx._activeCode, pos); errLocation = numberToPos(ctx._activeCode, pos);
} }
catch (err2) { catch (err2) {
logger.error(source.red(`Error in error handler:\n${err2.stack || err2.message}\n`), logger.error(source.red(`Error in error handler:\n${err2.stack || err2.message}\n`),
// print extra newline to separate the two errors // print extra newline to separate the two errors
{ error: err2 }); { error: err2 });
throw err; throw err;
@ -53717,7 +53716,7 @@ common.setupOutgoing = function(outgoing, options, req, forward) {
if (options.auth) { if (options.auth) {
outgoing.auth = options.auth; outgoing.auth = options.auth;
} }
if (options.ca) { if (options.ca) {
outgoing.ca = options.ca; outgoing.ca = options.ca;
} }
@ -55234,12 +55233,12 @@ var httpProxy$1 = ProxyServer;
/*! /*!
* Caron dimonio, con occhi di bragia * Caron dimonio, con occhi di bragia
* loro accennando, tutte le raccoglie; * loro accennando, tutte le raccoglie;
* batte col remo qualunque s’adagia * batte col remo qualunque s’adagia
* *
* Charon the demon, with the eyes of glede, * Charon the demon, with the eyes of glede,
* Beckoning to them, collects them all together, * Beckoning to them, collects them all together,
* Beats with his oar whoever lags behind * Beats with his oar whoever lags behind
* *
* Dante - The Divine Comedy (Canto III) * Dante - The Divine Comedy (Canto III)
*/ */
@ -56829,7 +56828,7 @@ function transformMiddleware(server) {
!((_a = req.url) === null || _a === void 0 ? void 0 : _a.startsWith(CLIENT_PUBLIC_PATH)) && !((_a = req.url) === null || _a === void 0 ? void 0 : _a.startsWith(CLIENT_PUBLIC_PATH)) &&
!((_b = req.url) === null || _b === void 0 ? void 0 : _b.includes('vite/dist/client'))) { !((_b = req.url) === null || _b === void 0 ? void 0 : _b.includes('vite/dist/client'))) {
// missing dep pending reload, hold request until reload happens // missing dep pending reload, hold request until reload happens
server._pendingReload.then(() => server._pendingReload.then(() =>
// If the refresh has not happened after timeout, Vite considers // If the refresh has not happened after timeout, Vite considers
// something unexpected has happened. In this case, Vite // something unexpected has happened. In this case, Vite
// returns an empty response that will error. // returns an empty response that will error.
@ -56903,7 +56902,7 @@ function transformMiddleware(server) {
const type = isDirectCSSRequest(url) ? 'css' : 'js'; const type = isDirectCSSRequest(url) ? 'css' : 'js';
const isDep = DEP_VERSION_RE.test(url) || const isDep = DEP_VERSION_RE.test(url) ||
(cacheDirPrefix && url.startsWith(cacheDirPrefix)); (cacheDirPrefix && url.startsWith(cacheDirPrefix));
return send$1(req, res, result.code, type, result.etag, return send$1(req, res, result.code, type, result.etag,
// allow browser to cache npm deps! // allow browser to cache npm deps!
isDep ? 'max-age=31536000,immutable' : 'no-cache', result.map); isDep ? 'max-age=31536000,immutable' : 'no-cache', result.map);
} }
@ -56977,14 +56976,14 @@ const devHtmlHook = async (html, { path: htmlPath, server, originalUrl }) => {
processNodeUrl(src, s, config, htmlPath, originalUrl); processNodeUrl(src, s, config, htmlPath, originalUrl);
} }
else if (isModule) { else if (isModule) {
const url = filePath.replace(config.root, ''); const url = filePath.replace(normalizePath$4(config.root), '');
const contents = node.children const contents = node.children
.map((child) => child.content || '') .map((child) => child.content || '')
.join(''); .join('');
// add HTML Proxy to Map // add HTML Proxy to Map
addToHTMLProxyCache(config, url, scriptModuleIndex, contents); addToHTMLProxyCache(config, url, scriptModuleIndex, contents);
// inline js module. convert to src="proxy" // inline js module. convert to src="proxy"
s.overwrite(node.loc.start.offset, node.loc.end.offset, `<script type="module" src="${config.base + url.slice(1)}?html-proxy&index=${scriptModuleIndex}.js"></script>`); s.overwrite(node.loc.start.offset, node.loc.end.offset, `<script type="module" src="${filePath}?html-proxy&index=${scriptModuleIndex}.js"></script>`);
} }
} }
// elements with [href/src] attrs // elements with [href/src] attrs
@ -60349,155 +60348,155 @@ var ansiStyles = {exports: {}};
var conversions$2 = {exports: {}}; var conversions$2 = {exports: {}};
var colorName = { var colorName = {
"aliceblue": [240, 248, 255], "aliceblue": [240, 248, 255],
"antiquewhite": [250, 235, 215], "antiquewhite": [250, 235, 215],
"aqua": [0, 255, 255], "aqua": [0, 255, 255],
"aquamarine": [127, 255, 212], "aquamarine": [127, 255, 212],
"azure": [240, 255, 255], "azure": [240, 255, 255],
"beige": [245, 245, 220], "beige": [245, 245, 220],
"bisque": [255, 228, 196], "bisque": [255, 228, 196],
"black": [0, 0, 0], "black": [0, 0, 0],
"blanchedalmond": [255, 235, 205], "blanchedalmond": [255, 235, 205],
"blue": [0, 0, 255], "blue": [0, 0, 255],
"blueviolet": [138, 43, 226], "blueviolet": [138, 43, 226],
"brown": [165, 42, 42], "brown": [165, 42, 42],
"burlywood": [222, 184, 135], "burlywood": [222, 184, 135],
"cadetblue": [95, 158, 160], "cadetblue": [95, 158, 160],
"chartreuse": [127, 255, 0], "chartreuse": [127, 255, 0],
"chocolate": [210, 105, 30], "chocolate": [210, 105, 30],
"coral": [255, 127, 80], "coral": [255, 127, 80],
"cornflowerblue": [100, 149, 237], "cornflowerblue": [100, 149, 237],
"cornsilk": [255, 248, 220], "cornsilk": [255, 248, 220],
"crimson": [220, 20, 60], "crimson": [220, 20, 60],
"cyan": [0, 255, 255], "cyan": [0, 255, 255],
"darkblue": [0, 0, 139], "darkblue": [0, 0, 139],
"darkcyan": [0, 139, 139], "darkcyan": [0, 139, 139],
"darkgoldenrod": [184, 134, 11], "darkgoldenrod": [184, 134, 11],
"darkgray": [169, 169, 169], "darkgray": [169, 169, 169],
"darkgreen": [0, 100, 0], "darkgreen": [0, 100, 0],
"darkgrey": [169, 169, 169], "darkgrey": [169, 169, 169],
"darkkhaki": [189, 183, 107], "darkkhaki": [189, 183, 107],
"darkmagenta": [139, 0, 139], "darkmagenta": [139, 0, 139],
"darkolivegreen": [85, 107, 47], "darkolivegreen": [85, 107, 47],
"darkorange": [255, 140, 0], "darkorange": [255, 140, 0],
"darkorchid": [153, 50, 204], "darkorchid": [153, 50, 204],
"darkred": [139, 0, 0], "darkred": [139, 0, 0],
"darksalmon": [233, 150, 122], "darksalmon": [233, 150, 122],
"darkseagreen": [143, 188, 143], "darkseagreen": [143, 188, 143],
"darkslateblue": [72, 61, 139], "darkslateblue": [72, 61, 139],
"darkslategray": [47, 79, 79], "darkslategray": [47, 79, 79],
"darkslategrey": [47, 79, 79], "darkslategrey": [47, 79, 79],
"darkturquoise": [0, 206, 209], "darkturquoise": [0, 206, 209],
"darkviolet": [148, 0, 211], "darkviolet": [148, 0, 211],
"deeppink": [255, 20, 147], "deeppink": [255, 20, 147],
"deepskyblue": [0, 191, 255], "deepskyblue": [0, 191, 255],
"dimgray": [105, 105, 105], "dimgray": [105, 105, 105],
"dimgrey": [105, 105, 105], "dimgrey": [105, 105, 105],
"dodgerblue": [30, 144, 255], "dodgerblue": [30, 144, 255],
"firebrick": [178, 34, 34], "firebrick": [178, 34, 34],
"floralwhite": [255, 250, 240], "floralwhite": [255, 250, 240],
"forestgreen": [34, 139, 34], "forestgreen": [34, 139, 34],
"fuchsia": [255, 0, 255], "fuchsia": [255, 0, 255],
"gainsboro": [220, 220, 220], "gainsboro": [220, 220, 220],
"ghostwhite": [248, 248, 255], "ghostwhite": [248, 248, 255],
"gold": [255, 215, 0], "gold": [255, 215, 0],
"goldenrod": [218, 165, 32], "goldenrod": [218, 165, 32],
"gray": [128, 128, 128], "gray": [128, 128, 128],
"green": [0, 128, 0], "green": [0, 128, 0],
"greenyellow": [173, 255, 47], "greenyellow": [173, 255, 47],
"grey": [128, 128, 128], "grey": [128, 128, 128],
"honeydew": [240, 255, 240], "honeydew": [240, 255, 240],
"hotpink": [255, 105, 180], "hotpink": [255, 105, 180],
"indianred": [205, 92, 92], "indianred": [205, 92, 92],
"indigo": [75, 0, 130], "indigo": [75, 0, 130],
"ivory": [255, 255, 240], "ivory": [255, 255, 240],
"khaki": [240, 230, 140], "khaki": [240, 230, 140],
"lavender": [230, 230, 250], "lavender": [230, 230, 250],
"lavenderblush": [255, 240, 245], "lavenderblush": [255, 240, 245],
"lawngreen": [124, 252, 0], "lawngreen": [124, 252, 0],
"lemonchiffon": [255, 250, 205], "lemonchiffon": [255, 250, 205],
"lightblue": [173, 216, 230], "lightblue": [173, 216, 230],
"lightcoral": [240, 128, 128], "lightcoral": [240, 128, 128],
"lightcyan": [224, 255, 255], "lightcyan": [224, 255, 255],
"lightgoldenrodyellow": [250, 250, 210], "lightgoldenrodyellow": [250, 250, 210],
"lightgray": [211, 211, 211], "lightgray": [211, 211, 211],
"lightgreen": [144, 238, 144], "lightgreen": [144, 238, 144],
"lightgrey": [211, 211, 211], "lightgrey": [211, 211, 211],
"lightpink": [255, 182, 193], "lightpink": [255, 182, 193],
"lightsalmon": [255, 160, 122], "lightsalmon": [255, 160, 122],
"lightseagreen": [32, 178, 170], "lightseagreen": [32, 178, 170],
"lightskyblue": [135, 206, 250], "lightskyblue": [135, 206, 250],
"lightslategray": [119, 136, 153], "lightslategray": [119, 136, 153],
"lightslategrey": [119, 136, 153], "lightslategrey": [119, 136, 153],
"lightsteelblue": [176, 196, 222], "lightsteelblue": [176, 196, 222],
"lightyellow": [255, 255, 224], "lightyellow": [255, 255, 224],
"lime": [0, 255, 0], "lime": [0, 255, 0],
"limegreen": [50, 205, 50], "limegreen": [50, 205, 50],
"linen": [250, 240, 230], "linen": [250, 240, 230],
"magenta": [255, 0, 255], "magenta": [255, 0, 255],
"maroon": [128, 0, 0], "maroon": [128, 0, 0],
"mediumaquamarine": [102, 205, 170], "mediumaquamarine": [102, 205, 170],
"mediumblue": [0, 0, 205], "mediumblue": [0, 0, 205],
"mediumorchid": [186, 85, 211], "mediumorchid": [186, 85, 211],
"mediumpurple": [147, 112, 219], "mediumpurple": [147, 112, 219],
"mediumseagreen": [60, 179, 113], "mediumseagreen": [60, 179, 113],
"mediumslateblue": [123, 104, 238], "mediumslateblue": [123, 104, 238],
"mediumspringgreen": [0, 250, 154], "mediumspringgreen": [0, 250, 154],
"mediumturquoise": [72, 209, 204], "mediumturquoise": [72, 209, 204],
"mediumvioletred": [199, 21, 133], "mediumvioletred": [199, 21, 133],
"midnightblue": [25, 25, 112], "midnightblue": [25, 25, 112],
"mintcream": [245, 255, 250], "mintcream": [245, 255, 250],
"mistyrose": [255, 228, 225], "mistyrose": [255, 228, 225],
"moccasin": [255, 228, 181], "moccasin": [255, 228, 181],
"navajowhite": [255, 222, 173], "navajowhite": [255, 222, 173],
"navy": [0, 0, 128], "navy": [0, 0, 128],
"oldlace": [253, 245, 230], "oldlace": [253, 245, 230],
"olive": [128, 128, 0], "olive": [128, 128, 0],
"olivedrab": [107, 142, 35], "olivedrab": [107, 142, 35],
"orange": [255, 165, 0], "orange": [255, 165, 0],
"orangered": [255, 69, 0], "orangered": [255, 69, 0],
"orchid": [218, 112, 214], "orchid": [218, 112, 214],
"palegoldenrod": [238, 232, 170], "palegoldenrod": [238, 232, 170],
"palegreen": [152, 251, 152], "palegreen": [152, 251, 152],
"paleturquoise": [175, 238, 238], "paleturquoise": [175, 238, 238],
"palevioletred": [219, 112, 147], "palevioletred": [219, 112, 147],
"papayawhip": [255, 239, 213], "papayawhip": [255, 239, 213],
"peachpuff": [255, 218, 185], "peachpuff": [255, 218, 185],
"peru": [205, 133, 63], "peru": [205, 133, 63],
"pink": [255, 192, 203], "pink": [255, 192, 203],
"plum": [221, 160, 221], "plum": [221, 160, 221],
"powderblue": [176, 224, 230], "powderblue": [176, 224, 230],
"purple": [128, 0, 128], "purple": [128, 0, 128],
"rebeccapurple": [102, 51, 153], "rebeccapurple": [102, 51, 153],
"red": [255, 0, 0], "red": [255, 0, 0],
"rosybrown": [188, 143, 143], "rosybrown": [188, 143, 143],
"royalblue": [65, 105, 225], "royalblue": [65, 105, 225],
"saddlebrown": [139, 69, 19], "saddlebrown": [139, 69, 19],
"salmon": [250, 128, 114], "salmon": [250, 128, 114],
"sandybrown": [244, 164, 96], "sandybrown": [244, 164, 96],
"seagreen": [46, 139, 87], "seagreen": [46, 139, 87],
"seashell": [255, 245, 238], "seashell": [255, 245, 238],
"sienna": [160, 82, 45], "sienna": [160, 82, 45],
"silver": [192, 192, 192], "silver": [192, 192, 192],
"skyblue": [135, 206, 235], "skyblue": [135, 206, 235],
"slateblue": [106, 90, 205], "slateblue": [106, 90, 205],
"slategray": [112, 128, 144], "slategray": [112, 128, 144],
"slategrey": [112, 128, 144], "slategrey": [112, 128, 144],
"snow": [255, 250, 250], "snow": [255, 250, 250],
"springgreen": [0, 255, 127], "springgreen": [0, 255, 127],
"steelblue": [70, 130, 180], "steelblue": [70, 130, 180],
"tan": [210, 180, 140], "tan": [210, 180, 140],
"teal": [0, 128, 128], "teal": [0, 128, 128],
"thistle": [216, 191, 216], "thistle": [216, 191, 216],
"tomato": [255, 99, 71], "tomato": [255, 99, 71],
"turquoise": [64, 224, 208], "turquoise": [64, 224, 208],
"violet": [238, 130, 238], "violet": [238, 130, 238],
"wheat": [245, 222, 179], "wheat": [245, 222, 179],
"white": [255, 255, 255], "white": [255, 255, 255],
"whitesmoke": [245, 245, 245], "whitesmoke": [245, 245, 245],
"yellow": [255, 255, 0], "yellow": [255, 255, 0],
"yellowgreen": [154, 205, 50] "yellowgreen": [154, 205, 50]
}; };
/* MIT license */ /* MIT license */
@ -65840,7 +65839,7 @@ IndexedSourceMapConsumer.prototype.sourceContentFor =
* and an object is returned with the following properties: * and an object is returned with the following properties:
* *
* - line: The line number in the generated source, or null. The * - line: The line number in the generated source, or null. The
* line number is 1-based. * line number is 1-based.
* - column: The column number in the generated source, or null. * - column: The column number in the generated source, or null.
* The column number is 0-based. * The column number is 0-based.
*/ */
@ -67332,7 +67331,7 @@ function importAnalysisPlugin(config) {
return [url, resolved.id]; return [url, resolved.id];
}; };
for (let index = 0; index < imports.length; index++) { for (let index = 0; index < imports.length; index++) {
const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex,
// #2083 User may use escape path, // #2083 User may use escape path,
// so use imports[index].n to get the unescaped string // so use imports[index].n to get the unescaped string
// @ts-ignore // @ts-ignore