Skip to content

Commit

Permalink
Merge pull request #98 from huskynz/dev
Browse files Browse the repository at this point in the history
Upgrade to Astro 5.1.1 and Upgrade Yarn off 1.x to 4.x
  • Loading branch information
Husky-Devel authored Dec 27, 2024
2 parents 47850c0 + 4803c11 commit d216346
Show file tree
Hide file tree
Showing 8 changed files with 14,313 additions and 158,367 deletions.
Binary file added .yarn/install-state.gz
Binary file not shown.
148,049 changes: 0 additions & 148,049 deletions .yarn/releases/yarn-1.22.22.cjs

This file was deleted.

5 changes: 0 additions & 5 deletions .yarnrc

This file was deleted.

1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ ENV PUPPETEER_SKIP_DOWNLOAD=TRUE
# Install any needed system dependencies for the build
RUN apt-get update && \
apt-get install -y --no-install-recommends \
python3 \
build-essential && \
rm -rf /var/lib/apt/lists/*

# Install dependencies
RUN corepack enable
RUN yarn set version berry
RUN yarn --version
COPY package.json yarn.lock ./
RUN yarn install --frozen-lockfile

RUN echo "nodeLinker: node-modules" >> .yarnrc.yml && \
yarn install --immutable
# Build the app
COPY . .
RUN mv astro.config.mjs.docker astro.config.mjs && \
Expand Down
24 changes: 13 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
"sentry:sourcemaps": "sentry-cli sourcemaps inject --org huskynz --project javascript ./dist && sentry-cli sourcemaps upload --org huskynz --project javascript ./dist"
},
"dependencies": {
"@astrojs/check": "^0.5.6",
"@astrojs/mdx": "^2.1.1",
"@astrojs/netlify": "^5.5.0",
"@astrojs/node": "^8.3.3",
"@astrojs/react": "^3.6.2",
"@astrojs/rss": "^4.0.5",
"@astrojs/sitemap": "^3.1.1",
"@astrojs/solid-js": "^4.0.1",
"@astrojs/tailwind": "^5.1.0",
"@astrojs/check": "0.9.4",
"@astrojs/mdx": "4.0.3",
"@astrojs/netlify": "6.0.1",
"@astrojs/node": "9.0.0",
"@astrojs/react": "4.1.2",
"@astrojs/rss": "4.0.10",
"@astrojs/sitemap": "3.2.1",
"@astrojs/solid-js": "5.0.1",
"@astrojs/tailwind": "5.1.4",
"@astrojs/upgrade": "^0.4.2",
"@aws-sdk/client-s3": "^3.679.0",
"@azure/cosmos": "^4.1.1",
"@azure/storage-blob": "^12.24.0",
Expand All @@ -32,7 +33,7 @@
"@types/nodemailer": "^6.4.15",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"astro": "^4.4.13",
"astro": "5.1.1",
"astro-diagram": "^0.7.0",
"astro-useragent": "^4.0.2",
"aws-sdk": "^2.1691.0",
Expand All @@ -59,5 +60,6 @@
},
"devDependencies": {
"jest": "^29.7.0"
}
},
"packageManager": "[email protected]"
}
6 changes: 6 additions & 0 deletions src/components/TimelineSkills.astro
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ const timeline: TimelineEvent[] = [
"Deployed a new version of www.husky.nz using TypeScript and Astro.js (This site)",
"Had some fun developing https://legacy.husky.nz witch is a website built with HTML3.0 no CSS and no JavaScript",
]
},
{
year: "2025",
events: [
"More to come"
]
}
];
---
Expand Down
Loading

0 comments on commit d216346

Please sign in to comment.