Skip to content

Commit dfa7923

Browse files
committed
Merge branch '2.0.0-beta' into 2.0.0-next
2 parents 0d43629 + beb2525 commit dfa7923

File tree

178 files changed

+957
-733
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+957
-733
lines changed

.github/instructions/nx.instructions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ You are in an nx workspace using Nx 21.4.0 and pnpm as the package manager.
88

99
You have access to the Nx MCP server and the tools it provides. Use them. Follow these guidelines in order to best help the user:
1010

11-
## General Guidelines
11+
# General Guidelines
1212

1313
- When answering questions, use the nx_workspace tool first to gain an understanding of the workspace architecture
1414
- For questions around nx configuration, best practices or if you're unsure, use the nx_docs tool to get relevant, up-to-date docs!! Always use this instead of assuming things about nx configuration
1515
- If the user needs help with an Nx configuration or project graph error, use the 'nx_workspace' tool to get any errors
1616
- To help answer questions about the workspace structure or simply help with demonstrating how tasks depend on each other, use the 'nx_visualize_graph' tool
1717

18-
## Generation Guidelines
18+
# Generation Guidelines
1919

2020
If the user wants to generate something, use the following flow:
2121

@@ -30,7 +30,7 @@ If the user wants to generate something, use the following flow:
3030
- read the generator log file using the 'nx_read_generator_log' tool
3131
- use the information provided in the log file to answer the user's question or continue with what they were doing
3232

33-
## Running Tasks Guidelines
33+
# Running Tasks Guidelines
3434

3535
If the user wants help with tasks or commands (which include keywords like "test", "build", "lint", or other similar actions), use the following flow:
3636

.pkgs/configs/eslint.js

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ export const typescript = tseslint.config({
9595
}, {
9696
extends: [
9797
pluginDeMorgan.configs.recommended,
98-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
9998
pluginJsdoc.configs["flat/recommended-typescript-error"],
10099
pluginRegexp.configs["flat/recommended"],
101100
pluginPerfectionist.configs["recommended-natural"],
@@ -112,32 +111,8 @@ export const typescript = tseslint.config({
112111
"@stylistic/no-multi-spaces": ["warn"],
113112
"@stylistic/operator-linebreak": "off",
114113
"@stylistic/quote-props": ["error", "as-needed"],
115-
"perfectionist/sort-exports": ["warn", { type: "natural", order: "asc" }],
116-
"perfectionist/sort-imports": ["warn", {
117-
type: "natural",
118-
groups: [
119-
"type",
120-
[
121-
"parent-type",
122-
"sibling-type",
123-
"index-type",
124-
"internal-type",
125-
],
126-
"builtin",
127-
"external",
128-
"internal",
129-
[
130-
"parent",
131-
"sibling",
132-
"index",
133-
],
134-
"side-effect",
135-
"object",
136-
"unknown",
137-
],
138-
newlinesBetween: "ignore",
139-
order: "asc",
140-
}],
114+
"perfectionist/sort-exports": "off",
115+
"perfectionist/sort-imports": "off",
141116
"perfectionist/sort-interfaces": [
142117
"warn",
143118
{ ...p11tOptions, ...p11tGroups },

.pkgs/configs/eslint.ts

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export const typescript: ConfigArray = tseslint.config(
107107
{
108108
extends: [
109109
pluginDeMorgan.configs.recommended,
110-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
110+
111111
pluginJsdoc.configs["flat/recommended-typescript-error"],
112112
pluginRegexp.configs["flat/recommended"],
113113
pluginPerfectionist.configs["recommended-natural"],
@@ -126,32 +126,8 @@ export const typescript: ConfigArray = tseslint.config(
126126
"@stylistic/operator-linebreak": "off",
127127
"@stylistic/quote-props": ["error", "as-needed"],
128128

129-
"perfectionist/sort-exports": ["warn", { type: "natural", order: "asc" }],
130-
"perfectionist/sort-imports": ["warn", {
131-
type: "natural",
132-
groups: [
133-
"type",
134-
[
135-
"parent-type",
136-
"sibling-type",
137-
"index-type",
138-
"internal-type",
139-
],
140-
"builtin",
141-
"external",
142-
"internal",
143-
[
144-
"parent",
145-
"sibling",
146-
"index",
147-
],
148-
"side-effect",
149-
"object",
150-
"unknown",
151-
],
152-
newlinesBetween: "ignore",
153-
order: "asc",
154-
}],
129+
"perfectionist/sort-exports": "off",
130+
"perfectionist/sort-imports": "off",
155131
"perfectionist/sort-interfaces": [
156132
"warn",
157133
{ ...p11tOptions, ...p11tGroups },

.pkgs/eslint-plugin-local/src/rules/avoid-multiline-template-expression.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import * as AST from "@eslint-react/ast";
12
import type { RuleContext, RuleFeature } from "@eslint-react/kit";
23
import type { RuleListener } from "@typescript-eslint/utils/ts-eslint";
34
import type { CamelCase } from "string-ts";
4-
import * as AST from "@eslint-react/ast";
55

66
import { createRule } from "../utils";
77

.pkgs/eslint-plugin-local/src/utils/is-initialized-from-source.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { Scope } from "@typescript-eslint/scope-manager";
2-
import type { TSESTree } from "@typescript-eslint/types";
31
import * as AST from "@eslint-react/ast";
42
import { unit } from "@eslint-react/eff";
53
import { findVariable } from "@eslint-react/var";
4+
import type { Scope } from "@typescript-eslint/scope-manager";
5+
import type { TSESTree } from "@typescript-eslint/types";
66
import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
77

88
/**

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ npm install --save-dev typescript-eslint @eslint-react/eslint-plugin
7070
// eslint.config.js
7171

7272
// @ts-check
73-
import eslintJs from "@eslint/js";
7473
import eslintReact from "@eslint-react/eslint-plugin";
74+
import eslintJs from "@eslint/js";
7575
import tseslint from "typescript-eslint";
7676

7777
export default tseslint.config({

apps/website/app/docs/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Docs layout
2-
import type { ReactNode } from "react";
32
import { baseOptions } from "#/app/layout.config";
3+
import type { ReactNode } from "react";
44

55
import { source } from "#/lib/source";
66
import { DocsLayout } from "fumadocs-ui/layouts/docs";

apps/website/app/layout.config.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import type { BaseLayoutProps } from "fumadocs-ui/layouts/shared";
21
import logo from "#/assets/logo.svg";
2+
import type { BaseLayoutProps } from "fumadocs-ui/layouts/shared";
33

44
import Image from "next/image";
55
import React from "react";

apps/website/app/layout.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
import { Toaster } from "#/components/ui/Toaster";
2+
import { baseUrl } from "#/lib/metadata";
3+
import { RootProvider } from "fumadocs-ui/provider";
14
import type { Metadata } from "next";
25
import type { ReactNode } from "react";
36

4-
import { RootProvider } from "fumadocs-ui/provider";
57
import { ViewTransitions } from "next-view-transitions";
6-
78
import { IBM_Plex_Mono } from "next/font/google";
8-
import { baseUrl } from "../lib/metadata";
99

10-
import "./app.css";
11-
import "./app.override.css";
10+
import "#/app/app.css";
11+
import "#/app/app.override.css";
1212

1313
const ibm_plex_mono = IBM_Plex_Mono({
1414
subsets: ["latin"],
@@ -56,6 +56,7 @@ export default function Layout({ children }: { children: ReactNode }) {
5656
<RootProvider theme={themeOptions}>
5757
{children}
5858
</RootProvider>
59+
<Toaster />
5960
</body>
6061
</html>
6162
</ViewTransitions>

apps/website/atoms/location.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { Atom } from "@effect-atom/atom-react";
2+
import * as Option from "effect/Option";
3+
4+
function getHash() {
5+
const hash = location.hash.slice(1);
6+
if (hash.length > 0) {
7+
return Option.some(hash);
8+
}
9+
return Option.none<string>();
10+
}
11+
12+
export const hashAtom = Atom.make<Option.Option<string>>((get) => {
13+
function onHashChange() {
14+
get.setSelf(getHash());
15+
}
16+
window.addEventListener("hashchange", onHashChange);
17+
get.addFinalizer(() => {
18+
window.removeEventListener("hashchange", onHashChange);
19+
});
20+
return getHash();
21+
});

0 commit comments

Comments
 (0)