Skip to content

Commit

Permalink
Merge branch 'main' into replicate-1801
Browse files Browse the repository at this point in the history
  • Loading branch information
brenelz committed Feb 16, 2025
2 parents e2caa71 + 9b6ba7f commit ca34d77
Show file tree
Hide file tree
Showing 10 changed files with 113 additions and 23 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/close-issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# CronJob
name: ⏱️ Issue Close Require

on:
schedule:
- cron: "0 0 * * *"

jobs:
close-issues:
if: github.repository == 'solidjs/solid-start'
runs-on: ubuntu-latest
steps:
- name: needs reproduction
uses: actions-cool/issues-helper@v3
with:
actions: "close-issues"
token: ${{ secrets.GITHUB_TOKEN }}
labels: "needs reproduction"
inactive-day: 3
2 changes: 1 addition & 1 deletion .github/workflows/compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ jobs:
allcontributors[bot]
renovate
renovate[bot]
ignore-team-members: false
ignore-team-members: true
30 changes: 30 additions & 0 deletions .github/workflows/issue-labelled.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: 🔖 Issue Labelled

on:
issues:
types: [labeled]

jobs:
reply-labeled:
if: github.repository == 'vitejs/vite'
runs-on: ubuntu-latest
steps:
- name: contribution welcome
if: github.event.label.name == 'contribution welcome' || github.event.label.name == 'help wanted' || github.event.label.name == 'good first issue'
uses: actions-cool/issues-helper@v3
with:
actions: "remove-labels"
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
labels: "pending triage, needs reproduction"

- name: needs reproduction
if: github.event.label.name == 'needs reproduction'
uses: actions-cool/issues-helper@v3
with:
actions: "create-comment, remove-labels"
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
body: |
Hello @${{ github.event.issue.user.login }}. Please provide a [minimal reproduction](https://stackoverflow.com/help/minimal-reproducible-example) using a GitHub repository or [StackBlitz](https://stackblitz.com/). Issues marked with `needs reproduction` will be closed if they have no activity within 3 days.
labels: "pending triage"
8 changes: 8 additions & 0 deletions packages/start/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @solidjs/start

## 1.1.1

### Patch Changes

- efd762e: Bump tanstack server functions plugin
This fixes `export const` in top-level `"use server"` files.
The bundler warning for top-level `"use server"` is still there, but still code-removal works.

## 1.1.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/start/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@solidjs/start",
"version": "1.1.0",
"version": "1.1.1",
"type": "module",
"author": "Ryan Carniato",
"license": "MIT",
Expand Down
4 changes: 4 additions & 0 deletions packages/tests/cypress/e2e/server-function.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ describe("server-function", () => {
cy.visit("/is-server-nested");
cy.get("#server-fn-test").contains('{"serverFnWithIsServer":true}');
});
it("should have isServer true in the server function - const", () => {
cy.visit("/is-server-const");
cy.get("#server-fn-test").contains('{"serverFnWithIsServer":true}');
});
it("should have an id of type string in the server function meta - nested", () => {
cy.visit("/server-function-meta-nested");
cy.get("#server-fn-test").contains('{"serverFnWithMeta":"string"}');
Expand Down
3 changes: 3 additions & 0 deletions packages/tests/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export default function App() {
<li>
<a href="/is-server-nested">isserver (nested)</a>
</li>
<li>
<a href="/is-server-const">isserver (const)</a>
</li>
<li>
<a href="/is-server-toplevel">isserver (toplevel)</a>
</li>
Expand Down
7 changes: 7 additions & 0 deletions packages/tests/src/functions/use-is-server-const.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
"use server";

import { isServer } from "solid-js/web";

export const serverFnWithIsServer = async () => {
return isServer;
}
19 changes: 19 additions & 0 deletions packages/tests/src/routes/is-server-const.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { createEffect, createSignal } from "solid-js";
import { serverFnWithIsServer } from "~/functions/use-is-server-const";

export default function App() {
const [output, setOutput] = createSignal<{ serverFnWithIsServer?: boolean }>({});


createEffect(async () => {
const restult = await serverFnWithIsServer();
setOutput(prev => ({ ...prev, serverFnWithIsServer: restult }));
});


return (
<main>
<span id="server-fn-test">{JSON.stringify(output())}</span>
</main>
);
}
42 changes: 21 additions & 21 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ca34d77

Please sign in to comment.