Skip to content

Commit

Permalink
updating deps
Browse files Browse the repository at this point in the history
  • Loading branch information
wkelly17 committed Jun 13, 2024
1 parent 1ea7fc2 commit 0958b10
Show file tree
Hide file tree
Showing 13 changed files with 7,887 additions and 4,771 deletions.
2 changes: 1 addition & 1 deletion .astro/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_variables": {
"lastUpdateCheck": 1715713277913
"lastUpdateCheck": 1718299609103
}
}
28 changes: 16 additions & 12 deletions astro.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ const siteUrl = import.meta.env.PROD
: import.meta.env.DEV
? "https://read-dev.bibleineverylanguage.org"
: "";
const isDev = import.meta.env.DEV;

// https://astro.build/config
export default defineConfig({
site: siteUrl,
Expand All @@ -37,15 +39,7 @@ export default defineConfig({
strategies: "injectManifest",
registerType: "autoUpdate",
manifest: manifest,
injectManifest: {
globIgnores: [
"**/node_modules/**/*",
// Somehow or another, Vite PWA was trying to cache server build things, which resulted in a bad precaching response, which broke the build
// WK Friday January 27, 2023 05:00PM
"$server_build/*",
"$server_build/**/*"
]
},
injectManifest: {},
devOptions: {
enabled: false,
type: "module"
Expand All @@ -54,10 +48,20 @@ export default defineConfig({
})
],
vite: {
ssr: {
noExternal: ["path-to-regexp"]
},
// https://discord.com/channels/830184174198718474/1239920931510554655/1249724228794585178
/*
For anyone that might land here in the future, due to the hydration being broken in Solid it creates an unfortunate situation with an easy workaround, at least until it gets fixed in core:
In local development everytinhg will work fine by default but it won't build with the problem I described in the post, by applying a manual resolver to vite it will break the development server but the production build will work just fine, so in order to have both, in your astro.config.mjs:
last checked: June 13, 2024
*/
resolve: {
conditions: !isDev ? ["worker", "webworker"] : [],
mainFields: !isDev ? ["module"] : [],
},
plugins: [
// @ts-expect-error Not sure why error, but works for when you want tto look at bundle a little closer
visualizer({
brotliSize: true,
template: "treemap",
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Changes

## May 20, 2024
- Maintenance upgrade deps.
- Migrate from cloudflare functions to astro endpoints acc. to this set of breaking changes in the cloudflare adapter. https://github.com/withastro/adapters/blob/main/packages/cloudflare/CHANGELOG.md#1000
43 changes: 21 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"type": "module",
"version": "0.0.1",
"private": true,
"engines": {
"node": ">=18.18.0 <22.0.0"
},
"packageManager": "[email protected]",
"pnpm": {
"updateConfig": {
"ignoreDependencies": [
Expand All @@ -27,41 +25,42 @@
"lint": "astro check & npx eslint ./"
},
"dependencies": {
"@astrojs/check": "^0.5.10",
"@astrojs/cloudflare": "10.2.4",
"@astrojs/solid-js": "4.1.0",
"@astrojs/check": "^0.7.0",
"@astrojs/cloudflare": "10.4.0",
"@astrojs/solid-js": "4.3.0",
"@astrojs/tailwind": "^5.1.0",
"@kobalte/core": "^0.13.0",
"@kobalte/core": "^0.13.3",
"@solid-primitives/i18n": "^2.1.1",
"astro": "^4.7.0",
"astro": "^4.10.2",
"fflate": "^0.8.2",
"idb-keyval": "^6.2.1",
"logrocket": "^8.1.0",
"p-limit": "^5.0.0",
"solid-js": "^1.8.17",
"tailwindcss": "^3.4.3"
"solid-js": "^1.8.15",
"tailwindcss": "^3.4.4",
"vitest": "^1.6.0"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20240423.0",
"@playwright/experimental-ct-solid": "^1.43.1",
"@playwright/test": "^1.43.1",
"@cloudflare/workers-types": "^4.20240605.0",
"@playwright/experimental-ct-solid": "^1.44.1",
"@playwright/test": "^1.44.1",
"@types/workbox-sw": "^4.3.7",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"@typescript-eslint/eslint-plugin": "^7.13.0",
"@typescript-eslint/parser": "^7.13.0",
"@vite-pwa/astro": "^0.4.0",
"vitest": "^1.5.3",
"eslint": "^8.57.0",
"eslint-plugin-astro": "^1.1.1",
"eslint-plugin-astro": "^1.2.2",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-solid": "^0.14.0",
"htmlrewriter": "^0.0.7",
"prettier": "3.2.5",
"prettier-plugin-astro": "^0.13.0",
"prettier-plugin-tailwindcss": "^0.5.14",
"prettier": "3.3.2",
"prettier-plugin-astro": "^0.14.0",
"prettier-plugin-tailwindcss": "^0.6.4",
"rollup-plugin-visualizer": "^5.12.0",
"typescript": "^5.4.5",
"vite": "^5.2.10",
"vite": "^5.3.0",
"vite-plugin-pwa": "^0.20.0",
"vitest": "^1.5.3",
"workbox-cacheable-response": "^7.1.0",
"workbox-core": "^7.1.0",
"workbox-expiration": "^7.1.0",
Expand All @@ -70,7 +69,7 @@
"workbox-routing": "^7.1.0",
"workbox-strategies": "^7.1.0",
"workbox-window": "^7.1.0",
"wrangler": "^3.53.0"
"wrangler": "^3.60.2"
},
"resolutions": {
"intl-messageformat": "10.5.4"
Expand Down
5 changes: 4 additions & 1 deletion playwright-ct.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ export default defineConfig({
/* Port to use for Playwright component endpoint. */
ctPort: 3100,
ctViteConfig: {
root: ".",
resolve: {
alias: {}
alias: {
// src: path.resolve("src")
}
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const env = process.env as Record<string, string>;
*/
const config: PlaywrightTestConfig = {
testDir: "./tests",
testIgnore: "unit/**" /* covered by vitest for utils */,
testIgnore: ["unit/**", "component/**"] /* covered by vitest for utils */,
/* Maximum time one test can run for. */
timeout: 30 * 1000,
expect: {
Expand Down
Loading

0 comments on commit 0958b10

Please sign in to comment.