Version Packages (#2972)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.eslintrc.js

@@ -32,6 +32,7 @@ module.exports = {
     "react/display-name": "off",
     "import/no-named-as-default": "off",
     // "import/no-cycle": [1],
+    "no-else-return": "error",
   },
   reportUnusedDisableDirectives: true,
   overrides: [

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,6 +19,7 @@ add links to project-tasks, slack discussions etc here
 - Check that styling is correctly exported from `@navikt/core/css/index.css`
 - Check that correct tokens for component is documented in `@navikt/core/css/tokens.json`
 - Check that only needed components and types are exported from `@navikt/core/react/src/index.ts`
+- Check that component is exported from `@navikt/core/react/package.json`
 - Add JSDoc to component (see other components for reference)
 - Create storybook-stories for relevant component variations and compositions. Stories are used for [visual regression testing](https://www.chromatic.com/docs/), so make sure they are complete.
 - Is the component sufficiently complex to warrant tests? Add some unit-tests for vitest.

.github/workflows/chromatic.yml

@@ -10,6 +10,7 @@ on:
     branches: [main, next]
     paths:
       - "@navikt/**"
+      - "aksel.nav.no/website/pages/templates/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -57,7 +58,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           projectToken: x3xqdfgkujg
           exitZeroOnChanges: false
-          buildScriptName: "build:storybook"
+          buildScriptName: "build:storybook-chromatic"
           onlyChanged: true
           untraced: "**/package.json|yarn.lock|**/*.md"
           externals: \@navikt/core/css/**/*.css

.storybook/main.ts

@@ -1,9 +1,54 @@
+import { loadCsf } from "@storybook/csf-tools";
+import { StorybookConfig } from "@storybook/react-vite";
+import { readFileSync } from "fs";
 import turbosnap from "vite-plugin-turbosnap";
+import TsconfigPathsPlugin from "vite-tsconfig-paths";
+
+const indexRegex = /export const args = {\s+index: (\d+),/;
 
 export default {
-  staticDirs: ["./public"],
+  experimental_indexers: (indexers) => {
+    // Changes here might need to be reflected in aksel.nav.no/website/.storybook/main.ts
+    const customIndexer = async (fileName: string, opts) => {
+      let code = readFileSync(fileName, "utf-8").toString();
 
-  stories: () => ["../@navikt/**/*.stories.@(js|jsx|ts|tsx|mdx)", "./*.mdx"],
+      const matches = indexRegex.exec(code);
+      const prefix = matches ? `${matches[1]} | ` : "";
+
+      code = code.split(
+        /\/\/ EXAMPLES DO NOT INCLUDE CONTENT BELOW THIS LINE/,
+      )[0];
+
+      const [templateName, name] = fileName
+        .split(`pages/templates/`)[1]
+        .replace(".tsx", "")
+        .split("/");
+      const storyName = process.env.CHROMATIC
+        ? `${templateName} | ${prefix}${name}` // Chromatic does not support folders
+        : `${prefix}${name}`;
+
+      code += `
+        export default { title: "Templates/${templateName}/${storyName}" };
+        export const Demo = { render: Example };
+        Demo.storyName = "${storyName}";`;
+
+      return loadCsf(code, { ...opts, fileName }).parse().indexInputs;
+    };
+
+    return [
+      ...(indexers || []),
+      {
+        test: /pages\/templates\/.+?.tsx$/,
+        createIndex: customIndexer,
+      },
+    ];
+  },
+  staticDirs: ["./public"],
+  stories: () => [
+    "../@navikt/**/*.stories.@(js|jsx|ts|tsx|mdx)",
+    "./*.mdx",
+    "../aksel.nav.no/website/pages/templates/**/*.tsx",
+  ],
   addons: [
     "@storybook/addon-a11y",
     "@whitespace/storybook-addon-html",
@@ -36,21 +81,24 @@ export default {
   },
   typescript: {
     check: false,
-    checkOptions: {},
     reactDocgen: false,
   },
 
   async viteFinal(config, { configType }) {
     const { mergeConfig } = await import("vite");
+
+    // The TsconfigPathsPlugin is only used to silence errors when importing nextjs components, but the imports does not acutally work.
+
     return mergeConfig(config, {
       plugins:
         configType === "PRODUCTION"
           ? [
+              TsconfigPathsPlugin(),
               turbosnap({
                 rootDir: config.root ?? process.cwd(),
               }),
             ]
-          : [],
+          : [TsconfigPathsPlugin()],
     });
   },
-};
+} satisfies StorybookConfig;

.vscode/settings.json

@@ -1,9 +1,7 @@
 {
   "cssVariables.lookupFiles": ["@navikt/core/css/dist/index.css"],
   "eslint.problems.shortenToSingleLine": true,
-  "deno.enablePaths": ["scripts/article-views", "scripts/changelog"],
   "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "deno.lint": true,
   "files.watcherExclude": {
     "**/.yarn/**": true,
     "**/dist": true,

@navikt/aksel-icons/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @navikt/aksel-icons
 
+## 6.10.1
+
+### Patch Changes
+
+- Icons: Added back support for sourcemapping. ([#2978](https://github.com/navikt/aksel/pull/2978))
+
+## 6.10.0
+
+## 6.9.0
+
+### Minor Changes
+
+- Icons: New icons for geometric shapes ([#2927](https://github.com/navikt/aksel/pull/2927))
+
+## 6.8.0
+
+## 6.7.1
+
 ## 6.7.0
 
 ## 6.6.1

@navikt/aksel-icons/__tests__/validate-config.test.ts

@@ -31,5 +31,7 @@ describe(`Each icons YML-config is valid`, () => {
 });
 
 function isDate(dateStr) {
-  return !isNaN(new Date(dateStr.split(".").reverse().join(".")).getDate());
+  return !Number.isNaN(
+    new Date(dateStr.split(".").reverse().join(".")).getDate(),
+  );
 }

@navikt/aksel-icons/config/figma/make-configs.mjs

@@ -5,11 +5,17 @@ import { resolveName } from "./icon-name.mjs";
 
 export const makeConfig = (icons, folder) => {
   icons.forEach((icon) => {
+    const name = resolveName(icon).replace(".svg", "");
+    const keywords = icon.description
+      .split(",")
+      .map((x) => x.trim())
+      .filter(Boolean);
+
     const config = {
-      name: resolveName(icon).replace(".svg", ""),
+      name,
       category: icon.containing_frame.pageName,
       sub_category: icon.containing_frame.name,
-      keywords: [...icon.description.split(",").map((x) => x.trim())],
+      keywords: keywords.length > 0 ? keywords : [name],
       variant: icon.name.includes("Variant=")
         ? icon.name.replace("Variant=", "")
         : "Stroke",
@@ -27,7 +33,11 @@ export const makeConfig = (icons, folder) => {
         .join("."),
     };
 
-    const yml = jsYaml.dump(config, { noRefs: true, skipInvalid: false });
+    const yml = jsYaml.dump(config, {
+      noRefs: true,
+      skipInvalid: false,
+      quotingType: '"',
+    });
 
     writeFileSync(resolve(folder, `${config.name}.yml`), yml, {
       encoding: "utf8",

@navikt/aksel-icons/config/index-template.js

@@ -2,7 +2,10 @@ const path = require("path");
 
 const defaultIndexTemplate = (paths) => {
   const exportEntries = paths.map((filePath) => {
-    const basename = path.basename(filePath, path.extname(filePath));
+    const basename = path.basename(
+      filePath.originalPath,
+      path.extname(filePath.originalPath),
+    );
     return `export { default as ${basename}Icon } from './${basename}'`;
   });
 

@navikt/aksel-icons/icons.stories.tsx

@@ -5,6 +5,7 @@ import { StarFillIcon } from "@navikt/aksel-icons";
 
 const meta: Meta<typeof StarFillIcon> = {
   title: "aksel-icons/Icons",
+  parameters: { html: { disable: true } },
 };
 export default meta;
 

@navikt/aksel-icons/icons/ArrowDown.yml

@@ -11,5 +11,5 @@ keywords:
   - åpnet
   - opened
 variant: Stroke
-updated_at: 07.01.2024
+updated_at: 02.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/ArrowDownRight.yml

@@ -9,5 +9,5 @@ keywords:
   - nivå
   - innrykk
 variant: Stroke
-updated_at: 16.01.2024
+updated_at: 02.05.2024
 created_at: 04.12.2023

@navikt/aksel-icons/icons/ArrowLeft.yml

@@ -8,5 +8,5 @@ keywords:
   - back
   - tilbake
 variant: Stroke
-updated_at: 04.01.2024
+updated_at: 21.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/ArrowRight.yml

@@ -9,5 +9,5 @@ keywords:
   - frem
   - fram
 variant: Stroke
-updated_at: 03.01.2024
+updated_at: 21.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/ArrowUp.yml

@@ -10,5 +10,5 @@ keywords:
   - close
   - lukke
 variant: Stroke
-updated_at: 03.01.2024
+updated_at: 02.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/ArrowsCirclepath.yml

@@ -13,5 +13,5 @@ keywords:
   - oppfrisking
   - oppdatering
 variant: Stroke
-updated_at: 29.02.2024
+updated_at: 17.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/ArrowsSquarepath.yml

@@ -14,5 +14,5 @@ keywords:
   - opptak
   - gjenopptak
 variant: Stroke
-updated_at: 04.12.2023
+updated_at: 17.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/BookmarkDash.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 4.75C7.86193 4.75 7.75 4.86193 7.75 5V6.875C7.75 7.28921 7.41421 7.625 7 7.625C6.58579 7.625 6.25 7.28921 6.25 6.875V5C6.25 4.0335 7.0335 3.25 8 3.25H10C10.4142 3.25 10.75 3.58579 10.75 4C10.75 4.41421 10.4142 4.75 10 4.75H8ZM13.25 4C13.25 3.58579 13.5858 3.25 14 3.25H16C16.9665 3.25 17.75 4.0335 17.75 5V6.875C17.75 7.28921 17.4142 7.625 17 7.625C16.5858 7.625 16.25 7.28921 16.25 6.875V5C16.25 4.86193 16.1381 4.75 16 4.75H14C13.5858 4.75 13.25 4.41421 13.25 4ZM7 9.875C7.41421 9.875 7.75 10.2108 7.75 10.625V14.375C7.75 14.7892 7.41421 15.125 7 15.125C6.58579 15.125 6.25 14.7892 6.25 14.375V10.625C6.25 10.2108 6.58579 9.875 7 9.875ZM17 9.875C17.4142 9.875 17.75 10.2108 17.75 10.625V14.375C17.75 14.7892 17.4142 15.125 17 15.125C16.5858 15.125 16.25 14.7892 16.25 14.375V10.625C16.25 10.2108 16.5858 9.875 17 9.875ZM11.4697 14.4697C11.7626 14.1768 12.2374 14.1768 12.5303 14.4697L13.7803 15.7197C14.0732 16.0126 14.0732 16.4874 13.7803 16.7803C13.4874 17.0732 13.0126 17.0732 12.7197 16.7803L12 16.0607L11.2803 16.7803C10.9874 17.0732 10.5126 17.0732 10.2197 16.7803C9.92678 16.4874 9.92678 16.0126 10.2197 15.7197L11.4697 14.4697ZM7 17.375C7.41421 17.375 7.75 17.7108 7.75 18.125V18.191C8.04448 17.9271 8.49734 17.9367 8.78033 18.2197C9.07322 18.5126 9.07322 18.9874 8.78033 19.2803L7.53033 20.5303C7.31583 20.7448 6.99324 20.809 6.71299 20.6929C6.43273 20.5768 6.25 20.3033 6.25 20V18.125C6.25 17.7108 6.58579 17.375 7 17.375ZM17 17.375C17.4142 17.375 17.75 17.7108 17.75 18.125V20C17.75 20.3033 17.5673 20.5768 17.287 20.6929C17.0068 20.809 16.6842 20.7448 16.4697 20.5303L15.2197 19.2803C14.9268 18.9874 14.9268 18.5126 15.2197 18.2197C15.5027 17.9367 15.9555 17.9271 16.25 18.191V18.125C16.25 17.7108 16.5858 17.375 17 17.375Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/BookmarkDash.yml

@@ -0,0 +1,14 @@
+name: BookmarkDash
+category: Interface
+sub_category: Filtering and sorting
+keywords:
+  - save
+  - bokmerke
+  - collection
+  - collect
+  - samling
+  - empty
+  - tom
+variant: Stroke
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/Bug.yml

@@ -2,7 +2,7 @@ name: Bug
 category: Nature and animals
 sub_category: Nature
 keywords:
-  - ""
+  - Bug
 variant: Stroke
 updated_at: 04.12.2023
 created_at: 27.02.2023

@navikt/aksel-icons/icons/BugFill.yml

@@ -2,7 +2,7 @@ name: BugFill
 category: Nature and animals
 sub_category: Nature
 keywords:
-  - ""
+  - BugFill
 variant: Fill
 updated_at: 04.12.2023
 created_at: 27.02.2023

@navikt/aksel-icons/icons/BulletList.yml

@@ -7,5 +7,5 @@ keywords:
   - order
   - punktliste
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 19.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Checkmark.yml

@@ -15,5 +15,5 @@ keywords:
   - fullføring
   - validering
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 17.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/CheckmarkCircle.yml

@@ -15,5 +15,5 @@ keywords:
   - fullføring
   - validering
 variant: Stroke
-updated_at: 04.12.2023
+updated_at: 21.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/CheckmarkCircleFill.yml

@@ -15,5 +15,5 @@ keywords:
   - fullføring
   - validering
 variant: Fill
-updated_at: 04.12.2023
+updated_at: 21.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/ChevronDown.yml

@@ -10,5 +10,5 @@ keywords:
   - åpner
   - mer
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 21.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/ChevronLeft.yml

@@ -6,5 +6,5 @@ keywords:
   - venstre
   - side
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 24.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/ChevronRight.yml

@@ -6,5 +6,5 @@ keywords:
   - høyre
   - side
 variant: Stroke
-updated_at: 04.01.2024
+updated_at: 17.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/ChevronUp.yml

@@ -10,5 +10,5 @@ keywords:
   - lukk
   - lukke
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 16.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Circle.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 3.75C7.44365 3.75 3.75 7.44365 3.75 12C3.75 16.5563 7.44365 20.25 12 20.25C16.5563 20.25 20.25 16.5563 20.25 12C20.25 7.44365 16.5563 3.75 12 3.75ZM2.25 12C2.25 6.61522 6.61522 2.25 12 2.25C17.3848 2.25 21.75 6.61522 21.75 12C21.75 17.3848 17.3848 21.75 12 21.75C6.61522 21.75 2.25 17.3848 2.25 12Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/Circle.yml

@@ -0,0 +1,8 @@
+name: Circle
+category: Status
+sub_category: Shapes
+keywords:
+  - Sirkel
+variant: Stroke
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/CircleFill.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 12C1.5 6.20101 6.20101 1.5 12 1.5C17.799 1.5 22.5 6.20101 22.5 12C22.5 17.799 17.799 22.5 12 22.5C6.20101 22.5 1.5 17.799 1.5 12Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/CircleFill.yml

@@ -0,0 +1,8 @@
+name: CircleFill
+category: Status
+sub_category: Shapes
+keywords:
+  - Sirkel
+variant: Fill
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/ClockDashed.yml

@@ -8,5 +8,5 @@ keywords:
   - historikk
   - visited
 variant: Stroke
-updated_at: 09.01.2024
+updated_at: 17.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/CurrencyExchange.yml

@@ -11,5 +11,5 @@ keywords:
   - handel
   - økonomi
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 07.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Diamond.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.4698 1.57026C11.7626 1.27736 12.2375 1.27736 12.5304 1.57026L22.4299 11.4698C22.7228 11.7626 22.7228 12.2375 22.4299 12.5304L12.5304 22.4299C12.2375 22.7228 11.7626 22.7228 11.4698 22.4299L1.57026 12.5304C1.27736 12.2375 1.27736 11.7626 1.57026 11.4698L11.4698 1.57026ZM3.16125 12.0001L12.0001 20.8389L20.8389 12.0001L12.0001 3.16125L3.16125 12.0001Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/Diamond.yml

@@ -0,0 +1,8 @@
+name: Diamond
+category: Status
+sub_category: Shapes
+keywords:
+  - diamant
+variant: Stroke
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/DiamondFill.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.57026 12.5303C1.27736 12.2374 1.27736 11.7625 1.57026 11.4696L11.4698 1.57013C11.7626 1.27724 12.2375 1.27724 12.5304 1.57013L22.4299 11.4696C22.7228 11.7625 22.7228 12.2374 22.4299 12.5303L12.5304 22.4298C12.2375 22.7227 11.7626 22.7227 11.4698 22.4298L1.57026 12.5303Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/DiamondFill.yml

@@ -0,0 +1,8 @@
+name: DiamondFill
+category: Status
+sub_category: Shapes
+keywords:
+  - diamant
+variant: Fill
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/Divide.yml

@@ -5,5 +5,5 @@ keywords:
   - dele
   - division
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 12.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/DragVertical.yml

@@ -13,5 +13,5 @@ keywords:
   - dra og slippe
   - skifte
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 23.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Enter.yml

@@ -14,5 +14,5 @@ keywords:
   - pålogging
   - adgang
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 23.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Exclamationmark.yml

@@ -13,5 +13,5 @@ keywords:
   - oppmerksomhet
   - viktig
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 16.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/EyeClosed.yml

@@ -7,5 +7,5 @@ keywords:
   - lukket
   - hidden
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 15.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/FileLoading.yml

@@ -8,7 +8,6 @@ keywords:
   - file
   - laster
   - loading
-  - ""
 variant: Stroke
 updated_at: 04.12.2023
 created_at: 07.03.2023

@navikt/aksel-icons/icons/FileLoadingFill.yml

@@ -8,7 +8,6 @@ keywords:
   - file
   - laster
   - loading
-  - ""
 variant: Fill
 updated_at: 04.12.2023
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Filter.yml

@@ -7,5 +7,5 @@ keywords:
   - data
   - tabell
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 17.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Information.yml

@@ -15,5 +15,5 @@ keywords:
   - beskrivelse
   - forklaring
 variant: Stroke
-updated_at: 04.01.2024
+updated_at: 16.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Leave.yml

@@ -15,5 +15,5 @@ keywords:
   - avslutt
   - avslutt
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 25.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/LineGraph.yml

@@ -13,5 +13,5 @@ keywords:
   - graf
   - analyse
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 25.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/LineGraphStacked.yml

@@ -13,5 +13,5 @@ keywords:
   - graf
   - analyse
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 25.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Link.yml

@@ -6,5 +6,5 @@ keywords:
   - chain
   - kobling
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 21.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/MenuElipsisHorizontal.yml

@@ -12,5 +12,5 @@ keywords:
   - nedtrekksvalg
   - ellipse
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 17.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/MenuHamburger.yml

@@ -6,5 +6,5 @@ keywords:
   - meny
   - hamburger
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 25.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Minus.yml

@@ -7,5 +7,5 @@ keywords:
   - delete
   - slett
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 12.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Multiply.yml

@@ -5,5 +5,5 @@ keywords:
   - gange
   - multiplisere
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 12.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/NotePencil.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.9697 2.96968C18.091 1.84836 19.909 1.84836 21.0303 2.96968C22.1517 4.091 22.1517 5.90902 21.0303 7.03034L19.5303 8.53033L15.1973 12.8634C15.0052 13.0555 14.771 13.2003 14.5132 13.2862L10.2372 14.7115C9.96767 14.8014 9.67055 14.7312 9.46968 14.5303C9.2688 14.3295 9.19866 14.0323 9.28849 13.7628L10.7138 9.48679C10.7998 9.22906 10.9445 8.99486 11.1366 8.80276L15.4666 4.47277C15.4676 4.47174 15.4686 4.4707 15.4697 4.46967C15.4707 4.46864 15.4717 4.46761 15.4728 4.46658L16.9697 2.96968ZM16 6.06067L12.1973 9.86342C12.1698 9.89086 12.1491 9.92432 12.1369 9.96114L11.1859 12.8142L14.0389 11.8632C14.0757 11.8509 14.1092 11.8302 14.1366 11.8028L17.9393 8.00001L16 6.06067ZM19 6.93935L17.0607 5.00001L18.0303 4.03034C18.5659 3.49481 19.4341 3.49481 19.9697 4.03034C20.5052 4.56588 20.5052 5.43415 19.9697 5.96968L19 6.93935ZM3.25 5C3.25 4.0335 4.0335 3.25 5 3.25H12C12.4142 3.25 12.75 3.58579 12.75 4C12.75 4.41421 12.4142 4.75 12 4.75H5C4.86193 4.75 4.75 4.86193 4.75 5V19C4.75 19.1381 4.86193 19.25 5 19.25H19C19.1381 19.25 19.25 19.1381 19.25 19V12C19.25 11.5858 19.5858 11.25 20 11.25C20.4142 11.25 20.75 11.5858 20.75 12V19C20.75 19.9665 19.9665 20.75 19 20.75H5C4.0335 20.75 3.25 19.9665 3.25 19V5Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/NotePencil.yml

@@ -0,0 +1,13 @@
+name: NotePencil
+category: Interface
+sub_category: Editing
+keywords:
+  - note
+  - notat
+  - edit
+  - editing
+  - manage file
+  - redigere
+variant: Stroke
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/NotePencilDash.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.9697 2.96968C18.091 1.84836 19.909 1.84836 21.0303 2.96968C22.1517 4.091 22.1517 5.90902 21.0303 7.03034L19.5303 8.53033L15.0303 13.0303C14.948 13.1127 14.8476 13.1747 14.7372 13.2115L10.2372 14.7115C9.96767 14.8014 9.67055 14.7312 9.46968 14.5303C9.2688 14.3295 9.19866 14.0323 9.28849 13.7628L10.7885 9.26284C10.8253 9.15238 10.8873 9.05201 10.9697 8.96968L15.4666 4.47277C15.4676 4.47173 15.4686 4.4707 15.4697 4.46967C15.4707 4.46864 15.4717 4.46761 15.4728 4.46659L16.9697 2.96968ZM16 6.06067L12.1555 9.90515L11.1859 12.8142L14.0949 11.8445L17.9393 8.00001L16 6.06067ZM19 6.93935L17.0607 5.00001L18.0303 4.03034C18.5659 3.49481 19.4341 3.49481 19.9697 4.03034C20.5052 4.56588 20.5052 5.43415 19.9697 5.96968L19 6.93935ZM3.25 5C3.25 4.0335 4.0335 3.25 5 3.25H6.75C7.16421 3.25 7.5 3.58579 7.5 4C7.5 4.41421 7.16421 4.75 6.75 4.75H5C4.86193 4.75 4.75 4.86193 4.75 5V6.75C4.75 7.16421 4.41421 7.5 4 7.5C3.58579 7.5 3.25 7.16421 3.25 6.75V5ZM9.5 4C9.5 3.58579 9.83579 3.25 10.25 3.25H12C12.4142 3.25 12.75 3.58579 12.75 4C12.75 4.41421 12.4142 4.75 12 4.75H10.25C9.83579 4.75 9.5 4.41421 9.5 4ZM4 9.5C4.41421 9.5 4.75 9.83579 4.75 10.25V13.75C4.75 14.1642 4.41421 14.5 4 14.5C3.58579 14.5 3.25 14.1642 3.25 13.75V10.25C3.25 9.83579 3.58579 9.5 4 9.5ZM20 11.25C20.4142 11.25 20.75 11.5858 20.75 12V13.75C20.75 14.1642 20.4142 14.5 20 14.5C19.5858 14.5 19.25 14.1642 19.25 13.75V12C19.25 11.5858 19.5858 11.25 20 11.25ZM4 16.5C4.41421 16.5 4.75 16.8358 4.75 17.25V19C4.75 19.1381 4.86193 19.25 5 19.25H6.75C7.16421 19.25 7.5 19.5858 7.5 20C7.5 20.4142 7.16421 20.75 6.75 20.75H5C4.0335 20.75 3.25 19.9665 3.25 19V17.25C3.25 16.8358 3.58579 16.5 4 16.5ZM20 16.5C20.4142 16.5 20.75 16.8358 20.75 17.25V19C20.75 19.9665 19.9665 20.75 19 20.75H17.25C16.8358 20.75 16.5 20.4142 16.5 20C16.5 19.5858 16.8358 19.25 17.25 19.25H19C19.1381 19.25 19.25 19.1381 19.25 19V17.25C19.25 16.8358 19.5858 16.5 20 16.5ZM9.5 20C9.5 19.5858 9.83579 19.25 10.25 19.25H13.75C14.1642 19.25 14.5 19.5858 14.5 20C14.5 20.4142 14.1642 20.75 13.75 20.75H10.25C9.83579 20.75 9.5 20.4142 9.5 20Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/NotePencilDash.yml

@@ -0,0 +1,15 @@
+name: NotePencilDash
+category: Interface
+sub_category: Editing
+keywords:
+  - note
+  - notat
+  - edit
+  - editing
+  - manage file
+  - redigere
+  - empty
+  - tom
+variant: Stroke
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/NotePencilFill.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.2929 8.70711C18.3905 8.60948 18.3905 8.45118 18.2929 8.35355L15.6465 5.70711C15.5488 5.60948 15.3905 5.60948 15.2929 5.70711L11.6669 9.33309C11.5571 9.44286 11.4744 9.57669 11.4253 9.72397L10.1581 13.5257C10.093 13.7211 10.2789 13.907 10.4743 13.8419L14.276 12.5747C14.4233 12.5256 14.5571 12.4429 14.6669 12.3331L18.2929 8.70711ZM19.3536 7.29289C19.4512 7.39052 19.6095 7.39053 19.7071 7.2929L20.5 6.50001C21.3284 5.67159 21.3284 4.32844 20.5 3.50001C19.6716 2.67159 18.3284 2.67159 17.5 3.50001L16.7071 4.2929C16.6095 4.39053 16.6095 4.54882 16.7071 4.64645L19.3536 7.29289ZM15.2019 3.67678C15.3594 3.51929 15.2479 3.25 15.0251 3.25H5C4.0335 3.25 3.25 4.0335 3.25 5V19C3.25 19.9665 4.0335 20.75 5 20.75H19C19.9665 20.75 20.75 19.9665 20.75 19V8.97488C20.75 8.75216 20.4807 8.64062 20.3232 8.79811L15.7276 13.3937C15.4531 13.6682 15.1186 13.875 14.7504 13.9977L10.9487 15.2649C9.5806 15.721 8.27906 14.4194 8.73509 13.0513L10.0023 9.24962C10.1251 8.88143 10.3318 8.54686 10.6063 8.27243L15.2019 3.67678Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/NotePencilFill.yml

@@ -0,0 +1,13 @@
+name: NotePencilFill
+category: Interface
+sub_category: Editing
+keywords:
+  - note
+  - notat
+  - edit
+  - editing
+  - manage file
+  - redigere
+variant: Fill
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/NumberList.yml

@@ -7,5 +7,5 @@ keywords:
   - order
   - nummerliste
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 19.04.2024
 created_at: 28.04.2023

@navikt/aksel-icons/icons/Paperclip.yml

@@ -13,5 +13,5 @@ keywords:
   - papir
   - kontorrekvisita
 variant: Stroke
-updated_at: 04.01.2024
+updated_at: 03.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Pause.yml

@@ -2,7 +2,7 @@ name: Pause
 category: Media
 sub_category: Control
 keywords:
-  - ""
+  - Pause
 variant: Stroke
 updated_at: 04.12.2023
 created_at: 07.03.2023

@navikt/aksel-icons/icons/PauseFill.yml

@@ -2,7 +2,7 @@ name: PauseFill
 category: Media
 sub_category: Control
 keywords:
-  - ""
+  - PauseFill
 variant: Fill
 updated_at: 04.12.2023
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Pentagon.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5609 1.89199C11.823 1.70267 12.177 1.70267 12.4391 1.89199L21.4391 8.39199C21.7049 8.58392 21.8152 8.92619 21.7115 9.23717L18.2115 19.7372C18.1094 20.0434 17.8228 20.25 17.5 20.25H6.49999C6.17717 20.25 5.89057 20.0434 5.78848 19.7372L2.28848 9.23717C2.18482 8.92619 2.29513 8.58392 2.56087 8.39199L11.5609 1.89199ZM3.88572 9.28546L7.04056 18.75H16.9594L20.1143 9.28546L12 3.42515L3.88572 9.28546Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/Pentagon.yml

@@ -0,0 +1,8 @@
+name: Pentagon
+category: Status
+sub_category: Shapes
+keywords:
+  - femkant
+variant: Stroke
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/PentagonFill.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5609 1.89199C11.823 1.70267 12.177 1.70267 12.4391 1.89199L21.4391 8.39199C21.7049 8.58392 21.8152 8.92619 21.7115 9.23717L18.2115 19.7372C18.1094 20.0434 17.8228 20.25 17.5 20.25H6.49999C6.17717 20.25 5.89057 20.0434 5.78848 19.7372L2.28848 9.23717C2.18482 8.92619 2.29513 8.58392 2.56087 8.39199L11.5609 1.89199Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/PentagonFill.yml

@@ -0,0 +1,8 @@
+name: PentagonFill
+category: Status
+sub_category: Shapes
+keywords:
+  - femkant
+variant: Fill
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/Plus.yml

@@ -6,5 +6,5 @@ keywords:
   - legg til
   - more
 variant: Stroke
-updated_at: 03.01.2024
+updated_at: 12.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Questionmark.yml

@@ -13,5 +13,5 @@ keywords:
   - veiledning
   - spørsmålstegn
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 25.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/SparkLarge.yml

@@ -8,5 +8,5 @@ keywords:
   - loading
   - laster
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 15.05.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Square.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.25 4C3.25 3.58579 3.58579 3.25 4 3.25H20C20.4142 3.25 20.75 3.58579 20.75 4V20C20.75 20.4142 20.4142 20.75 20 20.75H4C3.58579 20.75 3.25 20.4142 3.25 20V4ZM4.75 4.75V19.25H19.25V4.75H4.75Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/Square.yml

@@ -0,0 +1,9 @@
+name: Square
+category: Status
+sub_category: Shapes
+keywords:
+  - firkant
+  - kvadrat
+variant: Stroke
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/SquareFill.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.25 4C3.25 3.58579 3.58579 3.25 4 3.25H20C20.4142 3.25 20.75 3.58579 20.75 4V20C20.75 20.4142 20.4142 20.75 20 20.75H4C3.58579 20.75 3.25 20.4142 3.25 20V4Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/SquareFill.yml

@@ -0,0 +1,9 @@
+name: SquareFill
+category: Status
+sub_category: Shapes
+keywords:
+  - firkant
+  - kvadrat
+variant: Fill
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/Staircase.yml

@@ -7,5 +7,5 @@ keywords:
   - stairs
   - floors
 variant: Stroke
-updated_at: 08.01.2024
+updated_at: 19.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/StarsEu.yml

@@ -6,5 +6,5 @@ keywords:
   - europa
   - europe
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 29.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/TrendUp.yml

@@ -12,5 +12,5 @@ keywords:
   - diagram
   - analyse
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 25.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/Triangle.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 2.25C12.2731 2.25 12.5245 2.3984 12.6565 2.63743L22.1828 19.8874C22.3111 20.1198 22.3071 20.4026 22.1722 20.6312C22.0373 20.8597 21.7917 21 21.5263 21H2.47372C2.20832 21 1.96268 20.8597 1.8278 20.6312C1.69292 20.4026 1.68888 20.1198 1.81719 19.8874L11.3435 2.63743C11.4755 2.3984 11.7269 2.25 12 2.25ZM3.74468 19.5H20.2553L12 4.55142L3.74468 19.5Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/Triangle.yml

@@ -0,0 +1,9 @@
+name: Triangle
+category: Status
+sub_category: Shapes
+keywords:
+  - triangel
+  - trekant
+variant: Stroke
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/TriangleFill.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9999 2.25C12.273 2.25 12.5244 2.3984 12.6565 2.63743L22.1827 19.8874C22.311 20.1198 22.307 20.4026 22.1721 20.6312C22.0372 20.8597 21.7916 21 21.5262 21H2.47363C2.20823 21 1.96259 20.8597 1.82771 20.6312C1.69283 20.4026 1.68879 20.1198 1.8171 19.8874L11.3434 2.63743C11.4754 2.3984 11.7269 2.25 11.9999 2.25Z" fill="#23262A"/>
+</svg>

@navikt/aksel-icons/icons/TriangleFill.yml

@@ -0,0 +1,9 @@
+name: TriangleFill
+category: Status
+sub_category: Shapes
+keywords:
+  - triangel
+  - trekant
+variant: Fill
+updated_at: 15.05.2024
+created_at: 15.05.2024

@navikt/aksel-icons/icons/Vitals.yml

@@ -13,5 +13,5 @@ keywords:
   - oksygen
   - blodtrykk
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 12.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/icons/XMark.yml

@@ -15,5 +15,5 @@ keywords:
   - avvis
   - avslå
 variant: Stroke
-updated_at: 05.01.2024
+updated_at: 15.04.2024
 created_at: 07.03.2023

@navikt/aksel-icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-icons",
-  "version": "6.7.0",
+  "version": "6.10.1",
   "author": "Aksel | NAV",
   "homepage": "https://aksel.nav.no/ikoner",
   "repository": {
@@ -52,10 +52,11 @@
   },
   "files": [
     "dist/*",
+    "src",
     "!**/*.tsbuildinfo"
   ],
   "scripts": {
-    "create-icons": "svgr --no-prettier --silent --index-template config/index-template.js --out-dir src icons && prettier --write ./src",
+    "create-icons": "svgr --no-prettier --silent --index-template config/index-template.js --out-dir src icons && yarn prettier --write ./src",
     "parse-svg": "node -e 'require(\"./config/parse-svg.js\").main()'",
     "copy": "copyfiles util/* src",
     "update-metadata": "node config/metadata.js",
@@ -67,7 +68,7 @@
     "test:watch": "vitest watch"
   },
   "devDependencies": {
-    "@svgr/cli": "6.5.1",
+    "@svgr/cli": "8.1.0",
     "adm-zip": "^0.5.10",
     "concurrently": "7.2.1",
     "copyfiles": "^2.4.1",
@@ -78,6 +79,7 @@
     "js-yaml": "^4.1.0",
     "lodash.camelcase": "4.3.0",
     "lodash.startcase": "4.4.0",
+    "prettier": "3.1.1",
     "react": "^18.0.0",
     "rehype-parse": "8.0.4",
     "tsc-alias": "1.8.8",

@navikt/aksel-stylelint/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @navikt/aksel-stylelint
 
+## 6.10.1
+
+## 6.10.0
+
+## 6.9.0
+
+## 6.8.0
+
+## 6.7.1
+
 ## 6.7.0
 
 ## 6.6.1

@navikt/aksel-stylelint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-stylelint",
-  "version": "6.7.0",
+  "version": "6.10.1",
   "author": "Aksel | NAV",
   "homepage": "https://aksel.nav.no/grunnleggende/kode/stylelint",
   "repository": {
@@ -35,8 +35,8 @@
     "dev": "yarn watch:lint"
   },
   "devDependencies": {
-    "@navikt/ds-css": "^6.7.0",
-    "@navikt/ds-tokens": "^6.7.0",
+    "@navikt/ds-css": "^6.10.1",
+    "@navikt/ds-tokens": "^6.10.1",
     "concurrently": "7.2.1",
     "postcss-selector-parser": "^6.0.13",
     "postcss-value-parser": "^4.2.0",

@navikt/aksel-stylelint/src/rules/aksel-no-deprecated-classes/index.ts

@@ -22,7 +22,9 @@ const ruleFunction: stylelint.Rule = () => {
               !deprecation.classes.includes(className.value)
             ) {
               continue;
-            } else if (
+            }
+
+            if (
               deprecation.deprecatePrefix &&
               !deprecation.classes.some((x) => className.value.startsWith(x))
             ) {

@navikt/aksel/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @navikt/aksel
 
+## 6.10.1
+
+### Patch Changes
+
+- Updated dependencies [[`334627061`](https://github.com/navikt/aksel/commit/334627061a5aa1a9af0e3118b7a69e1df784c35f)]:
+  - @navikt/ds-css@6.10.1
+
+## 6.10.0
+
+### Patch Changes
+
+- Updated dependencies [[`1cab3698b`](https://github.com/navikt/aksel/commit/1cab3698b1cbe6b9f3d4b244b16eea7e33a6ecec)]:
+  - @navikt/ds-css@6.10.0
+
+## 6.9.0
+
+### Patch Changes
+
+- Updated dependencies [[`62dd6a321`](https://github.com/navikt/aksel/commit/62dd6a321c2110ed10ed67ca0bf48aa3742423f6), [`394cc94db`](https://github.com/navikt/aksel/commit/394cc94db70df50e9d3c74b1144a53921b9cc380)]:
+  - @navikt/ds-css@6.9.0
+
+## 6.8.0
+
+### Patch Changes
+
+- Updated dependencies [[`bd482c5d3`](https://github.com/navikt/aksel/commit/bd482c5d3ea9c7f84114d1199e73594c7b593154), [`7becf3e4c`](https://github.com/navikt/aksel/commit/7becf3e4cf47b119e4b456a066b53e6077669bcd)]:
+  - @navikt/ds-css@6.8.0
+
+## 6.7.1
+
+### Patch Changes
+
+- Updated dependencies [[`0c06fa12d`](https://github.com/navikt/aksel/commit/0c06fa12d0de4f3015be045d4e65e149ebd2c141)]:
+  - @navikt/ds-css@6.7.1
+
 ## 6.7.0
 
 ### Patch Changes

@navikt/aksel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "6.7.0",
+  "version": "6.10.1",
   "description": "Aksel command line interface. Handles css-imports, codemods and more",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -29,7 +29,7 @@
   },
   "homepage": "https://aksel.nav.no/grunnleggende/kode/kommandolinje",
   "dependencies": {
-    "@navikt/ds-css": "6.7.0",
+    "@navikt/ds-css": "6.10.1",
     "axios": "1.6.0",
     "chalk": "4.1.0",
     "clipboardy": "^2.3.0",

@navikt/aksel/src/codemod/migrations.ts

@@ -101,21 +101,20 @@ export const migrations: {
 
 export function getMigrationPath(str: string) {
   return Object.values(migrations)
-    .reduce((acc, val) => [...val, ...acc], [])
+    .flat()
     .find((x) => x.value === str)?.path;
 }
 
 export function getWarning(str: string) {
   return Object.values(migrations)
-    .reduce((acc, val) => [...val, ...acc], [])
+    .flat()
     .find((x) => x.value === str)?.warning;
 }
 
 export function getMigrationNames() {
-  return Object.values(migrations).reduce(
-    (acc, val) => [...val.map((x) => x.value), ...acc],
-    [] as string[],
-  );
+  return Object.values(migrations)
+    .flat()
+    .map((x) => x.value);
 }
 
 export function getMigrationString() {

@navikt/aksel/src/index.ts

@@ -11,25 +11,31 @@ async function run() {
   if (!process.argv[2] || process.argv[2] === "help") {
     helpCommand();
     return;
-  } else if (process.argv[2] === "css-imports") {
+  }
+
+  if (process.argv[2] === "css-imports") {
     await cssImportsCommand();
     return;
-  } else if (process.argv[2] === "codemod") {
+  }
+
+  if (process.argv[2] === "codemod") {
     codemodCommand();
     return;
-  } else if (process.argv[2] === "-v" || process.argv[2] === "--version") {
+  }
+
+  if (process.argv[2] === "-v" || process.argv[2] === "--version") {
     const pkg = JSON.parse(
       fs.readFileSync("./package.json").toString(),
     ).version;
     console.log(pkg);
     return;
-  } else {
-    console.log(
-      chalk.red(
-        `Unknown command: ${process.argv[2]}.\nRun ${chalk.cyan(
-          "npx @navikt/aksel help",
-        )} for all available commands.`,
-      ),
-    );
   }
+
+  console.log(
+    chalk.red(
+      `Unknown command: ${process.argv[2]}.\nRun ${chalk.cyan(
+        "npx @navikt/aksel help",
+      )} for all available commands.`,
+    ),
+  );
 }

@navikt/core/css/CHANGELOG.md

@@ -1,5 +1,41 @@
 # @navikt/ds-css
 
+## 6.10.1
+
+### Patch Changes
+
+- :lipstick: Remove bottom margin on last item in Stepper and adjust FormProgress accordingly ([#2971](https://github.com/navikt/aksel/pull/2971))
+
+## 6.10.0
+
+### Minor Changes
+
+- ✨ Modal: add small version ([#2909](https://github.com/navikt/aksel/pull/2909))
+
+## 6.9.0
+
+### Patch Changes
+
+- Increased padding size for contentBlockPadding on the Page primitive to 4 rem to reflect docs/Figma ([#2876](https://github.com/navikt/aksel/pull/2876))
+
+- Fixed Combobox small sizing to align with other form fields ([#2801](https://github.com/navikt/aksel/pull/2801))
+
+## 6.8.0
+
+### Minor Changes
+
+- :sparkles: Ny komponent: FormProgress ([#2855](https://github.com/navikt/aksel/pull/2855))
+
+### Patch Changes
+
+- HGrid: forenklet CSS. ([#2917](https://github.com/navikt/aksel/pull/2917))
+
+## 6.7.1
+
+### Patch Changes
+
+- Progressbar: Tweak API, examples, stories and css ([#2892](https://github.com/navikt/aksel/pull/2892))
+
 ## 6.7.0
 
 ### Minor Changes

@navikt/core/css/config/_mappings.js

@@ -179,6 +179,17 @@ const StyleMappings = {
       main: formCss,
       dependencies: [typoCss, "link.css"],
     },
+    {
+      component: "FormProgress",
+      main: formCss,
+      dependencies: [
+        typoCss,
+        "progress-bar.css",
+        "button.css",
+        primitivesCss,
+        "stepper.css",
+      ],
+    },
     {
       component: "ToggleGroup",
       main: "toggle-group.css",

@navikt/core/css/form/combobox.css

@@ -1,18 +1,41 @@
 .navds-combobox__wrapper {
+  --__ac-combobox-icon-size: 1.5rem;
+  --__ac-combobox-wrapper-inner-padding: var(--a-spacing-2);
+  --__ac-combobox-list-item-padding-block: var(--a-spacing-3);
+  --__ac-combobox-list-item-padding-inline: var(--a-spacing-3);
+  --__ac-combobox-border-width: 1px;
+  --__ac-combobox-input-height: 2rem;
+
   display: flex;
   flex-direction: column;
   width: 100%;
   position: relative;
 }
 
-.navds-combobox__wrapper-inner {
+.navds-form-field--small .navds-combobox__wrapper {
+  --__ac-combobox-icon-size: 1.25rem;
+  --__ac-combobox-wrapper-inner-padding: var(--a-spacing-1);
+  --__ac-combobox-list-item-padding-block: var(--a-spacing-1-alt);
+  --__ac-combobox-list-item-padding-inline: var(--a-spacing-2);
+  --__ac-combobox-input-height: 1.5rem;
+}
+
+.navds-combobox__button-clear svg,
+.navds-combobox__button-toggle-list svg,
+.navds-combobox__list svg {
+  width: var(--__ac-combobox-icon-size);
+  height: var(--__ac-combobox-icon-size);
+}
+
+.navds-combobox__wrapper-inner.navds-text-field__input {
   position: relative;
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
   width: 100%;
-  padding: calc(var(--a-spacing-2) - 2px) var(--a-spacing-2);
+  padding-block: calc(var(--__ac-combobox-wrapper-inner-padding) - var(--__ac-combobox-border-width));
+  padding-inline: var(--__ac-combobox-wrapper-inner-padding);
 }
 
 .navds-combobox__wrapper-inner > :first-child {
@@ -24,10 +47,6 @@
   flex-flow: row nowrap;
 }
 
-.navds-form-field--small .navds-combobox__wrapper-inner {
-  padding: var(--a-spacing-1) calc(var(--a-spacing-3) / 2);
-}
-
 .navds-combobox__wrapper-inner:hover {
   cursor: text;
 }
@@ -47,7 +66,7 @@
 }
 
 .navds-combobox__selected-options {
-  gap: var(--a-spacing-2);
+  gap: var(--__ac-combobox-wrapper-inner-padding);
   align-items: center;
 }
 
@@ -82,7 +101,7 @@
   margin: 0;
   min-width: 10ch;
   width: 100%;
-  height: 2rem;
+  height: var(--__ac-combobox-input-height);
 }
 
 .navds-combobox__input:focus-visible {
@@ -147,11 +166,6 @@
   padding: 0;
 }
 
-.navds-combobox__button-clear svg {
-  width: 1.5rem;
-  height: 1.5rem;
-}
-
 .navds-combobox__input::-webkit-search-cancel-button {
   display: none;
 }
@@ -197,18 +211,6 @@
   }
 }
 
-.navds-combobox__button-toggle-list svg {
-  width: 1.5rem;
-  height: 1.5rem;
-  pointer-events: none;
-}
-
-.navds-form-field--small .navds-combobox__button-toggle-list svg,
-.navds-form-field--small .navds-combobox__button-clear svg {
-  width: 1.25rem;
-  height: 1.25rem;
-}
-
 /* dropdown & non selectable dropdown items */
 
 .navds-combobox__list {
@@ -226,18 +228,12 @@
   border-radius: var(--a-border-radius-medium);
   background-color: var(--ac-combobox-list-bg, var(--a-surface-default));
   color: var(--ac-combobox-list-text, var(--a-text-default));
-  gap: var(--a-spacing-1) 0;
 }
 
 .navds-combobox__list--closed {
   display: none;
 }
 
-.navds-combobox__list svg {
-  height: 1.5rem;
-  width: 1.5rem;
-}
-
 .navds-combobox__list_non-selectables {
   position: sticky;
   top: 0;
@@ -251,23 +247,17 @@
 .navds-combobox__list-item--no-options,
 .navds-combobox__list-item--new-option,
 .navds-combobox__list-item--max-selected {
+  align-items: center;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  padding: var(--a-spacing-3);
+  padding-block: var(--__ac-combobox-list-item-padding-block);
+  padding-inline: var(--__ac-combobox-list-item-padding-inline);
   width: 100%;
   background-color: var(--ac-combobox-list-item-bg, var(--a-surface-default));
   scroll-margin-top: 50px;
 }
 
-.navds-form-field--small .navds-combobox__list-item,
-.navds-form-field--small .navds-combobox__list-item--loading,
-.navds-form-field--small .navds-combobox__list-item--no-options,
-.navds-form-field--small .navds-combobox__list-item--new-option,
-.navds-form-field--small .navds-combobox__list-item--max-selected {
-  padding: calc(var(--a-spacing-3) / 2) var(--a-spacing-2);
-}
-
 .navds-combobox__list-item--loading {
   justify-content: center;
   background-color: var(--ac-combobox-list-item-loading-bg, var(--a-surface-default));
@@ -278,7 +268,6 @@
   border-start-start-radius: calc(var(--a-border-radius-medium) - 1px);
   border-start-end-radius: calc(var(--a-border-radius-medium) - 1px);
   border: 1px solid var(--ac-combobox-list-item-max-selected-border, var(--a-border-info));
-  margin-bottom: calc(var(--a-spacing-1) * -1);
 }
 
 .navds-combobox__list_non-selectables:hover {
@@ -305,12 +294,7 @@
   background-color: var(--ac-combobox-list-item-hover-bg, var(--a-surface-hover));
   cursor: pointer;
   border-left: 4px solid var(--ac-combobox-list-item-hover-border-left, var(--a-border-strong));
-  padding-left: calc(var(--a-spacing-3) - 4px);
-}
-
-.navds-form-field--small .navds-combobox__list-item--focus,
-.navds-combobox__list--with-hover .navds-form-field--small .navds-combobox__list-item:hover {
-  padding-left: calc(var(--a-spacing-2) - 4px);
+  padding-inline-start: calc(var(--__ac-combobox-list-item-padding-inline) - 4px);
 }
 
 .navds-combobox__list-item[data-no-focus="true"] {
@@ -330,7 +314,6 @@
 .navds-combobox__list--with-hover .navds-combobox__list-item--selected:hover {
   background-color: var(--ac-combobox-list-item-selected-hover-bg, var(--a-surface-action-subtle-hover));
   border-left: 4px solid var(--ac-combobox-list-item-selected-hover-border-left, var(--a-border-focus));
-  padding-left: calc(var(--a-spacing-3) - 4px);
 }
 
 .navds-combobox__list-item--new-option {

@navikt/core/css/form/form-progress.css

@@ -0,0 +1,52 @@
+.navds-form-progress__bar {
+  margin-bottom: var(--a-spacing-2);
+}
+
+.navds-form-progress__button[data-state="closed"] .navds-form-progress__btn-txt-hide,
+.navds-form-progress__button[data-state="open"] .navds-form-progress__btn-txt-show {
+  display: none;
+}
+
+.navds-form-progress__button:hover svg {
+  transform: translateY(1px);
+}
+
+.navds-form-progress__button[data-state="open"] svg {
+  transform: rotate(-180deg);
+}
+
+.navds-form-progress__button[data-state="open"]:hover svg {
+  transform: translateY(-1px) rotate(-180deg);
+}
+
+.navds-form-progress__collapsible {
+  display: grid;
+  grid-template-rows: 0fr;
+  overflow: hidden;
+  transition: grid-template-rows 0.3s cubic-bezier(0.3, 0, 0.15, 1);
+}
+
+.navds-form-progress__collapsible[hidden] {
+  display: grid;
+}
+
+.navds-form-progress__collapsible[data-state="open"] {
+  grid-template-rows: 1fr;
+}
+
+.navds-form-progress__collapsible-content {
+  min-height: 0;
+  transition: visibility 0.3s;
+  visibility: hidden;
+}
+
+.navds-form-progress__collapsible[data-state="open"] .navds-form-progress__collapsible-content {
+  visibility: visible;
+}
+
+.navds-form-progress__stepper {
+  border: 2px solid var(--a-border-subtle);
+  border-radius: var(--a-border-radius-large);
+  padding: var(--a-spacing-2) var(--a-spacing-4);
+  margin-top: var(--a-spacing-1);
+}

@navikt/core/css/form/index.css

@@ -14,3 +14,4 @@
 @import "search.css";
 @import "combobox.css";
 @import "form-summary.css";
+@import "form-progress.css";

@navikt/core/css/modal.css

@@ -103,6 +103,10 @@
   padding: var(--a-spacing-6) var(--a-spacing-6) var(--a-spacing-4) var(--a-spacing-6);
 }
 
+.navds-modal--small .navds-modal__header {
+  padding: var(--a-spacing-4) var(--a-spacing-4) var(--a-spacing-3) var(--a-spacing-4);
+}
+
 .navds-modal__header-icon svg {
   display: inline;
   vertical-align: -0.25rem;
@@ -121,6 +125,10 @@
   position: relative; /* Needed to make sr-only elements position correctly - see Storybook */
 }
 
+.navds-modal--small .navds-modal__body {
+  padding: var(--a-spacing-2) var(--a-spacing-4) var(--a-spacing-4);
+}
+
 .navds-modal__header + .navds-modal__body {
   padding-top: var(--a-spacing-0);
 }
@@ -132,6 +140,10 @@
   padding: var(--a-spacing-4) var(--a-spacing-6) var(--a-spacing-6) var(--a-spacing-6);
 }
 
+.navds-modal--small .navds-modal__footer {
+  padding: var(--a-spacing-4);
+}
+
 .navds-modal__footer :nth-of-type(2) {
   margin-left: auto;
 }