Skip to content

Commit

Permalink
config: move to moduleResolution: 'bundler'
Browse files Browse the repository at this point in the history
  • Loading branch information
Princesseuh committed Jul 25, 2023
1 parent c80d1dc commit 3da022b
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/data/wiki.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { getBaseSiteURL, getURLFromEntry } from "$utils";
import { CollectionEntry, getCollection } from "astro:content";
import { getCollection, type CollectionEntry } from "astro:content";
import { execSync } from "child_process";
import type { MenuItem } from "./sidebarMenu";
import { WikiCategory, wikiCategories } from "./wikiCategories";
import { wikiCategories, type WikiCategory } from "./wikiCategories";

const gitInfoRaw = execSync("bash ./scripts/getLastModified.sh").toString().split(";").slice(0, -1);
const gitInfo = gitInfoRaw.map((info) => {
Expand Down
1 change: 0 additions & 1 deletion src/imageService.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { getBaseSiteURL } from "$utils";
import type { LocalImageService } from "astro";
// @ts-expect-error Can't get types here without using moduleResolution: node-next
import sharpService from "astro/assets/services/sharp";
import { readFileSync } from "fs";
import sharp from "sharp";
Expand Down
2 changes: 1 addition & 1 deletion src/pages/articles/[...page].astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ArticleLayout from "$layouts/ArticleLayout.astro";
import ArticleListLayout from "$layouts/ArticleListLayout.astro";
import { blogDateSort } from "$utils";
import type { GetStaticPaths, Page } from "astro";
import { CollectionEntry, getCollection } from "astro:content";
import { getCollection, type CollectionEntry } from "astro:content";
export const getStaticPaths = (async ({ paginate }) => {
const blogCollection = await getCollection("blog");
Expand Down
2 changes: 1 addition & 1 deletion src/pages/articles/tags/[tag]/[...page].astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import ArticleListLayout from "$layouts/ArticleListLayout.astro";
import { blogDateSort } from "$utils";
import type { GetStaticPaths, Page } from "astro";
import { CollectionEntry, getCollection } from "astro:content";
import { getCollection, type CollectionEntry } from "astro:content";
export const getStaticPaths: GetStaticPaths = async ({ paginate }) => {
const articles = await getCollection("blog");
Expand Down
2 changes: 1 addition & 1 deletion src/pages/articles/years/[year]/[...page].astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import ArticleListLayout from "$layouts/ArticleListLayout.astro";
import { blogDateSort } from "$utils";
import type { GetStaticPaths, Page } from "astro";
import { CollectionEntry, getCollection } from "astro:content";
import { getCollection, type CollectionEntry } from "astro:content";
export const getStaticPaths = (async ({ paginate }) => {
const articles = await getCollection("blog");
Expand Down
2 changes: 1 addition & 1 deletion src/pages/catalogue.json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const get = (async () => {
const shows = await getCollection("shows");
const processedMoviesAndShows = await Promise.all(
[...shows, ...movies].map(async (movieOrShow) => {
const { imdb, cover, ...movieData } = movieOrShow.data;
const { tmdb, cover, ...movieData } = movieOrShow.data;
const [processedCover, placeholderURL] = await getCoverAndPlaceholder(cover);

const metadata = await getCatalogueData(movieOrShow);
Expand Down
4 changes: 2 additions & 2 deletions src/pages/catalogue/[type]/[slug].astro
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
import { allCatalogueTypes, getCatalogueData } from "$data/catalogue";
import { getCatalogueData, type allCatalogueTypes } from "$data/catalogue";
import BaseLayout from "$layouts/BaseLayout.astro";
import type { GetStaticPaths } from "astro";
import { getImage } from "astro:assets";
import { CollectionEntry, getCollection } from "astro:content";
import { getCollection, type CollectionEntry } from "astro:content";
export const getStaticPaths = (async () => {
let catalogueContent: allCatalogueTypes[] = [];
Expand Down
2 changes: 1 addition & 1 deletion src/pages/changelog.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import TableOfContent from "$components/shared/TableOfContent.astro";
import { Changelog, getChangelog } from "$data/changelog";
import { getChangelog, type Changelog } from "$data/changelog";
import BaseLayout from "$layouts/BaseLayout.astro";
import { monthYearDate } from "$utils";
import { slug } from "github-slugger";
Expand Down
2 changes: 1 addition & 1 deletion src/pages/projects.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import Image from "$components/Image.astro";
import BaseLayout from "$layouts/BaseLayout.astro";
import { getURLFromEntry } from "$utils";
import { CollectionEntry, getCollection } from "astro:content";
import { getCollection, type CollectionEntry } from "astro:content";
const projects = await getCollection("projects");
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "astro/tsconfigs/strictest",
"compilerOptions": {
"baseUrl": ".",
"moduleResolution": "Bundler",
"paths": {
"$components/*": ["src/components/*"],
"$data/*": ["src/data/*"],
Expand Down

0 comments on commit 3da022b

Please sign in to comment.