From 650dbbf29567e48027c27242b90f15f888bd0de0 Mon Sep 17 00:00:00 2001 From: Martin Berglund Date: Tue, 30 Jul 2024 09:11:27 +0200 Subject: [PATCH 1/6] Duplisere Less-filer og erstatte suffix med scss --- example/src/styles.scss | 41 ++++++ src/components/error/Error.scss | 7 ++ src/components/spinner/Spinner.scss | 9 ++ src/index.scss | 26 ++++ src/media.scss | 3 + src/modules/af-detaljert/Detaljert.scss | 161 ++++++++++++++++++++++++ src/modules/af-liste/Liste.scss | 93 ++++++++++++++ 7 files changed, 340 insertions(+) create mode 100644 example/src/styles.scss create mode 100644 src/components/error/Error.scss create mode 100644 src/components/spinner/Spinner.scss create mode 100644 src/index.scss create mode 100644 src/media.scss create mode 100644 src/modules/af-detaljert/Detaljert.scss create mode 100644 src/modules/af-liste/Liste.scss diff --git a/example/src/styles.scss b/example/src/styles.scss new file mode 100644 index 0000000..5e95bf6 --- /dev/null +++ b/example/src/styles.scss @@ -0,0 +1,41 @@ +@use '@navikt/arbeidsforhold/style.css'; + +body { + margin: 0; + padding: 0; + font-family: sans-serif; + background-color: #efefef; +} + +.example__app { + display: flex; + -webkit-justify-content: center; + justify-content: center; +} + +.example__content { + width: 100%; + max-width: 800px; + margin: 2rem 0; +} + +.example__header { + text-align: center; +} + +.example__section { + padding: 2rem 1rem; + margin: 2rem 0; + background: white; +} + +.example__sprak { + padding: 0 10px; + cursor: pointer; +} + +.example__velger { + display: flex; + justify-content: center; + margin: 0.5rem 0; +} \ No newline at end of file diff --git a/src/components/error/Error.scss b/src/components/error/Error.scss new file mode 100644 index 0000000..2baaa3c --- /dev/null +++ b/src/components/error/Error.scss @@ -0,0 +1,7 @@ +@use "../../media.scss" as mq; + +.error { + &__container { + padding: 1rem 0; + } +} \ No newline at end of file diff --git a/src/components/spinner/Spinner.scss b/src/components/spinner/Spinner.scss new file mode 100644 index 0000000..51d3c09 --- /dev/null +++ b/src/components/spinner/Spinner.scss @@ -0,0 +1,9 @@ +@use "/src/media.scss" as mq; + +.spinner { + &__wrapper { + display: flex; + -webkit-justify-content: center; + justify-content: center; + } +} \ No newline at end of file diff --git a/src/index.scss b/src/index.scss new file mode 100644 index 0000000..cffe508 --- /dev/null +++ b/src/index.scss @@ -0,0 +1,26 @@ +@use "./components/spinner/Spinner.scss"; +@use "./components/error/Error.scss"; + +@use "modules/af-detaljert/Detaljert.scss"; +@use "modules/af-liste/Liste.scss"; + +input, +button, +select, +textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} + +.sr-only { + // Burde hentes fra nav-frontend-core + position: absolute; + width: 1px; + height: 1px; + margin: -1px; + padding: 0; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; +} \ No newline at end of file diff --git a/src/media.scss b/src/media.scss new file mode 100644 index 0000000..f71a3d0 --- /dev/null +++ b/src/media.scss @@ -0,0 +1,3 @@ +$desktop: "all and (min-width: 959px)"; +$tablet: "all and (max-width: 959px)"; +$mobile: "all and (max-width: 420px)"; \ No newline at end of file diff --git a/src/modules/af-detaljert/Detaljert.scss b/src/modules/af-detaljert/Detaljert.scss new file mode 100644 index 0000000..3ac15d8 --- /dev/null +++ b/src/modules/af-detaljert/Detaljert.scss @@ -0,0 +1,161 @@ +@use "../../media.scss" as mq; + +.af-detaljert { + + /** Intro-seksjon */ + &__intro { + display: flex; + flex-wrap: wrap; + + @media #{mq.$desktop} { + padding: 0 0 0.25rem 0; + } + + @media #{mq.$tablet} { + padding: 0 0 0.5rem 0; + } + } + + &__seksjon { + @media #{mq.$desktop} { + width: 50%; + padding-right: 2rem; + box-sizing: border-box; + } + + @media #{mq.$tablet} { + width: 100%; + } + } + + &__arbeidsgiver { + padding: 0.5rem 0; + } + + &__orgnr { + padding: 0.25rem 0; + } + + &__periode { + display: flex; + flex-direction: row; + align-items: flex-end; + } + + &__arbeidsavtaleinnhold { + display: flex; + flex-wrap: wrap; + } + + &__boks { + margin: 0.75rem 0; + width: 50%; + padding-right: 2rem; + + @media #{mq.$mobile} { + width: 100%; + } + + & dd { + margin: 0; + } + } + + /** Tabs */ + /** ---------------------- */ + &__tabs { + margin: 1rem 0; + + @media #{mq.$mobile} { + display: none; + } + } + + /** Tabellen */ + /** ---------------------- */ + &__tableWrapper { + margin: 2rem 1rem; + } + + &__table { + width: 100%; + border-collapse: collapse; + + @media #{mq.$mobile} { + display: none; + } + + tr { + border-bottom: 1px solid #979797; + } + + th { + text-align: left; + width: 33%; + padding: 0.5rem 0; + } + + td { + padding: 0.5rem 0; + width: 33%; + } + } + + /** Print-funksjonalitet */ + /** ---------------------- */ + &__print-button-oversikt { + margin-left: 1rem; + margin-top: 1.5rem; + + svg { + width: 22px; + margin-right: 0.5rem; + } + + button { + display: flex; + background-color: transparent; + cursor: pointer; + align-items: center; + color: var(--a-surface-action); + } + } + + &__print-button { + display: flex; + border: 0px; + text-decoration: underline; + + a { + display: flex; + } + + svg { + width: 22px; + margin-right: 0.5rem; + } + } + + &__print-button-modal { + margin: 1rem 0; + text-decoration: underline; + cursor: pointer; + + a { + display: flex; + } + + svg { + width: 22px; + margin-right: 0.5rem; + } + } + + &__checkbox { + padding: 0.25rem 0; + } + + &__header { + margin: 1rem 0 0 0; + } +} \ No newline at end of file diff --git a/src/modules/af-liste/Liste.scss b/src/modules/af-liste/Liste.scss new file mode 100644 index 0000000..8fd8a26 --- /dev/null +++ b/src/modules/af-liste/Liste.scss @@ -0,0 +1,93 @@ +@use "../../media.scss" as mq; + +.af-liste { + &__tekst { + margin: 0 0 0.2rem 0; + } + + &__flex-rad { + padding: 0.5rem 0; + display: flex; + align-items: center; + justify-content: space-between; + border-bottom: 1px solid #979797; + + &:last-child { + border-bottom: 0; + } + } + + &__flex-innhold { + min-width: 7rem; + } + + &__vis-flere { + align-items: center; + background: none; + border: none; + color: var(--a-surface-action); + cursor: pointer; + display: flex; + margin-top: 0.5rem; + padding: 0.5rem 0; + text-decoration: underline; + + svg { + width: 20px; + } + } + + &__maskinelt-avsluttet { + display: flex; + align-items: center; + } + + &__tittel { + flex: 1; + } + + &__ekspander { + display: flex; + justify-content: flex-start; + align-items: center; + cursor: pointer; + color: #0067c5; + border: 0; + padding: 0; + background-color: transparent; + } + + &__month { + text-transform: capitalize; + } + + &__rapporteringsperiode { + width: 15rem; + } + + &__knapp { + background: none; + border: none; + color: var(--a-surface-action); + cursor: pointer; + padding: 0; + + &:hover { + text-decoration: none; + } + } + + &__print-button { + margin-top: 0.5rem; + display: block; + + a { + display: inline-flex; + } + + svg { + width: 22px; + margin-right: 0.5rem; + } + } +} \ No newline at end of file From fa014c19c617b213b74cdadf9145cb3a0602f57d Mon Sep 17 00:00:00 2001 From: Martin Berglund Date: Tue, 30 Jul 2024 09:12:32 +0200 Subject: [PATCH 2/6] Fjerne Less-filer --- example/less-watch-compiler.config.json | 6 - example/src/styles.less | 41 ------- src/components/error/Error.less | 5 - src/components/spinner/Spinner.less | 7 -- src/index.less | 30 ----- src/modules/af-detaljert/Detaljert.less | 147 ------------------------ src/modules/af-liste/Liste.less | 80 ------------- 7 files changed, 316 deletions(-) delete mode 100644 example/less-watch-compiler.config.json delete mode 100644 example/src/styles.less delete mode 100644 src/components/error/Error.less delete mode 100644 src/components/spinner/Spinner.less delete mode 100644 src/index.less delete mode 100644 src/modules/af-detaljert/Detaljert.less delete mode 100644 src/modules/af-liste/Liste.less diff --git a/example/less-watch-compiler.config.json b/example/less-watch-compiler.config.json deleted file mode 100644 index 0afca77..0000000 --- a/example/less-watch-compiler.config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "watchFolder": "src", - "outputFolder": "public", - "mainFile": "styles.less", - "plugins": "npm-import=\"prefix=~\"" -} diff --git a/example/src/styles.less b/example/src/styles.less deleted file mode 100644 index 54bb882..0000000 --- a/example/src/styles.less +++ /dev/null @@ -1,41 +0,0 @@ -@import '@navikt/arbeidsforhold/style.css'; - -body { - margin: 0; - padding: 0; - font-family: sans-serif; - background-color: #efefef; -} - -.example__app { - display: flex; - -webkit-justify-content: center; - justify-content: center; -} - -.example__content { - width: 100%; - max-width: 800px; - margin: 2rem 0; -} - -.example__header { - text-align: center; -} - -.example__section { - padding: 2rem 1rem; - margin: 2rem 0; - background: white; -} - -.example__sprak { - padding: 0 10px; - cursor: pointer; -} - -.example__velger { - display: flex; - justify-content: center; - margin: 0.5rem 0; -} diff --git a/src/components/error/Error.less b/src/components/error/Error.less deleted file mode 100644 index 596ad81..0000000 --- a/src/components/error/Error.less +++ /dev/null @@ -1,5 +0,0 @@ -.error { - &__container { - padding: 1rem 0; - } -} diff --git a/src/components/spinner/Spinner.less b/src/components/spinner/Spinner.less deleted file mode 100644 index ce5aec1..0000000 --- a/src/components/spinner/Spinner.less +++ /dev/null @@ -1,7 +0,0 @@ -.spinner { - &__wrapper { - display: flex; - -webkit-justify-content: center; - justify-content: center; - } -} diff --git a/src/index.less b/src/index.less deleted file mode 100644 index 73c58e0..0000000 --- a/src/index.less +++ /dev/null @@ -1,30 +0,0 @@ -@desktop: ~"all and (min-width: 959px)"; -@tablet: ~"all and (max-width: 959px)"; -@mobile: ~"all and (max-width: 420px)"; - -@import "./components/spinner/Spinner.less"; -@import "./components/error/Error.less"; - -@import "modules/af-detaljert/Detaljert.less"; -@import "modules/af-liste/Liste.less"; - -input, -button, -select, -textarea { - font-family: inherit; - font-size: inherit; - line-height: inherit; -} - -.sr-only { - // Burde hentes fra nav-frontend-core - position: absolute; - width: 1px; - height: 1px; - margin: -1px; - padding: 0; - overflow: hidden; - clip: rect(0, 0, 0, 0); - border: 0; -} diff --git a/src/modules/af-detaljert/Detaljert.less b/src/modules/af-detaljert/Detaljert.less deleted file mode 100644 index ff995d0..0000000 --- a/src/modules/af-detaljert/Detaljert.less +++ /dev/null @@ -1,147 +0,0 @@ -.af-detaljert { - /** Intro-seksjon */ - &__intro { - display: flex; - flex-wrap: wrap; - @media @desktop { - padding: 0 0 0.25rem 0; - } - @media @tablet { - padding: 0 0 0.5rem 0; - } - } - &__seksjon { - @media @desktop { - width: 50%; - padding-right: 2rem; - box-sizing: border-box; - } - @media @tablet { - width: 100%; - } - } - - &__arbeidsgiver { - padding: 0.5rem 0; - } - - &__orgnr { - padding: 0.25rem 0; - } - &__periode { - display: flex; - flex-direction: row; - align-items: flex-end; - } - - &__arbeidsavtaleinnhold { - display: flex; - flex-wrap: wrap; - } - - &__boks { - margin: 0.75rem 0; - width: 50%; - padding-right: 2rem; - - @media @mobile { - width: 100%; - } - - & dd { - margin: 0; - } - } - - /** Tabs */ - /** ---------------------- */ - &__tabs { - margin: 1rem 0; - @media @mobile { - display: none; - } - } - - /** Tabellen */ - /** ---------------------- */ - &__tableWrapper { - margin: 2rem 1rem; - } - &__table { - width: 100%; - border-collapse: collapse; - - @media @mobile { - display: none; - } - - tr { - border-bottom: 1px solid #979797; - } - - th { - text-align: left; - width: 33%; - padding: 0.5rem 0; - } - - td { - padding: 0.5rem 0; - width: 33%; - } - } - - /** Print-funksjonalitet */ - /** ---------------------- */ - &__print-button-oversikt { - margin-left: 1rem; - margin-top: 1.5rem; - - svg { - width: 22px; - margin-right: 0.5rem; - } - - button { - display: flex; - background-color: transparent; - cursor: pointer; - align-items: center; - color: var(--a-surface-action); - } - } - &__print-button { - display: flex; - border: 0px; - text-decoration: underline; - - a { - display: flex; - } - - svg { - width: 22px; - margin-right: 0.5rem; - } - } - &__print-button-modal { - margin: 1rem 0; - text-decoration: underline; - cursor: pointer; - - a { - display: flex; - } - - svg { - width: 22px; - margin-right: 0.5rem; - } - } - &__checkbox { - padding: 0.25rem 0; - } - &__header { - margin: 1rem 0 0 0; - } -} diff --git a/src/modules/af-liste/Liste.less b/src/modules/af-liste/Liste.less deleted file mode 100644 index 77b6841..0000000 --- a/src/modules/af-liste/Liste.less +++ /dev/null @@ -1,80 +0,0 @@ -.af-liste { - &__tekst { - margin: 0 0 0.2rem 0; - } - &__flex-rad { - padding: 0.5rem 0; - display: flex; - align-items: center; - justify-content: space-between; - border-bottom: 1px solid #979797; - &:last-child { - border-bottom: 0; - } - } - &__flex-innhold { - min-width: 7rem; - } - &__vis-flere { - align-items: center; - background: none; - border: none; - color: var(--a-surface-action); - cursor: pointer; - display: flex; - margin-top: 0.5rem; - padding: 0.5rem 0; - text-decoration: underline; - - svg { - width: 20px; - } - } - &__maskinelt-avsluttet { - display: flex; - align-items: center; - } - &__tittel { - flex: 1; - } - &__ekspander { - display: flex; - justify-content: flex-start; - align-items: center; - cursor: pointer; - color: #0067c5; - border: 0; - padding: 0; - background-color: transparent; - } - &__month { - text-transform: capitalize; - } - &__rapporteringsperiode { - width: 15rem; - } - &__knapp { - background: none; - border: none; - color: var(--a-surface-action); - cursor: pointer; - padding: 0; - - &:hover { - text-decoration: none; - } - } - &__print-button { - margin-top: 0.5rem; - display: block; - - a { - display: inline-flex; - } - - svg { - width: 22px; - margin-right: 0.5rem; - } - } -} From 61d3f177a043b48cae00932d9aa89d6646582692 Mon Sep 17 00:00:00 2001 From: Martin Berglund Date: Tue, 30 Jul 2024 09:13:31 +0200 Subject: [PATCH 3/6] Fjerne Less-pakke og legge til Sass-pakke --- example/package.json | 6 +- package-lock.json | 275 +++++++++++++++++++++---------------------- package.json | 9 +- 3 files changed, 139 insertions(+), 151 deletions(-) diff --git a/example/package.json b/example/package.json index 4bec7eb..df07c95 100644 --- a/example/package.json +++ b/example/package.json @@ -11,7 +11,6 @@ "type": "module", "scripts": { "start": "npm-run-all -p start:*", - "start:less": "less-watch-compiler", "start:vite": "vite" }, "dependencies": { @@ -40,8 +39,7 @@ "@vitejs/plugin-react": "^4.3.1", "classnames": "2.5.1", "fetch-mock": "10.1.0", - "less": "4.2.0", - "less-watch-compiler": "1.16.3", + "sass": "^1.77.8", "vite": "5.3.3", "vite-tsconfig-paths": "4.3.2", "vitest": "2.0.3", @@ -59,4 +57,4 @@ "last 1 safari version" ] } -} +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index ce52b4f..1193072 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,8 +38,6 @@ "eslint-plugin-react": "7.34.4", "gh-pages": "6.1.1", "jsdom": "^24.1.0", - "less": "4.2.0", - "less-plugin-npm-import": "2.1.0", "npm-run-all": "4.1.5", "prettier": "3.3.3", "rollup": "4.18.1", @@ -47,6 +45,7 @@ "rollup-plugin-peer-deps-external": "2.2.4", "rollup-plugin-postcss": "4.0.2", "rollup-plugin-typescript2": "0.36.0", + "sass": "^1.77.8", "typescript": "5.5.3", "vite": "5.3.4", "vite-tsconfig-paths": "4.3.2", @@ -100,8 +99,7 @@ "@vitejs/plugin-react": "^4.3.1", "classnames": "2.5.1", "fetch-mock": "10.1.0", - "less": "4.2.0", - "less-watch-compiler": "1.16.3", + "sass": "^1.77.8", "vite": "5.3.3", "vite-tsconfig-paths": "4.3.2", "vitest": "2.0.3", @@ -3062,15 +3060,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==", - "dev": true, - "engines": { - "node": ">=0.4.2" - } - }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -3091,6 +3080,19 @@ "node": ">=4" } }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/arbeidsforhold-example": { "resolved": "example", "link": true @@ -3397,6 +3399,18 @@ "require-from-string": "^2.0.2" } }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -3601,6 +3615,42 @@ "node": ">= 16" } }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/ci-info": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", @@ -3717,6 +3767,8 @@ "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "is-what": "^3.14.1" }, @@ -4226,12 +4278,6 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/dom-walk": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", - "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==", - "dev": true - }, "node_modules/domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", @@ -4308,6 +4354,7 @@ "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", "dev": true, "optional": true, + "peer": true, "dependencies": { "prr": "~1.0.1" }, @@ -5037,12 +5084,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -5512,16 +5553,6 @@ "node": "*" } }, - "node_modules/global": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", - "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", - "dev": true, - "dependencies": { - "min-document": "^2.19.0", - "process": "^0.11.10" - } - }, "node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -5801,6 +5832,7 @@ "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", "dev": true, "optional": true, + "peer": true, "bin": { "image-size": "bin/image-size.js" }, @@ -5808,6 +5840,12 @@ "node": ">=0.10.0" } }, + "node_modules/immutable": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "dev": true + }, "node_modules/import-cwd": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz", @@ -5904,15 +5942,6 @@ "node": ">= 0.4" } }, - "node_modules/interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/is-arguments": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", @@ -5975,6 +6004,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/is-boolean-object": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", @@ -6300,7 +6341,9 @@ "version": "3.14.1", "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/isarray": { "version": "2.0.5", @@ -6957,6 +7000,8 @@ "resolved": "https://registry.npmjs.org/less/-/less-4.2.0.tgz", "integrity": "sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -6978,57 +7023,13 @@ "source-map": "~0.6.0" } }, - "node_modules/less-plugin-npm-import": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz", - "integrity": "sha512-f7pVkEooRq2/jge/M/Y+spoPXj5rRIY30q1as+3kZsDG8Rs+loNJUCVQjzXB9Ao/9FeIJULiq2zrXymv+OMTbw==", - "dev": true, - "dependencies": { - "promise": "~7.0.1", - "resolve": "~1.1.6" - }, - "engines": { - "node": ">=0.4.2" - } - }, - "node_modules/less-plugin-npm-import/node_modules/resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==", - "dev": true - }, - "node_modules/less-watch-compiler": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/less-watch-compiler/-/less-watch-compiler-1.16.3.tgz", - "integrity": "sha512-cxGUt8YdPpPPB72w1dfzPVXML5JYgfExXbFvDfG5XBU9qvj6uVjwTY2qOgwvf09Au5p2RvmWVcNps/cMTojJNQ==", - "dev": true, - "dependencies": { - "amdefine": ">= 0.1.0", - "commander": "^8.0.0", - "extend": ">= 2.0.0", - "global": "^4.3.1", - "less": "^4.0.0", - "shelljs": ">= 0.4.0" - }, - "bin": { - "less-watch-compiler": "dist/less-watch-compiler.js" - } - }, - "node_modules/less-watch-compiler/node_modules/commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true, - "engines": { - "node": ">= 12" - } - }, "node_modules/less/node_modules/make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "optional": true, + "peer": true, "dependencies": { "pify": "^4.0.1", "semver": "^5.6.0" @@ -7043,6 +7044,7 @@ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true, "optional": true, + "peer": true, "engines": { "node": ">=6" } @@ -7053,6 +7055,7 @@ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "optional": true, + "peer": true, "bin": { "semver": "bin/semver" } @@ -7267,6 +7270,7 @@ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, "optional": true, + "peer": true, "bin": { "mime": "cli.js" }, @@ -7307,15 +7311,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/min-document": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==", - "dev": true, - "dependencies": { - "dom-walk": "^0.1.0" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -7375,6 +7370,7 @@ "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==", "dev": true, "optional": true, + "peer": true, "dependencies": { "iconv-lite": "^0.6.3", "sax": "^1.2.4" @@ -7454,6 +7450,15 @@ "semver": "bin/semver" } }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/normalize-svg-path": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz", @@ -7884,6 +7889,8 @@ "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">= 0.10" } @@ -8703,24 +8710,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", - "dev": true, - "engines": { - "node": ">= 0.6.0" - } - }, - "node_modules/promise": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.0.4.tgz", - "integrity": "sha512-8z1gTSL9cMgqCx8zvMYhzT0eQURAQNSQqR8B2hGfCYkAzt1vjReVdKBv4YwGw3OXAPaxfm4aR0gLoBUon4VmmA==", - "dev": true, - "dependencies": { - "asap": "~2.0.3" - } - }, "node_modules/promise.series": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/promise.series/-/promise.series-0.2.0.tgz", @@ -8750,7 +8739,8 @@ "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", "dev": true, - "optional": true + "optional": true, + "peer": true }, "node_modules/psl": { "version": "1.9.0", @@ -8984,16 +8974,16 @@ "node": ">=4" } }, - "node_modules/rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==", + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "dependencies": { - "resolve": "^1.1.6" + "picomatch": "^2.2.1" }, "engines": { - "node": ">= 0.10" + "node": ">=8.10.0" } }, "node_modules/redent": { @@ -9456,12 +9446,30 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, + "node_modules/sass": { + "version": "1.77.8", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz", + "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==", + "dev": true, + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/sax": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", "dev": true, - "optional": true + "optional": true, + "peer": true }, "node_modules/saxes": { "version": "6.0.0", @@ -9552,23 +9560,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/shelljs": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", - "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", - "dev": true, - "dependencies": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" - }, - "bin": { - "shjs": "bin/shjs" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/side-channel": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", diff --git a/package.json b/package.json index d55c2be..f42a412 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "description": "React modul som viser brukerens arbeidsforhold", "main": "dist/index.cjs.js", "exports": { + "./style.css": "./dist/style.css", ".": { "import": "./dist/index.esm.js", "require": "./dist/index.cjs.js", @@ -18,8 +19,7 @@ "./mockListe": { "import": "./dist/mockListe.esm.js", "require": "./dist/mockListe.cjs.js" - }, - "./style.css": "./dist/style.css" + } }, "types": "dist/types/index.d.ts", "files": [ @@ -93,8 +93,6 @@ "eslint-plugin-react": "7.34.4", "gh-pages": "6.1.1", "jsdom": "^24.1.0", - "less": "4.2.0", - "less-plugin-npm-import": "2.1.0", "npm-run-all": "4.1.5", "prettier": "3.3.3", "rollup": "4.18.1", @@ -102,6 +100,7 @@ "rollup-plugin-peer-deps-external": "2.2.4", "rollup-plugin-postcss": "4.0.2", "rollup-plugin-typescript2": "0.36.0", + "sass": "^1.77.8", "typescript": "5.5.3", "vite": "5.3.4", "vite-tsconfig-paths": "4.3.2", @@ -112,4 +111,4 @@ "@rollup/plugin-typescript": "^11.1.6", "fetch-mock": "^10.1.0" } -} +} \ No newline at end of file From a66cf644dd44beab681ccd77c86ea3221ae3070b Mon Sep 17 00:00:00 2001 From: Martin Berglund Date: Tue, 30 Jul 2024 09:14:04 +0200 Subject: [PATCH 4/6] Bytte fra Less til Sass som entry point --- example/index.html | 2 +- src/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/index.html b/example/index.html index 4140ae8..316cf89 100644 --- a/example/index.html +++ b/example/index.html @@ -3,7 +3,7 @@ - + Arbeidsforhold - @navikt/arbeidsforhold diff --git a/src/index.tsx b/src/index.tsx index 170a337..6dcd62b 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,4 +1,4 @@ -import './index.less'; +import './index.scss'; import { setUpMock } from './clients/apiMock'; import { Environment } from './utils/environment'; From bce0cf6f0392986c56bad6e1630b9b7f62fc0ffb Mon Sep 17 00:00:00 2001 From: Martin Berglund Date: Wed, 7 Aug 2024 12:54:54 +0200 Subject: [PATCH 5/6] Oppdatert package-lock etter merge conflict --- package-lock.json | 222 +++++++++++++++++++++++----------------------- package.json | 3 +- 2 files changed, 114 insertions(+), 111 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3ea96ad..cc69bbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,6 +48,7 @@ "rollup-plugin-peer-deps-external": "2.2.4", "rollup-plugin-postcss": "4.0.2", "rollup-plugin-typescript2": "0.36.0", + "sass": "1.77.8", "typescript": "5.5.4", "vite": "5.3.5", "vite-tsconfig-paths": "4.3.2", @@ -101,8 +102,7 @@ "@vitejs/plugin-react": "4.3.1", "classnames": "2.5.1", "fetch-mock": "10.1.0", - "less": "4.2.0", - "less-watch-compiler": "1.16.3", + "sass": "^1.77.8", "vite": "5.3.5", "vite-tsconfig-paths": "4.3.2", "vitest": "2.0.5", @@ -2591,15 +2591,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==", - "dev": true, - "engines": { - "node": ">=0.4.2" - } - }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -2620,6 +2611,19 @@ "node": ">=4" } }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/arbeidsforhold-example": { "resolved": "example", "link": true @@ -2915,6 +2919,18 @@ "require-from-string": "^2.0.2" } }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -3122,6 +3138,42 @@ "node": ">= 16" } }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/classnames": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", @@ -3725,12 +3777,6 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/dom-walk": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", - "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==", - "dev": true - }, "node_modules/domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", @@ -4525,12 +4571,6 @@ "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==" }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -5007,16 +5047,6 @@ "node": "*" } }, - "node_modules/global": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", - "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", - "dev": true, - "dependencies": { - "min-document": "^2.19.0", - "process": "^0.11.10" - } - }, "node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -5303,6 +5333,12 @@ "node": ">=0.10.0" } }, + "node_modules/immutable": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "dev": true + }, "node_modules/import-cwd": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz", @@ -5400,15 +5436,6 @@ "node": ">= 0.4" } }, - "node_modules/interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/is-arguments": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", @@ -5471,6 +5498,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/is-boolean-object": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", @@ -6047,32 +6086,6 @@ "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==", "dev": true }, - "node_modules/less-watch-compiler": { - "version": "1.16.3", - "resolved": "https://registry.npmjs.org/less-watch-compiler/-/less-watch-compiler-1.16.3.tgz", - "integrity": "sha512-cxGUt8YdPpPPB72w1dfzPVXML5JYgfExXbFvDfG5XBU9qvj6uVjwTY2qOgwvf09Au5p2RvmWVcNps/cMTojJNQ==", - "dev": true, - "dependencies": { - "amdefine": ">= 0.1.0", - "commander": "^8.0.0", - "extend": ">= 2.0.0", - "global": "^4.3.1", - "less": "^4.0.0", - "shelljs": ">= 0.4.0" - }, - "bin": { - "less-watch-compiler": "dist/less-watch-compiler.js" - } - }, - "node_modules/less-watch-compiler/node_modules/commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true, - "engines": { - "node": ">= 12" - } - }, "node_modules/less/node_modules/make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", @@ -6359,15 +6372,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/min-document": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==", - "dev": true, - "dependencies": { - "dom-walk": "^0.1.0" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -6506,6 +6510,15 @@ "semver": "bin/semver" } }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/normalize-svg-path": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz", @@ -7731,15 +7744,6 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", - "dev": true, - "engines": { - "node": ">= 0.6.0" - } - }, "node_modules/promise": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/promise/-/promise-7.0.4.tgz", @@ -8008,16 +8012,16 @@ "node": ">=4" } }, - "node_modules/rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==", + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "dependencies": { - "resolve": "^1.1.6" + "picomatch": "^2.2.1" }, "engines": { - "node": ">= 0.10" + "node": ">=8.10.0" } }, "node_modules/redent": { @@ -8483,6 +8487,23 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, + "node_modules/sass": { + "version": "1.77.8", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz", + "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==", + "dev": true, + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/sax": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", @@ -8579,23 +8600,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/shelljs": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", - "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", - "dev": true, - "dependencies": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" - }, - "bin": { - "shjs": "bin/shjs" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/side-channel": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", diff --git a/package.json b/package.json index 3be57b3..0b0565c 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,6 @@ "rollup-plugin-postcss": "4.0.2", "rollup-plugin-typescript2": "0.36.0", "sass": "1.77.8", - "vite": "5.3.5", "typescript": "5.5.4", "vite": "5.3.5", "vite-tsconfig-paths": "4.3.2", @@ -115,4 +114,4 @@ "@rollup/plugin-typescript": "^11.1.6", "fetch-mock": "^10.1.0" } -} +} \ No newline at end of file From 7ce25f0d1b34a4cba06246a58b73b05ca99de421 Mon Sep 17 00:00:00 2001 From: terjeofnorway Date: Thu, 8 Aug 2024 13:11:17 +0000 Subject: [PATCH 6/6] 4.0.1-beta.0 --- package-lock.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index cc69bbb..4d97bd8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@navikt/arbeidsforhold", - "version": "4.0.0", + "version": "4.0.1-beta.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@navikt/arbeidsforhold", - "version": "4.0.0", + "version": "4.0.1-beta.0", "license": "MIT", "workspaces": [ "example" diff --git a/package.json b/package.json index 0b0565c..f39aa63 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@navikt/arbeidsforhold", "author": "NAVIKT", "license": "MIT", - "version": "4.0.0", + "version": "4.0.1-beta.0", "description": "React modul som viser brukerens arbeidsforhold", "main": "dist/index.cjs.js", "exports": { @@ -114,4 +114,4 @@ "@rollup/plugin-typescript": "^11.1.6", "fetch-mock": "^10.1.0" } -} \ No newline at end of file +}