Skip to content

Commit 6814026

Browse files
nperez0111nperez0111
authored
feat: upgrade nx to 22.6.4 and liveblocks to 3.17.0 (#2627)
1 parent fa8d41c commit 6814026

File tree

129 files changed

+1646
-1250
lines changed

Some content is hidden

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

129 files changed

+1646
-1250
lines changed

‎docs/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
"@blocknote/xl-odt-exporter": "workspace:*",
3535
"@blocknote/xl-pdf-exporter": "workspace:*",
3636
"@fumadocs/base-ui": "16.5.0",
37-
"@liveblocks/client": "3.7.1-tiptap3",
38-
"@liveblocks/react": "3.7.1-tiptap3",
39-
"@liveblocks/react-blocknote": "3.7.1-tiptap3",
40-
"@liveblocks/react-tiptap": "3.7.1-tiptap3",
41-
"@liveblocks/react-ui": "3.7.1-tiptap3",
37+
"@liveblocks/client": "^3.17.0",
38+
"@liveblocks/react": "^3.17.0",
39+
"@liveblocks/react-blocknote": "^3.17.0",
40+
"@liveblocks/react-tiptap": "^3.17.0",
41+
"@liveblocks/react-ui": "^3.17.0",
4242
"@mantine/core": "^8.3.11",
4343
"@mantine/hooks": "^8.3.11",
4444
"@mantine/utils": "^6.0.22",
@@ -126,7 +126,7 @@
126126
"eslint-config-next": "^16.1.6",
127127
"next-validate-link": "^1.6.4",
128128
"postcss": "^8.5.6",
129-
"serve": "^14.2.5",
129+
"serve": "^14.2.6",
130130
"tailwindcss": "^4.1.18",
131131
"tw-animate-css": "^1.4.0",
132132
"typescript": "^5.9.3"

‎examples/07-collaboration/02-liveblocks/.bnexample.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"author": "yousefed",
55
"tags": ["Advanced", "Saving/Loading", "Collaboration"],
66
"dependencies": {
7-
"@liveblocks/client": "3.7.1-tiptap3",
8-
"@liveblocks/react": "3.7.1-tiptap3",
9-
"@liveblocks/react-blocknote": "3.7.1-tiptap3",
10-
"@liveblocks/react-tiptap": "3.7.1-tiptap3",
11-
"@liveblocks/react-ui": "3.7.1-tiptap3",
7+
"@liveblocks/client": "^3.17.0",
8+
"@liveblocks/react": "^3.17.0",
9+
"@liveblocks/react-blocknote": "^3.17.0",
10+
"@liveblocks/react-tiptap": "^3.17.0",
11+
"@liveblocks/react-ui": "^3.17.0",
1212
"yjs": "^13.6.27"
1313
}
1414
}

‎examples/07-collaboration/02-liveblocks/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
"@mantine/utils": "^6.0.22",
2222
"react": "^19.2.3",
2323
"react-dom": "^19.2.3",
24-
"@liveblocks/client": "3.7.1-tiptap3",
25-
"@liveblocks/react": "3.7.1-tiptap3",
26-
"@liveblocks/react-blocknote": "3.7.1-tiptap3",
27-
"@liveblocks/react-tiptap": "3.7.1-tiptap3",
28-
"@liveblocks/react-ui": "3.7.1-tiptap3",
24+
"@liveblocks/client": "^3.17.0",
25+
"@liveblocks/react": "^3.17.0",
26+
"@liveblocks/react-blocknote": "^3.17.0",
27+
"@liveblocks/react-tiptap": "^3.17.0",
28+
"@liveblocks/react-ui": "^3.17.0",
2929
"yjs": "^13.6.27"
3030
},
3131
"devDependencies": {

‎nx.json‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,34 @@
2424
"build:site": {
2525
"cache": true,
2626
"dependsOn": ["^build"],
27-
"inputs": ["{workspaceRoot}/examples/**/*", "{projectRoot}/**/*"],
27+
"inputs": [
28+
"{workspaceRoot}/examples/**/*",
29+
"{projectRoot}/**/*",
30+
"!{projectRoot}/sqlite.db",
31+
"!{projectRoot}/.env*",
32+
"!{projectRoot}/validate-links.mjs",
33+
"!{projectRoot}/coverage/**/*"
34+
],
2835
"outputs": [
29-
"{projectRoot}/dist",
3036
"{projectRoot}/.next",
37+
"!{projectRoot}/.next/cache",
3138
"{projectRoot}/.source",
3239
"{projectRoot}/content/examples",
3340
"{projectRoot}/components/example/generated"
3441
]
3542
},
3643
"test": {
3744
"cache": true,
38-
"dependsOn": ["^test"]
45+
"dependsOn": ["build", "^build"]
3946
},
4047
"lint": {
4148
"cache": true,
4249
"dependsOn": []
4350
},
4451
"e2e": {
4552
"cache": true,
46-
"dependsOn": ["^e2e"]
53+
"dependsOn": ["build", "^build"]
4754
}
48-
}
55+
},
56+
"analytics": false
4957
}

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
"name": "root",
33
"type": "module",
44
"devDependencies": {
5-
"@nx/js": "22.5.4",
5+
"@nx/js": "22.6.4",
66
"@typescript-eslint/eslint-plugin": "^5.62.0",
77
"@typescript-eslint/parser": "^5.62.0",
88
"concurrently": "9.1.2",
99
"eslint": "^8.57.1",
1010
"eslint-config-react-app": "^7.0.1",
1111
"eslint-plugin-import": "^2.32.0",
1212
"glob": "^10.5.0",
13-
"nx": "22.5.4",
13+
"nx": "22.6.4",
1414
"prettier": "3.6.2",
1515
"prettier-plugin-tailwindcss": "^0.6.14",
16-
"serve": "14.2.4",
16+
"serve": "14.2.6",
1717
"typescript": "^5.9.3",
18-
"vitest": "^2.1.9",
18+
"vitest": "^4.1.2",
1919
"wait-on": "8.0.3"
2020
},
2121
"pnpm": {

‎packages/ariakit/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@
6363
"devDependencies": {
6464
"@types/react": "^19.2.3",
6565
"@types/react-dom": "^19.2.3",
66-
"@vitejs/plugin-react": "^4.7.0",
66+
"@vitejs/plugin-react": "^6.0.1",
6767
"eslint": "^8.57.1",
6868
"react": "^19.2.3",
6969
"react-dom": "^19.2.3",
7070
"rimraf": "^5.0.10",
7171
"rollup-plugin-webpack-stats": "^0.2.6",
7272
"typescript": "^5.9.3",
73-
"vite": "^5.4.20",
73+
"vite": "^8.0.3",
7474
"vite-plugin-eslint": "^1.8.1",
75-
"vite-plugin-externalize-deps": "^0.8.0"
75+
"vite-plugin-externalize-deps": "^0.10.0"
7676
},
7777
"peerDependencies": {
7878
"react": "^18.0 || ^19.0 || >= 19.0.0-rc",

‎packages/ariakit/vite.config.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ export default defineConfig((conf) => ({
1616
resolve: {
1717
alias:
1818
conf.command === "build"
19-
? ({} as Record<string, string>)
19+
? ({
20+
// Vite 8's postcss-import can't resolve bare package specifiers in CSS @import
21+
"@blocknote/react/style.css": path.resolve(
22+
__dirname,
23+
"../react/dist/style.css"
24+
),
25+
} as Record<string, string>)
2026
: ({
2127
// load live from sources with live reload working
2228
"@blocknote/core": path.resolve(__dirname, "../core/src/"),
@@ -30,6 +36,7 @@ export default defineConfig((conf) => ({
3036
"blocknote-ariakit": path.resolve(__dirname, "src/index.tsx"),
3137
},
3238
name: "blocknote-ariakit",
39+
cssFileName: "style",
3340
formats: ["es", "cjs"],
3441
fileName: (format, entryName) =>
3542
format === "es" ? `${entryName}.js` : `${entryName}.cjs`,
@@ -43,7 +50,7 @@ export default defineConfig((conf) => ({
4350
...pkg.dependencies,
4451
...((pkg as any).peerDependencies || {}),
4552
...pkg.devDependencies,
46-
}).includes(source)
53+
}).some((dep) => source === dep || source.startsWith(dep + "/"))
4754
) {
4855
return true;
4956
}
@@ -64,7 +71,6 @@ export default defineConfig((conf) => ({
6471
react: "React",
6572
"react-dom": "ReactDOM",
6673
},
67-
interop: "compat", // https://rollupjs.org/migration/#changed-defaults
6874
},
6975
},
7076
},

‎packages/code-block/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
"eslint": "^8.57.1",
6161
"rollup-plugin-webpack-stats": "^0.2.6",
6262
"typescript": "^5.9.3",
63-
"vite": "^5.4.20",
63+
"vite": "^8.0.3",
6464
"vite-plugin-eslint": "^1.8.1",
65-
"vitest": "^2.1.9"
65+
"vitest": "^4.1.2"
6666
},
6767
"peerDependencies": {
6868
"@blocknote/core": "0.47.3"

‎packages/code-block/vite.config.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default defineConfig((conf) => ({
4141
...pkg.dependencies,
4242
...((pkg as any).peerDependencies || {}),
4343
...pkg.devDependencies,
44-
}).includes(source)
44+
}).some((dep) => source === dep || source.startsWith(dep + "/"))
4545
) {
4646
return true;
4747
}
@@ -59,7 +59,6 @@ export default defineConfig((conf) => ({
5959
// Provide global variables to use in the UMD build
6060
// for externalized deps
6161
globals: {},
62-
interop: "compat", // https://rollupjs.org/migration/#changed-defaults
6362
},
6463
},
6564
},

‎packages/core/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@
138138
"rimraf": "^5.0.10",
139139
"rollup-plugin-webpack-stats": "^0.2.6",
140140
"typescript": "^5.9.3",
141-
"vite": "^5.4.20",
141+
"vite": "^8.0.3",
142142
"vite-plugin-eslint": "^1.8.1",
143-
"vitest": "^2.1.9"
143+
"vitest": "^4.1.2"
144144
},
145145
"eslintConfig": {
146146
"extends": [

0 commit comments

Comments
 (0)