Skip to content

Commit 69a49fc

Browse files
Merge pull request #775 from dolthub/eric/revert-next-version
Revert next version
2 parents fc0ef95 + 40b9dd0 commit 69a49fc

File tree

4 files changed

+56
-378
lines changed

4 files changed

+56
-378
lines changed

web/jest.setup.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
import "@testing-library/jest-dom";
1+
import "@testing-library/jest-dom";
2+
import { setConfig } from "next/config";
3+
import config from "./renderer/next.config.js";
4+
5+
// Make sure you can use "publicRuntimeConfig" within tests.
6+
setConfig({
7+
...config,
8+
publicRuntimeConfig: { ...config.publicRuntimeConfig, useQueryMocks: false },
9+
});

web/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"lint-fix": "eslint --quiet --fix --ext .ts,.js,.tsx,.jsx",
2727
"generate-types": "graphql-codegen --config ./renderer/codegen.yml",
2828
"test": "jest --env=jest-environment-jsdom ./renderer",
29-
"dev": "next dev ./renderer -p 3002 --webpack",
30-
"build": "next build ./renderer --webpack",
29+
"dev": "next dev ./renderer -p 3002",
30+
"build": "next build ./renderer",
3131
"compile": "tsc -b",
3232
"find:unused": "npx unimported",
3333
"yalc": "yalc link",
@@ -56,7 +56,7 @@
5656
"localforage": "^1.10.0",
5757
"localforage-getitems": "^1.4.2",
5858
"lodash": "^4.17.23",
59-
"next": "^16.1.5",
59+
"next": "^15.5.9",
6060
"next-useragent": "^2.8.0",
6161
"node-sql-parser": "^4.17.0",
6262
"react": "^19.1.1",
@@ -123,7 +123,7 @@
123123
"eslint-plugin-testing-library": "^6.2.2",
124124
"jest": "^29.7.0",
125125
"jest-environment-jsdom": "^29.7.0",
126-
"next": "^16.1.5",
126+
"next": "^15.5.9",
127127
"nextron": "^9.5.0",
128128
"npm-run-all2": "^7.0.2",
129129
"postcss": "^8.5.6",

web/renderer/next.config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ const nextConfig = {
1515
unoptimized:
1616
process.env.NEXT_PUBLIC_FOR_ELECTRON === "true" ? true : undefined,
1717
},
18-
// Acknowledge Turbopack is default in Next.js 16; webpack config is still needed for preprocessor
19-
turbopack: {},
2018
webpack: config => {
2119
// Add the webpack-preprocessor-loader so we can use getServerSideProps conditionally
2220
config.module.rules.push({

0 commit comments

Comments
 (0)