Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-31 23:31:30 -05:00
Code Issues Activity

feat: simplifies sync paths (#11730)

Browse source
This commit is contained in:
Florian Lefebvre 2024-08-16 09:27:21 +02:00 • committed by GitHub
parent 423614ebb6
commit 2df49a6fb4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/spicy-houses-fry.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Simplifies path operations of `astro sync`

12
packages/astro/src/core/sync/write-files.ts
View file

@ -2,11 +2,11 @@ import type fsMod from 'node:fs';
import { dirname, relative } from 'node:path';
import { fileURLToPath } from 'node:url';
import { bold } from 'kleur/colors';
import { normalizePath } from 'vite';
import type { AstroSettings } from '../../@types/astro.js';
import { AstroError, AstroErrorData } from '../errors/index.js';
import type { Logger } from '../logger/core.js';
import { REFERENCE_FILE } from './constants.js';
import { normalizePath } from 'vite';
export async function writeFiles(settings: AstroSettings, fs: typeof fsMod, logger: Logger) {
try {
@ -27,7 +27,7 @@ function writeInjectedTypes(settings: AstroSettings, fs: typeof fsMod) {
const references: Array<string> = [];
for (const { filename, content } of settings.injectedTypes) {
const filepath = normalizePath(fileURLToPath(new URL(filename, settings.dotAstroDir)));
const filepath = fileURLToPath(new URL(filename, settings.dotAstroDir));
fs.mkdirSync(dirname(filepath), { recursive: true });
fs.writeFileSync(filepath, content, 'utf-8');
references.push(normalizePath(relative(fileURLToPath(settings.dotAstroDir), filepath)));
@ -38,17 +38,15 @@ function writeInjectedTypes(settings: AstroSettings, fs: typeof fsMod) {
fs.mkdirSync(settings.dotAstroDir, { recursive: true });
}
fs.writeFileSync(
normalizePath(fileURLToPath(new URL(REFERENCE_FILE, settings.dotAstroDir))),
fileURLToPath(new URL(REFERENCE_FILE, settings.dotAstroDir)),
astroDtsContent,
'utf-8',
);
}
async function setUpEnvTs(settings: AstroSettings, fs: typeof fsMod, logger: Logger) {
const envTsPath = normalizePath(fileURLToPath(new URL('env.d.ts', settings.config.srcDir)));
const envTsPathRelativetoRoot = normalizePath(
relative(fileURLToPath(settings.config.root), envTsPath),
);
const envTsPath = fileURLToPath(new URL('env.d.ts', settings.config.srcDir));
const envTsPathRelativetoRoot = relative(fileURLToPath(settings.config.root), envTsPath);
const relativePath = normalizePath(
relative(
fileURLToPath(settings.config.srcDir),

4
packages/astro/test/astro-sync.test.js
View file

@ -4,7 +4,6 @@ import * as fs from 'node:fs';
import { beforeEach, describe, it } from 'node:test';
import { fileURLToPath } from 'node:url';
import ts from 'typescript';
import { normalizePath } from 'vite';
import { loadFixture } from './test-utils.js';
const createFixture = () => {
@ -16,8 +15,7 @@ const createFixture = () => {
/**
* @param {string} path
*/
const getExpectedPath = (path) =>
normalizePath(fileURLToPath(new URL(path, astroFixture.config.root)));
const getExpectedPath = (path) => fileURLToPath(new URL(path, astroFixture.config.root));
return {
/** @param {string} root */

5
packages/astro/test/units/dev/collections-renderentry.test.js
View file

@ -1,5 +1,4 @@
import * as assert from 'node:assert/strict';
import os from 'node:os';
import { describe, it } from 'node:test';
import { fileURLToPath } from 'node:url';
import * as cheerio from 'cheerio';
@ -9,8 +8,6 @@ import { createFsWithFallback, createRequestAndResponse, runInContainer } from '
const root = new URL('../../fixtures/content/', import.meta.url);
const _describe = os.platform() === 'win32' ? describe.skip : describe;
/** @type {typeof runInContainer} */
async function runInContainerWithContentListeners(params, callback) {
return await runInContainer(params, async (container) => {
@ -19,7 +16,7 @@ async function runInContainerWithContentListeners(params, callback) {
});
}
_describe('Content Collections - render()', () => {
describe('Content Collections - render()', () => {
it('can be called in a page component', async () => {
const fs = createFsWithFallback(
{