Skip to content

Commit bd47806

Browse files
committed
Merge branch 'main' into deploy-stage
2 parents 36905a3 + 44be051 commit bd47806

10 files changed

Lines changed: 47 additions & 21 deletions

File tree

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,10 @@
4646
"rehype-highlight": "^7.0.0",
4747
"remark-gfm": "^4.0.0",
4848
"scroll-behavior-polyfill": "^2.0.13",
49-
"shopify-buy": "^2.21.1",
49+
"shopify-buy": "^2.22.0",
5050
"solid-dismiss": "^1.7.122",
5151
"solid-heroicons": "<3.0.0",
5252
"solid-js": "1.8.16",
53-
"solid-meta": "^0.28.1",
5453
"solid-repl": "^0.25.0",
5554
"solid-social": "^0.9.6",
5655
"solid-transition-group": "^0.2.3",

pnpm-lock.yaml

Lines changed: 5 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
213 KB
Loading
Lines changed: 8 additions & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
The Solid Core Team, Solid DX Team as well as our generous corporate sponsors [Netlify](https://www.netlify.com)
2+
and [Sentry](https://sentry.io/) are proud to announce the continuation of SolidHack.
3+
4+
The inaugral SolidHack event was so successful that we decided to bring it back this
5+
year. A lot has changed since the previous event. Solid and the ecosystem have matured
6+
considerably and SolidStart is now 1.0. It's an ideal time to be working with Solid!
7+
We're giving the talented developers in our community an incredible opportunity to
8+
show what they got and win prize money.
9+
10+
Additional contest details regarding the event will be announced October 1st. Visit the
11+
[SolidHack website](https://hack.solidjs.com/) to learn more!

src/pages/Blog.data.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,15 @@ export const list: { [key: string]: BlogInfo } = {
100100
date: 1716308491000,
101101
body: async () => await import('./Articles/solid-start-the-shape-frameworks-to-come.mdx'),
102102
},
103+
'solidhack-2024-announcement': {
104+
img: '/img/blog/solidhack-2024-announcement/header.jpeg',
105+
title: 'SolidHack 2024 Announcement',
106+
description: 'Official SolidStart Version 1.0 release announcement.',
107+
author: 'SolidJS Core',
108+
author_url: 'https://www.solidjs.com',
109+
date: 1725403091000,
110+
body: async () => await import('./Articles/solidhack-2024-announcement.mdx'),
111+
},
103112
};
104113

105114
export interface BlogData {

src/pages/Resources/Utilities.data.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2557,6 +2557,17 @@ const utilities: Array<Resource> = [
25572557
type: PackageType.Package,
25582558
categories: [ResourceCategory.Starters, ResourceCategory.BuildUtilities],
25592559
},
2560+
{
2561+
link: 'https://github.com/pdfslick/pdfslick',
2562+
title: '@pdfslick/solid',
2563+
description: 'View and Interact with PDF documents in React, SolidJS, Svelte and JavaScript apps',
2564+
author: 'PDFSlick',
2565+
author_url: 'https://github.com/pdfslick/',
2566+
keywords: ['pdf', 'viewer'],
2567+
official: false,
2568+
type: PackageType.Package,
2569+
categories: [ResourceCategory.Starters, ResourceCategory.BuildUtilities],
2570+
},
25602571
];
25612572

25622573
export default utilities;

src/pages/Store.data.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export const StoreData: RouteLoadFunc = () => {
2525
},
2626
),
2727
);
28-
createEffect(() => console.log(collection()));
2928
return {
3029
get commerce() {
3130
return commerce;

src/utils/shopify.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ export const createCollection = (
224224
language: options.language,
225225
});
226226
const [products, { refetch }] = createResource(collectionId, async (id) =>
227-
client.collection.fetchWithProducts(id),
227+
client.collection.fetchWithProducts(id, { productsFirst: 100 }),
228228
);
229229
return [products, refetch];
230230
};

0 commit comments

Comments
 (0)