Lerna versionbump [ci skip]

- @navikt/ds-icons@0.6.0
 - @navikt/ds-react@0.12.0
 - @navikt/ds-react-internal@0.7.0

.github/workflows/update-icons.yml

@@ -0,0 +1,45 @@
+name: Update Icons
+
+on:
+  schedule:
+    - cron: 0 0 * * *
+  workflow_dispatch:
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # Required to retrieve git history
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 14
+      - name: Node-modules cache
+        uses: actions/cache@v2
+        id: node-cache
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+      - name: install
+        if: steps.node-cache.outputs.cache-hit != 'true'
+        run: yarn install
+      - name: postinstall
+        if: steps.node-cache.outputs.cache-hit == 'true'
+        run: yarn postinstall
+      - name: add Figma token to .env
+        run: echo "FIGMA_TOKEN=${{ secrets.FIGMA_IKONER_API }}" >> @navikt/core/icons/.env
+      - name: Update Icons
+        run: yarn update:icons
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.GIT_REPO }}
+          commit-message: "Oppdatert ikoner fra figma"
+          committer: GitHub <noreply@github.com>
+          branch: figma-icons-sync
+          delete-branch: true
+          title: "[FIX] Automatisk PR for ikoner"
+          labels: |
+            Icons
+            automated pr

.storybook/main.js

@@ -11,6 +11,7 @@ module.exports = {
   ],
   addons: [
     "@storybook/addon-docs",
+    "@storybook/addon-a11y",
     {
       name: "@storybook/addon-storysource",
       options: {

.storybook/stories/introduction.stories.mdx

@@ -20,3 +20,16 @@ import "@navikt/ds-css"
 Dette vil også legge css-variabler på :root. For å få dette til å fungere med IE11, kan denne pakken tas i bruk: https://jhildenbiddle.github.io/css-vars-ponyfill/#/
 
 Note: Disse komponentene kan ikke garanteres at fungerer som forventet i IE11 da vi har valgt og ikke unngå styling-valg basert på IE11 støtte eller ikke.
+
+## Bruke styled-components eller emotion
+
+Flere av våre komponenter er implementert med OverridableComponent. Dette vil si at komponenten tar i mot en prop, `as` som lar deg endre hvilken tag som blir satt.
+Bruk for dette er eks hvis du ønsker `Heading` stilen, men ikke en heading-tag. Da kan man lett skrive `<Heading as="div">` og man vil få en `div`-tag istedenfor.
+
+Flere css-in-js bibliotek har også denne funksjonaliteten bygd inne, noe som kan komplisere ting når alle bruker samme navn `as` for dette.
+
+### Løsninger
+
+[Styled-components](https://styled-components.com/docs/api#forwardedas-prop)
+
+> TLDR: Bruk `forwardedAs` istendenfor `as` på komponentene, SD fikser resten.

@navikt/core/icons/.svgrrc.js

@@ -0,0 +1,16 @@
+const template = require("./template");
+
+module.exports = {
+  typescript: true,
+  ref: true,
+  icon: true,
+  titleProp: true,
+  svgProps: {
+    focusable: false,
+    role: "img",
+  },
+  replaceAttrValues: {
+    "#262626": "currentColor",
+  },
+  template,
+};

@navikt/core/icons/README.md

@@ -1,6 +1,6 @@
 # @navikt/ds-icons
 
-Denne pakken leverer [NAVs ikoner](https://design.nav.no/resources/icons) i en pakke med React-komponenter og SVGer.
+Leverer [NAVs ikoner](https://design.nav.no/resources/icons) i React og SVG.
 
 ## Installering
 
@@ -12,7 +12,17 @@ yarn add @navikt/ds-icons
 npm install @navikt/ds-icons
 ```
 
+## Bruk
+
+```jsx
+/* ESM (anbefalt for tree-shaking)*/
+import { Down } from "@navikt/ds-icons";
+/* CJS */
+import { Down } from "@navikt/cjs/ds-icons";
+
+<Down aria-label="Åpne meny" />;
+```
+
 ## Dokumentasjon
 
 - [Ikonsøk](https://design.nav.no/resources/icons)
-- [Installering](https://design.nav.no/resources/icons/install)

@navikt/core/icons/figma-api/api.mjs

@@ -1,49 +0,0 @@
-// https://levelup.gitconnected.com/learn-svg-to-react-using-figma-api-be0a5f9c0ca
-// used for reference/implementation
-
-import Axios from "axios";
-const { create, get } = Axios;
-
-// Requires user to add a personalized figma token in .env
-const headers = {
-  "X-FIGMA-TOKEN": process.env.FIGMA_TOKEN,
-};
-/**
- * Api connection for icon components
- * https://www.figma.com/file/UmEVH3pZ71uJPsSz9ilP3Y/NAV-ikoner-2.1-Figma-i-test?node-id=0%3A1
- */
-const instanceFiles = create({
-  baseURL: `https://api.figma.com/v1/files/${process.env.FILE_KEY}/components`,
-  headers,
-});
-
-/**
- * api endpoint for images
- */
-const instanceImages = create({
-  baseURL: `https://api.figma.com/v1/images/${process.env.FILE_KEY}`,
-  headers,
-});
-
-/**
- * get Figma node components children
- */
-export const getNodeChildren = async () => {
-  const { data } = await instanceFiles.get();
-  return data.meta.components;
-};
-
-/**
- * get svg image resource urls
- */
-export const getSvgImageUrls = async (nodeIds) => {
-  const {
-    data: { images },
-  } = await instanceImages.get(`/?ids=${nodeIds}&format=svg`);
-  return Object.values(images);
-};
-
-/**
- * Gets raw svg data from url
- */
-export const getIconContent = async (url) => get(url);

@navikt/core/icons/figma-api/index.mjs

@@ -1,105 +0,0 @@
-import { getNodeChildren, getSvgImageUrls, getIconContent } from "./api";
-import { existsSync, unlinkSync, writeFileSync, mkdirSync } from "fs";
-import { resolve } from "path";
-import pLimit from "p-limit";
-import rimraf from "rimraf";
-import startCase from "lodash.startcase";
-
-const generateMetadata = (iconNodesArr) => {
-  return iconNodesArr
-    .map(({ name, description, created_at, updated_at, containing_frame }) => {
-      return {
-        name: startCase(name).replace(/\s/g, ""),
-        description,
-        created_at,
-        updated_at,
-        //strip emojis
-        pageName: containing_frame.pageName.replace(
-          /([\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF])/g,
-          ""
-        ),
-        visible: true,
-      };
-    })
-    .sort((a, b) => a.name.localeCompare(b.name));
-};
-
-const main = async () => {
-  const iconFolder = "./svg";
-  const metadataFileName = "./figma-api/metadata.json";
-  const misses = [];
-
-  // Limiting to ~20 concurrent downloads seems to lead to fewer erros
-  const limit = pLimit(20);
-
-  const iconNodesArr = await getNodeChildren().catch((e) => {
-    throw e;
-  });
-
-  if (existsSync(metadataFileName)) {
-    unlinkSync(metadataFileName);
-  }
-  writeFileSync(
-    metadataFileName,
-    JSON.stringify(generateMetadata(iconNodesArr), null, 4),
-    {
-      encoding: "utf8",
-    }
-  );
-
-  const iconUrls = await getSvgImageUrls(
-    iconNodesArr.map((node) => node.node_id).join(",")
-  );
-
-  if (existsSync(iconFolder)) {
-    rimraf.sync(iconFolder);
-  }
-  mkdirSync(iconFolder);
-
-  console.log("Total icons: " + iconNodesArr.length);
-
-  await Promise.all(
-    iconUrls.map((url, x) =>
-      limit(() =>
-        getIconContent(url)
-          .then(({ data }) => {
-            writeFileSync(
-              resolve(
-                iconFolder,
-                `${startCase(iconNodesArr[x].name).replace(/\s/g, "")}.svg`
-              ),
-              data,
-              {
-                encoding: "utf8",
-              }
-            );
-          })
-          .catch((e) => {
-            misses.push({
-              name: iconNodesArr[x].name,
-              error: e.message,
-            });
-          })
-      )
-    )
-  );
-
-  if (misses.length > 0) {
-    writeFileSync(
-      resolve("./", `misses.txt`),
-      JSON.stringify(misses, null, 4),
-      {
-        encoding: "utf8",
-      }
-    );
-    console.log(`\nCould not download ${misses.length} icons\n`);
-  } else {
-    console.log("\nDownloaded all icons from Figma successfully!\n");
-  }
-};
-
-try {
-  main();
-} catch (e) {
-  console.error(e);
-}

@navikt/core/icons/figma/api.ts

@@ -0,0 +1,48 @@
+import Axios from "axios";
+const { create, get } = Axios;
+
+const FILE_KEY = "UmEVH3pZ71uJPsSz9ilP3Y";
+
+const FigmaAxion = (token?: string) =>
+  create({
+    headers: {
+      "X-FIGMA-TOKEN": token,
+    },
+  });
+
+/**
+ * Published Figma-components
+ * https://www.figma.com/file/UmEVH3pZ71uJPsSz9ilP3Y/%F0%9F%92%A0NAV-ikoner-2.5-Figma
+ */
+export const getPublishedIcons = async () => {
+  const { data } = await FigmaAxion(process.env.FIGMA_TOKEN)
+    .get(`https://api.figma.com/v1/files/${FILE_KEY}/components`)
+    .catch((e) => {
+      console.log("Failed getPublishedIcons ");
+      throw e;
+    });
+  return data?.meta?.components;
+};
+
+/**
+ * Downloadable link to each icon in SVG-format
+ */
+export const getIconsDownloadableUrl = async (nodeIds: string) => {
+  const {
+    data: { images },
+  } = await FigmaAxion(process.env.FIGMA_TOKEN)
+    .get(
+      `https://api.figma.com/v1/images/${FILE_KEY}/?ids=${nodeIds}&format=svg`
+    )
+    .catch((e) => {
+      console.log("Failed getIconsDownloadableUrl ");
+      throw e;
+    });
+
+  return Object.values(images) as string[];
+};
+
+/**
+ * Download icon @url
+ */
+export const getIconContent = async (url: string) => get(url);

@navikt/core/icons/figma/index.ts

@@ -0,0 +1,85 @@
+import {
+  getPublishedIcons,
+  getIconsDownloadableUrl,
+  getIconContent,
+} from "./api";
+import { existsSync, writeFileSync, mkdirSync } from "fs";
+import { resolve } from "path";
+import pLimit from "p-limit";
+import rimraf from "rimraf";
+import startCase from "lodash.startcase";
+import { writeMeta } from "./write-meta";
+import dotenv from "dotenv";
+dotenv.config();
+
+export type ComponentT = {
+  key: string;
+  file_key: string;
+  node_id: string;
+  thumbnail_url: string;
+  name: string;
+  description: string;
+  updated_at: string;
+  created_at: string;
+  user: any;
+  containing_frame: any;
+};
+
+const main = async () => {
+  if (!process.env.FIGMA_TOKEN) {
+    throw new Error("FIGMA_TOKEN not set in .env");
+  }
+  const iconFolder = "./svg";
+
+  // Limiting to ~20 concurrent downloads seems to lead to less errors
+  const limit = pLimit(20);
+
+  const publishedIconNodes: ComponentT[] = await getPublishedIcons();
+
+  writeMeta(publishedIconNodes);
+  /* Get all urls in one fetch rather than 300+ */
+  const iconUrls: string[] = await getIconsDownloadableUrl(
+    publishedIconNodes.map((node) => node.node_id).join(",")
+  );
+
+  if (existsSync(iconFolder)) {
+    rimraf.sync(iconFolder);
+  }
+  mkdirSync(iconFolder);
+
+  console.log("Total icons: " + publishedIconNodes.length);
+
+  await Promise.all(
+    iconUrls.map((url, x) =>
+      limit(() =>
+        getIconContent(url)
+          .then(({ data }) => {
+            writeFileSync(
+              resolve(
+                iconFolder,
+                `${startCase(publishedIconNodes[x].name).replace(
+                  /\s/g,
+                  ""
+                )}.svg`
+              ),
+              data,
+              {
+                encoding: "utf8",
+              }
+            );
+          })
+          .catch((e) => {
+            throw e;
+          })
+      )
+    )
+  );
+
+  console.log("\nDownloaded all icons from Figma!\n");
+};
+
+try {
+  main();
+} catch (e) {
+  throw e;
+}

@navikt/core/icons/figma/write-meta.ts

@@ -0,0 +1,35 @@
+import { existsSync, unlinkSync, writeFileSync } from "fs";
+import startCase from "lodash.startcase";
+import { ComponentT } from ".";
+
+const generateMetadata = (publishedIconNodes: ComponentT[]) => {
+  return publishedIconNodes
+    .map(({ name, description, created_at, containing_frame }) => {
+      return {
+        name: startCase(name).replace(/\s/g, ""),
+        description,
+        created_at,
+        // strip emojis
+        pageName: containing_frame.pageName.replace(
+          /([\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF])/g,
+          ""
+        ),
+      };
+    })
+    .sort((a, b) => a.name.localeCompare(b.name));
+};
+
+export const writeMeta = (publishedIconNodes: ComponentT[]) => {
+  const metadataFileName = "./meta.json";
+
+  if (existsSync(metadataFileName)) {
+    unlinkSync(metadataFileName);
+  }
+  writeFileSync(
+    metadataFileName,
+    JSON.stringify(generateMetadata(publishedIconNodes)),
+    {
+      encoding: "utf8",
+    }
+  );
+};

@navikt/core/icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-icons",
-  "version": "0.5.6",
+  "version": "0.6.0",
   "private": false,
   "description": "NAVs egne ikoner i SVG og React format",
   "repository": {
@@ -22,22 +22,28 @@
     "/cjs",
     "/esm",
     "/src",
-    "/svg"
+    "/svg",
+    "/meta.json"
   ],
   "scripts": {
     "create-package-json-pointers-to-esm": "node ../../../utilities/scripts/createPackageJsonsWithESMPointers.js",
-    "dl-icons": "FILE_KEY=UmEVH3pZ71uJPsSz9ilP3Y node --experimental-modules --es-module-specifier-resolution=node -r dotenv/config figma-api/index.mjs dotenv_config_path=figma-api/.env",
-    "create-icons": "svgr --silent --typescript --ref --icon --title-prop --replace-attr-values \"#262626=currentColor\" -d src svg",
-    "convert-icons": "node figma-api/pngConverter.mjs",
-    "clean": "rimraf src png NAV-ikonpakke-png.zip NAV-ikonpakke-svg.zip",
-    "zip-icons": "node figma-api/zipIcons.mjs",
-    "build": "yarn clean && yarn create-icons && tsc && tsc -p tsconfig.esm.json && yarn create-package-json-pointers-to-esm && yarn run convert-icons && yarn zip-icons"
+    "create-icons": "svgr --out-dir src svg",
+    "convert-icons": "node scripts/pngConverter.mjs",
+    "clean": "rimraf src cjs esm png NAV-ikonpakke-png.zip NAV-ikonpakke-svg.zip",
+    "zip-icons": "node scripts/zipIcons.mjs",
+    "build": "yarn clean && yarn create-icons && tsc && tsc -p tsconfig.esm.json && yarn create-package-json-pointers-to-esm && yarn run convert-icons && yarn zip-icons",
+    "update": "ts-node figma/index.ts dotenv/config"
+  },
+  "dependencies": {
+    "uuid": "^8.3.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0"
   },
   "devDependencies": {
     "@svgr/cli": "^5.5.0",
+    "@types/lodash.startcase": "^4.4.6",
+    "@types/uuid": "^8.3.1",
     "copyfiles": "^2.4.1",
     "dotenv": "^10.0.0",
     "lodash.kebabcase": "^4.1.1",
@@ -45,6 +51,7 @@
     "react": "^16.8.0 || ^17.0.0",
     "rimraf": "3.0.2",
     "sharp": "0.29.1",
+    "ts-node": "^10.4.0",
     "zip-dir": "^2.0.0"
   }
 }

@navikt/core/icons/stories/icons.stories.mdx

@@ -16,9 +16,7 @@ yarn add @navikt/ds-icons
 Import { Expand } from `@navikt/ds-icons`;
 
 <Expand
-	aria-label="Åpne meny"
-	role="img"
-	focusable="false"
+	title="Åpne meny"
 />
 ```
 

@navikt/core/icons/template.js

@@ -0,0 +1,44 @@
+function defaultTemplate(
+  { template },
+  opts,
+  { imports, interfaces, componentName, props, jsx, exports }
+) {
+  const plugins = ["jsx"];
+  if (opts.typescript) {
+    plugins.push("typescript");
+  }
+
+  imports.push({
+    type: "ImportDeclaration",
+    specifiers: [
+      {
+        type: "ImportSpecifier",
+        imported: {
+          type: "Identifier",
+          name: "v4",
+        },
+      },
+    ],
+    source: {
+      type: "StringLiteral",
+      value: "uuid",
+    },
+  });
+
+  props[0].properties.find((prop) => prop.key.name === "titleId").value = {
+    type: "Identifier",
+    name: "_titleId",
+  };
+
+  const typeScriptTpl = template.smart({ plugins });
+  return typeScriptTpl.ast`
+  ${imports}
+  ${interfaces}
+  function ${componentName}(${props}) {
+    const titleId = _titleId ?? (title ? v4() : undefined);
+    return ${jsx};
+  }
+  ${exports}`;
+}
+
+module.exports = defaultTemplate;

@navikt/core/icons/tsconfig.json

@@ -3,5 +3,6 @@
   "compilerOptions": {
     "outDir": "./cjs",
     "module": "commonjs"
-  }
+  },
+  "exclude": ["./figma", "./scripts", "**/stories"]
 }