From 558e295ab88bfe68dfc3d1b2e80a385c1e7f3cdf Mon Sep 17 00:00:00 2001 From: Harald Schilly Date: Wed, 28 Dec 2022 11:03:56 +0100 Subject: [PATCH] next: install modern-normalize to fix #6285 --- src/packages/next/package-lock.json | 53 +++++++++++++++++++---------- src/packages/next/package.json | 3 +- src/packages/next/pages/_app.tsx | 5 +++ 3 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/packages/next/package-lock.json b/src/packages/next/package-lock.json index 6e9ad9a5e05..18423839c2a 100644 --- a/src/packages/next/package-lock.json +++ b/src/packages/next/package-lock.json @@ -22,10 +22,10 @@ "@cocalc/assets": "^1.10.1", "@cocalc/backend": "^1.21.1", "@cocalc/cdn": "^1.15.1", - "@cocalc/database": "^0.34.1", - "@cocalc/frontend": "^1.101.4", + "@cocalc/database": "^0.34.2", + "@cocalc/frontend": "^1.101.5", "@cocalc/server": "^0.44.1", - "@cocalc/util": "^1.75.0", + "@cocalc/util": "^1.75.1", "@types/express": "^4.17.13", "@types/react": "^17.0.33", "@types/react-dom": "^17.0.2", @@ -37,6 +37,7 @@ "cookies": "^0.8.0", "express": "^4.17.1", "lru-cache": "^6.0.0", + "modern-normalize": "^1.1.0", "next": "12.3.4", "node-fetch": "^3.2.10", "password-hash": "^1.2.2", @@ -126,7 +127,7 @@ }, "../database": { "name": "@cocalc/database", - "version": "0.34.1", + "version": "0.34.2", "license": "SEE LICENSE.md", "workspaces": [ "./", @@ -136,8 +137,8 @@ ], "dependencies": { "@cocalc/backend": "^1.21.1", - "@cocalc/server": "^0.43.5", - "@cocalc/util": "^1.72.3", + "@cocalc/server": "^0.44.1", + "@cocalc/util": "^1.75.1", "@types/lodash": "^4.14.176", "@types/lru-cache": "^5.1.1", "@types/pg": "^8.6.1", @@ -167,7 +168,7 @@ }, "../frontend": { "name": "@cocalc/frontend", - "version": "1.101.4", + "version": "1.101.5", "license": "SEE LICENSE.md", "workspaces": [ "./", @@ -180,16 +181,16 @@ ], "dependencies": { "@ant-design/compatible": "^5.1.1", - "@ant-design/icons": "^4.7.0", + "@ant-design/icons": "^4.8.0", "@cocalc/ansi-to-react": "^6.0.13", "@cocalc/antd-img-crop": "^4.5.5", "@cocalc/assets": "^1.10.1", "@cocalc/cdn": "^1.15.1", - "@cocalc/hub": "^1.117.2", + "@cocalc/hub": "^1.117.4", "@cocalc/local-storage-lru": "^2.1.1", "@cocalc/project": "^1.34.3", "@cocalc/sync": "^0.10.1", - "@cocalc/util": "^1.75.0", + "@cocalc/util": "^1.75.1", "@jupyter-widgets/base": "^4.1.1", "@jupyter-widgets/controls": "^3.1.0", "@jupyter-widgets/output": "^4.1.0", @@ -199,7 +200,7 @@ "@types/pdfjs-dist": "^2.10.378", "@use-gesture/react": "^10.2.4", "@zippytech/react-notify-resize": "^4.0.4", - "antd": "^5.0.4", + "antd": "^5.0.7", "async": "^2.6.3", "async-await-utils": "^3.0.1", "awaiting": "^3.0.0", @@ -386,7 +387,7 @@ }, "../util": { "name": "@cocalc/util", - "version": "1.75.0", + "version": "1.75.1", "license": "SEE LICENSE.md", "workspaces": [ "." @@ -6014,6 +6015,17 @@ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, + "node_modules/modern-normalize": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.1.0.tgz", + "integrity": "sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA==", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/moment": { "version": "2.29.4", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", @@ -9920,8 +9932,8 @@ "version": "file:../database", "requires": { "@cocalc/backend": "^1.21.1", - "@cocalc/server": "^0.43.5", - "@cocalc/util": "^1.72.3", + "@cocalc/server": "^0.44.1", + "@cocalc/util": "^1.75.1", "@types/jest": "^29.2.3", "@types/lodash": "^4.14.176", "@types/lru-cache": "^5.1.1", @@ -9951,16 +9963,16 @@ "version": "file:../frontend", "requires": { "@ant-design/compatible": "^5.1.1", - "@ant-design/icons": "^4.7.0", + "@ant-design/icons": "^4.8.0", "@cocalc/ansi-to-react": "^6.0.13", "@cocalc/antd-img-crop": "^4.5.5", "@cocalc/assets": "^1.10.1", "@cocalc/cdn": "^1.15.1", - "@cocalc/hub": "^1.117.2", + "@cocalc/hub": "^1.117.4", "@cocalc/local-storage-lru": "^2.1.1", "@cocalc/project": "^1.34.3", "@cocalc/sync": "^0.10.1", - "@cocalc/util": "^1.75.0", + "@cocalc/util": "^1.75.1", "@jupyter-widgets/base": "^4.1.1", "@jupyter-widgets/controls": "^3.1.0", "@jupyter-widgets/output": "^4.1.0", @@ -9987,7 +9999,7 @@ "@types/react-redux": "^7.1.9", "@use-gesture/react": "^10.2.4", "@zippytech/react-notify-resize": "^4.0.4", - "antd": "^5.0.4", + "antd": "^5.0.7", "async": "^2.6.3", "async-await-utils": "^3.0.1", "awaiting": "^3.0.0", @@ -12930,6 +12942,11 @@ "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, + "modern-normalize": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.1.0.tgz", + "integrity": "sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA==" + }, "moment": { "version": "2.29.4", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", diff --git a/src/packages/next/package.json b/src/packages/next/package.json index e00c02e3874..74f8418fa1d 100644 --- a/src/packages/next/package.json +++ b/src/packages/next/package.json @@ -80,6 +80,7 @@ "cookies": "^0.8.0", "express": "^4.17.1", "lru-cache": "^6.0.0", + "modern-normalize": "^1.1.0", "next": "12.3.4", "node-fetch": "^3.2.10", "password-hash": "^1.2.2", @@ -101,4 +102,4 @@ "jest": "^29.3.1", "react-test-renderer": "^17.0.2" } -} \ No newline at end of file +} diff --git a/src/packages/next/pages/_app.tsx b/src/packages/next/pages/_app.tsx index 88470fb200f..802b7b15f23 100644 --- a/src/packages/next/pages/_app.tsx +++ b/src/packages/next/pages/_app.tsx @@ -1,3 +1,8 @@ +// Normalize CSS across browsers, fixes e.g. https://github.com/sagemathinc/cocalc/issues/6285 +// https://github.com/sindresorhus/modern-normalize (fork of the abandoned normalize.css) +import "modern-normalize/modern-normalize.css"; + +// CoCalc 3rd party libraries import "@cocalc/cdn/dist/codemirror/lib/codemirror.css"; import "@cocalc/cdn/dist/katex/katex.min.css"; import "@cocalc/frontend/editors/slate/elements/elements.css";