Skip to content

Commit

Permalink
same version, linting, fix github link
Browse files Browse the repository at this point in the history
  • Loading branch information
@Barsnes
Barsnes committed Jul 5, 2024
1 parent 1bb6cbe commit 8bfe81b
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 185 deletions.
1 change: 0 additions & 1 deletion .eslintrc.cjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ module.exports = {
'import/no-unresolved': 'error',
'import/namespace': ['error', { allowComputed: true }],
'import/no-named-as-default': 'off',
'@next/next/no-html-link-for-pages': ['error', 'apps/storefront/pages/'],
'jsx-a11y/no-autofocus': 'off',
'import/order': [
'warn',
Expand Down
2 changes: 1 addition & 1 deletion apps/storefront/components/Link/Github/GithubLink.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const GithubLink = ({
...rest
}: Omit<HTMLAttributes<HTMLAnchorElement>, 'color'>) => {
const pathName = usePathname();
const href = `https://github.com/digdir/designsystemet/tree/main/apps/storefront/pages${pathName}/page.mdx`;
const href = `https://github.com/digdir/designsystemet/tree/next/apps/storefront/app${pathName}/page.mdx`;

return (
<Link
Expand Down
1 change: 1 addition & 0 deletions apps/storybook/docs-components/Information/Information.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Markdown } from '@storybook/blocks';

import type { AlertProps } from '@digdir/designsystemet-react';
import { Paragraph, Alert, Heading } from '@digdir/designsystemet-react';

Expand Down
10 changes: 5 additions & 5 deletions apps/theme/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
"apca-w3": "^0.1.9",
"chroma-js": "^2.4.2",
"hsluv": "^1.0.1",
"next": "14.1.3",
"react": "^18",
"next": "^14.2.4",
"react": "^18.3.1",
"react-color": "^2.19.3",
"react-dom": "^18",
"react-dom": "^18.3.1",
"recharts": "^2.12.6",
"zustand": "^4.5.2"
},
"devDependencies": {
"@types/apca-w3": "^0",
"@types/chroma-js": "^2",
"@types/react": "^18",
"@types/react": "^18.3.3",
"@types/react-color": "^3.0.12",
"@types/react-dom": "^18"
"@types/react-dom": "^18.3.0"
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@babel/preset-react": "^7.24.1",
"@babel/preset-typescript": "^7.23.3",
"@chromatic-com/storybook": "^1.5.0",
"@next/eslint-plugin-next": "^14.0.4",
"@next/eslint-plugin-next": "^14.2.4",
"@prettier/sync": "^0.5.2",
"@rollup/plugin-commonjs": "^26.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
Expand Down
187 changes: 10 additions & 177 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3424,13 +3424,6 @@ __metadata:
languageName: node
linkType: hard

"@next/env@npm:14.1.3":
version: 14.1.3
resolution: "@next/env@npm:14.1.3"
checksum: 10/b95c55530f5fb8cfb2a48a23485fd4cb584bff8620637785d7dd068c0d72d4dc0869023ed509f52fead558839f2efae4f7370a2c2fd87540201629fc39a421a5
languageName: node
linkType: hard

"@next/env@npm:14.2.3":
version: 14.2.3
resolution: "@next/env@npm:14.2.3"
Expand All @@ -3445,7 +3438,7 @@ __metadata:
languageName: node
linkType: hard

"@next/eslint-plugin-next@npm:14.2.4":
"@next/eslint-plugin-next@npm:14.2.4, @next/eslint-plugin-next@npm:^14.2.4":
version: 14.2.4
resolution: "@next/eslint-plugin-next@npm:14.2.4"
dependencies:
Expand All @@ -3454,15 +3447,6 @@ __metadata:
languageName: node
linkType: hard

"@next/eslint-plugin-next@npm:^14.0.4":
version: 14.0.4
resolution: "@next/eslint-plugin-next@npm:14.0.4"
dependencies:
glob: "npm:7.1.7"
checksum: 10/17871e2a86b66584b9eff8796a76d0c59ae62626dd8d0ae1cb7ca6977decf6273eb935d67e204f575a9ba0574a1c289329e6bbcb70d866e4c7f2879597cbd55a
languageName: node
linkType: hard

"@next/mdx@npm:^14.2.4":
version: 14.2.4
resolution: "@next/mdx@npm:14.2.4"
Expand All @@ -3480,13 +3464,6 @@ __metadata:
languageName: node
linkType: hard

"@next/swc-darwin-arm64@npm:14.1.3":
version: 14.1.3
resolution: "@next/swc-darwin-arm64@npm:14.1.3"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@next/swc-darwin-arm64@npm:14.2.3":
version: 14.2.3
resolution: "@next/swc-darwin-arm64@npm:14.2.3"
Expand All @@ -3501,13 +3478,6 @@ __metadata:
languageName: node
linkType: hard

"@next/swc-darwin-x64@npm:14.1.3":
version: 14.1.3
resolution: "@next/swc-darwin-x64@npm:14.1.3"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@next/swc-darwin-x64@npm:14.2.3":
version: 14.2.3
resolution: "@next/swc-darwin-x64@npm:14.2.3"
Expand All @@ -3522,13 +3492,6 @@ __metadata:
languageName: node
linkType: hard

"@next/swc-linux-arm64-gnu@npm:14.1.3":
version: 14.1.3
resolution: "@next/swc-linux-arm64-gnu@npm:14.1.3"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@next/swc-linux-arm64-gnu@npm:14.2.3":
version: 14.2.3
resolution: "@next/swc-linux-arm64-gnu@npm:14.2.3"
Expand All @@ -3543,13 +3506,6 @@ __metadata:
languageName: node
linkType: hard

"@next/swc-linux-arm64-musl@npm:14.1.3":
version: 14.1.3
resolution: "@next/swc-linux-arm64-musl@npm:14.1.3"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@next/swc-linux-arm64-musl@npm:14.2.3":
version: 14.2.3
resolution: "@next/swc-linux-arm64-musl@npm:14.2.3"
Expand All @@ -3564,13 +3520,6 @@ __metadata:
languageName: node
linkType: hard

"@next/swc-linux-x64-gnu@npm:14.1.3":
version: 14.1.3
resolution: "@next/swc-linux-x64-gnu@npm:14.1.3"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@next/swc-linux-x64-gnu@npm:14.2.3":
version: 14.2.3
resolution: "@next/swc-linux-x64-gnu@npm:14.2.3"
Expand All @@ -3585,13 +3534,6 @@ __metadata:
languageName: node
linkType: hard

"@next/swc-linux-x64-musl@npm:14.1.3":
version: 14.1.3
resolution: "@next/swc-linux-x64-musl@npm:14.1.3"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@next/swc-linux-x64-musl@npm:14.2.3":
version: 14.2.3
resolution: "@next/swc-linux-x64-musl@npm:14.2.3"
Expand All @@ -3606,13 +3548,6 @@ __metadata:
languageName: node
linkType: hard

"@next/swc-win32-arm64-msvc@npm:14.1.3":
version: 14.1.3
resolution: "@next/swc-win32-arm64-msvc@npm:14.1.3"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@next/swc-win32-arm64-msvc@npm:14.2.3":
version: 14.2.3
resolution: "@next/swc-win32-arm64-msvc@npm:14.2.3"
Expand All @@ -3627,13 +3562,6 @@ __metadata:
languageName: node
linkType: hard

"@next/swc-win32-ia32-msvc@npm:14.1.3":
version: 14.1.3
resolution: "@next/swc-win32-ia32-msvc@npm:14.1.3"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard

"@next/swc-win32-ia32-msvc@npm:14.2.3":
version: 14.2.3
resolution: "@next/swc-win32-ia32-msvc@npm:14.2.3"
Expand All @@ -3648,13 +3576,6 @@ __metadata:
languageName: node
linkType: hard

"@next/swc-win32-x64-msvc@npm:14.1.3":
version: 14.1.3
resolution: "@next/swc-win32-x64-msvc@npm:14.1.3"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"@next/swc-win32-x64-msvc@npm:14.2.3":
version: 14.2.3
resolution: "@next/swc-win32-x64-msvc@npm:14.2.3"
Expand Down Expand Up @@ -5995,15 +5916,6 @@ __metadata:
languageName: node
linkType: hard

"@swc/helpers@npm:0.5.2":
version: 0.5.2
resolution: "@swc/helpers@npm:0.5.2"
dependencies:
tslib: "npm:^2.4.0"
checksum: 10/3a3b179b3369acd26c5da89a0e779c756ae5231eb18a5507524c7abf955f488d34d86649f5b8417a0e19879688470d06319f5cfca2273d6d6b2046950e0d79af
languageName: node
linkType: hard

"@swc/helpers@npm:0.5.5":
version: 0.5.5
resolution: "@swc/helpers@npm:0.5.5"
Expand Down Expand Up @@ -6899,7 +6811,7 @@ __metadata:
languageName: node
linkType: hard

"@types/react-dom@npm:^18, @types/react-dom@npm:^18.0.11, @types/react-dom@npm:^18.3.0":
"@types/react-dom@npm:^18.0.11, @types/react-dom@npm:^18.3.0":
version: 18.3.0
resolution: "@types/react-dom@npm:18.3.0"
dependencies:
Expand Down Expand Up @@ -6947,16 +6859,6 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:^18":
version: 18.3.2
resolution: "@types/react@npm:18.3.2"
dependencies:
"@types/prop-types": "npm:*"
csstype: "npm:^3.0.2"
checksum: 10/a85eed82c1009dc9d979281d9ea1f5322255003de3378390f35d897b4bdaf1d34ea748636c03e9e9b4b7cc97c2f4582993d2d60e40846226ad497d97c7d8565a
languageName: node
linkType: hard

"@types/react@npm:^18.0.28, @types/react@npm:^18.3.3":
version: 18.3.3
resolution: "@types/react@npm:18.3.3"
Expand Down Expand Up @@ -12913,20 +12815,6 @@ __metadata:
languageName: node
linkType: hard

"glob@npm:7.1.7":
version: 7.1.7
resolution: "glob@npm:7.1.7"
dependencies:
fs.realpath: "npm:^1.0.0"
inflight: "npm:^1.0.4"
inherits: "npm:2"
minimatch: "npm:^3.0.4"
once: "npm:^1.3.0"
path-is-absolute: "npm:^1.0.0"
checksum: 10/ff5aab0386e9cace92b0550d42085b71013c5ea382982dd7fdded998a559635f61413b8ba6fb7294eef289c83b52f4e64136f888300ac8afc4f3e5623182d6c8
languageName: node
linkType: hard

"glob@npm:^10.4.1":
version: 10.4.2
resolution: "glob@npm:10.4.2"
Expand Down Expand Up @@ -17460,61 +17348,6 @@ __metadata:
languageName: node
linkType: hard

"next@npm:14.1.3":
version: 14.1.3
resolution: "next@npm:14.1.3"
dependencies:
"@next/env": "npm:14.1.3"
"@next/swc-darwin-arm64": "npm:14.1.3"
"@next/swc-darwin-x64": "npm:14.1.3"
"@next/swc-linux-arm64-gnu": "npm:14.1.3"
"@next/swc-linux-arm64-musl": "npm:14.1.3"
"@next/swc-linux-x64-gnu": "npm:14.1.3"
"@next/swc-linux-x64-musl": "npm:14.1.3"
"@next/swc-win32-arm64-msvc": "npm:14.1.3"
"@next/swc-win32-ia32-msvc": "npm:14.1.3"
"@next/swc-win32-x64-msvc": "npm:14.1.3"
"@swc/helpers": "npm:0.5.2"
busboy: "npm:1.6.0"
caniuse-lite: "npm:^1.0.30001579"
graceful-fs: "npm:^4.2.11"
postcss: "npm:8.4.31"
styled-jsx: "npm:5.1.1"
peerDependencies:
"@opentelemetry/api": ^1.1.0
react: ^18.2.0
react-dom: ^18.2.0
sass: ^1.3.0
dependenciesMeta:
"@next/swc-darwin-arm64":
optional: true
"@next/swc-darwin-x64":
optional: true
"@next/swc-linux-arm64-gnu":
optional: true
"@next/swc-linux-arm64-musl":
optional: true
"@next/swc-linux-x64-gnu":
optional: true
"@next/swc-linux-x64-musl":
optional: true
"@next/swc-win32-arm64-msvc":
optional: true
"@next/swc-win32-ia32-msvc":
optional: true
"@next/swc-win32-x64-msvc":
optional: true
peerDependenciesMeta:
"@opentelemetry/api":
optional: true
sass:
optional: true
bin:
next: dist/bin/next
checksum: 10/6e77d5d35161b1e9337112ce7864527029f5c8e25ddd29e07e8a730c83f7241dd241e7eb0bdcd006e813b610274e960e0af18c167ab8a2deeeb7776121a7d770
languageName: node
linkType: hard

"next@npm:^14.0.4":
version: 14.2.3
resolution: "next@npm:14.2.3"
Expand Down Expand Up @@ -20431,7 +20264,7 @@ __metadata:
languageName: node
linkType: hard

"react-dom@npm:^18, react-dom@npm:^18.2.0, react-dom@npm:^18.3.1":
"react-dom@npm:^18.2.0, react-dom@npm:^18.3.1":
version: 18.3.1
resolution: "react-dom@npm:18.3.1"
dependencies:
Expand Down Expand Up @@ -20659,7 +20492,7 @@ __metadata:
languageName: node
linkType: hard

"react@npm:^18, react@npm:^18.2.0, react@npm:^18.3.1":
"react@npm:^18.2.0, react@npm:^18.3.1":
version: 18.3.1
resolution: "react@npm:18.3.1"
dependencies:
Expand Down Expand Up @@ -21628,7 +21461,7 @@ __metadata:
"@babel/preset-react": "npm:^7.24.1"
"@babel/preset-typescript": "npm:^7.23.3"
"@chromatic-com/storybook": "npm:^1.5.0"
"@next/eslint-plugin-next": "npm:^14.0.4"
"@next/eslint-plugin-next": "npm:^14.2.4"
"@prettier/sync": "npm:^0.5.2"
"@rollup/plugin-commonjs": "npm:^26.0.1"
"@rollup/plugin-node-resolve": "npm:^15.2.3"
Expand Down Expand Up @@ -23367,16 +23200,16 @@ __metadata:
"@react-awesome/use-click-outside": "npm:^0.0.3"
"@types/apca-w3": "npm:^0"
"@types/chroma-js": "npm:^2"
"@types/react": "npm:^18"
"@types/react": "npm:^18.3.3"
"@types/react-color": "npm:^3.0.12"
"@types/react-dom": "npm:^18"
"@types/react-dom": "npm:^18.3.0"
apca-w3: "npm:^0.1.9"
chroma-js: "npm:^2.4.2"
hsluv: "npm:^1.0.1"
next: "npm:14.1.3"
react: "npm:^18"
next: "npm:^14.2.4"
react: "npm:^18.3.1"
react-color: "npm:^2.19.3"
react-dom: "npm:^18"
react-dom: "npm:^18.3.1"
recharts: "npm:^2.12.6"
zustand: "npm:^4.5.2"
languageName: unknown
Expand Down

0 comments on commit 8bfe81b

Please sign in to comment.