Skip to content

[pull] main from liveblocks:main #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jul 10, 2026
Merged

[pull] main from liveblocks:main #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/liveblocks-chat-sdk-adapter/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
rules: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-client/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
rules: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-core/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax"
import consoleMustBeFancy from "./rules/console-must-be-fancy.cjs";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-emails/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax"
import reactHooks from "eslint-plugin-react-hooks";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-node-lexical/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
rules: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-node-prosemirror/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
rules: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-node/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
rules: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-react-blocknote/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import react from "eslint-plugin-react";
import reactHooks from "eslint-plugin-react-hooks";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-react-flow/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax"
import reactHooks from "eslint-plugin-react-hooks";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-react-lexical/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import react from "eslint-plugin-react";
import reactHooks from "eslint-plugin-react-hooks";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-react-tiptap/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import react from "eslint-plugin-react";
import reactHooks from "eslint-plugin-react-hooks";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-react-ui/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import react from "eslint-plugin-react";
import reactHooks from "eslint-plugin-react-hooks";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-react/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax"
import reactHooks from "eslint-plugin-react-hooks";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-redux/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
rules: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-server/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import licenseHeader from "eslint-plugin-license-header";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-yjs/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
rules: {
Expand Down
2 changes: 1 addition & 1 deletion packages/liveblocks-zustand/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import commonRestrictedSyntax from "@liveblocks/eslint-config/restricted-syntax";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
rules: {
Expand Down
15 changes: 10 additions & 5 deletions shared/eslint-config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,27 @@ import tseslint from "typescript-eslint";
/**
* Creates the base ESLint flat config used by all packages in the monorepo.
*
* @param {string} tsconfigPath Path to the tsconfig.json (default: "./tsconfig.json")
* @returns {import("eslint").Linter.Config[]}
* @param {string} tsconfigRootDir Path to the directory ESLint should use to resolve
* `tsconfigPath`, pass `import.meta.dirname` from the package's
* `eslint.config.mjs`.
* @param {string} tsconfigPath Path to the package's TypeScript config,
* relative to `tsconfigRootDir`. Defaults to "./tsconfig.json".
* @returns {import("eslint").Linter.Config[]} The shared flat config entries.
*/
export function makeConfig(tsconfigPath = "./tsconfig.json") {
export function makeConfig(tsconfigRootDir, tsconfigPath = "./tsconfig.json") {
return [
js.configs.recommended,
...tseslint.configs.recommendedTypeChecked,

{
languageOptions: {
// Each project's individual/local tsconfig.json defines the behavior
// of the parser
parserOptions: {
// Each project's individual/local tsconfig.json defines the behavior
// of the parser
projectService: {
defaultProject: tsconfigPath,
},
tsconfigRootDir,
},
},

Expand Down
2 changes: 1 addition & 1 deletion tools/liveblocks-cli/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import licenseHeader from "eslint-plugin-license-header";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
2 changes: 1 addition & 1 deletion tools/liveblocks-codemod/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { makeConfig } from "@liveblocks/eslint-config";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
ignores: ["**/__tests__/**", "**/__testfixtures__/**"],
Expand Down
2 changes: 1 addition & 1 deletion tools/liveblocks-devtools/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeConfig } from "@liveblocks/eslint-config";
import reactHooks from "eslint-plugin-react-hooks";

export default [
...makeConfig(),
...makeConfig(import.meta.dirname),

{
plugins: {
Expand Down
Loading