Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"error",
{ "allowSeparatedGroups": true, "ignoreDeclarationSort": true }
],
"oxc/no-rest-spread-properties": "off",
"import/consistent-type-specifier-style": "off",
"import/exports-last": "off",
"import/group-exports": "off",
Expand Down
4 changes: 2 additions & 2 deletions packages/graphql/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ const fillOptions = (opt: YogaServerOptions): Required<YogaServerOptions> => ({
opt?.origins ??
new Set([
"https://drfed.org",
"http://localhost:5173",
"http://0.0.0.0:5173",
"http://localhost:3000",
"http://0.0.0.0:3000",
]),
});

Expand Down
8 changes: 4 additions & 4 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
},
"dependencies": {
"@solidjs/meta": "^0.29.4",
"@solidjs/router": "^0.15.0",
"@solidjs/start": "2.0.0-alpha.2",
"@solidjs/vite-plugin-nitro-2": "^0.1.0",
"@solidjs/router": "^1.0.0",
"@solidjs/start": "^2.0.0",
"nitro": "3.0.260610-beta",
"relay-runtime": "^21.0.1",
"solid-js": "^1.9.5",
"solid-relay": "1.0.0-beta.27",
"vite": "^7.0.0"
"vite": "^8.2.0"
Comment thread
dodok8 marked this conversation as resolved.
},
"devDependencies": {
"@faker-js/faker": "^10.5.0",
Expand Down
7 changes: 5 additions & 2 deletions packages/web/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

import { solidStart } from "@solidjs/start/config";
import { nitroV2Plugin as nitro } from "@solidjs/vite-plugin-nitro-2";
import { nitro } from "nitro/vite";
import { defineConfig } from "vite";
import { cjsInterop } from "vite-plugin-cjs-interop";
import relay from "vite-plugin-relay-lite";
Expand All @@ -25,6 +25,9 @@ export default defineConfig(({ command }) => ({
solidStart(),
nitro(),
relay({ codegen: command !== "build" }),
cjsInterop({ dependencies: ["relay-runtime"] }),
{
...cjsInterop({ dependencies: ["relay-runtime"] }),
applyToEnvironment: (environment) => environment.name === "ssr",
},
Comment on lines +28 to +31

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about use perEnvironmentPlugin?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there are not many states between current setting, so I think using enviroment callback simply enough.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However, I change detect method more accurately, 15e3339

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

15e3339 causes error with nitro/vite, so I rested it.

],
}));
Loading