Merge branch 'master' into file-header-h2

.gitignore

@@ -22,3 +22,6 @@ packages/*/.vscode
 .yarn/*
 .vercel
 styled-system/*
+
+.nx/cache
+.nx/workspace-data

.nxignore

@@ -0,0 +1,3 @@
+*.stories.tsx
+*-test.ts
+*-test.tsx

.prettierignore

@@ -10,3 +10,6 @@ packages/**/.scss
 .idea/
 yarn.lock
 packages/styled-system/**/*
+
+/.nx/cache
+/.nx/workspace-data

.storybook/main.ts

@@ -6,7 +6,7 @@
  *
  */
 
-import { StorybookConfig } from "@storybook/react-vite";
+import type { StorybookConfig } from "@storybook/react-vite";
 
 const config: StorybookConfig = {
   stories: ["../packages/**/*.stories.@(tsx|jsx)", "../stories/**/*.stories.@(tsx|jsx)"],
@@ -23,33 +23,6 @@ const config: StorybookConfig = {
     "@storybook/addon-measure",
     "@storybook/addon-outline",
   ],
-  core: {
-    builder: "@storybook/builder-vite",
-  },
-  viteFinal: async (config) => {
-    // Storybook imports these as CJS modules by default, but Vite wants them to be ESM.
-    // By importing them dynamically we can ensure they are ESM.
-    // TODO: Update this when Storybook no longer uses these as CJS.
-    const { mergeConfig } = await import("vite");
-    const react = await import("@vitejs/plugin-react");
-    const tsconfigPaths = await import("vite-tsconfig-paths");
-    return mergeConfig(config, {
-      plugins: [
-        tsconfigPaths.default({ root: "../" }),
-        react.default({
-          babel: {
-            overrides: [
-              {
-                exclude:
-                  /primitives|preset-panda|styled-system|ndla-icons|ndla-ui|audio-search|image-search|video-search|util|error-reporter|tracker|article-converter/,
-                plugins: [["@emotion", { autoLabel: "always" }]],
-              },
-            ],
-          },
-        }),
-      ],
-    });
-  },
   typescript: {
     reactDocgen: "react-docgen-typescript",
     // uncomment this for quicker HMR during dev.

.storybook/preview.tsx

@@ -6,12 +6,11 @@
  *
  */
 
-import { i18nInstance } from "@ndla/ui";
-import { Preview } from "@storybook/react";
-import { HelmetProvider } from "react-helmet-async";
 import { I18nextProvider } from "react-i18next";
 import { BrowserRouter } from "react-router-dom";
 import { DocsPage, DocsContainer } from "@storybook/addon-docs";
+import type { Preview } from "@storybook/react";
+import { i18nInstance } from "@ndla/ui";
 import "./styles.css";
 
 const viewports = {
@@ -228,9 +227,7 @@ const preview: Preview = {
     (Story) => (
       <BrowserRouter>
         <I18nextProvider i18n={i18nInstance}>
-          <HelmetProvider>
-            <Story />
-          </HelmetProvider>
+          <Story />
         </I18nextProvider>
       </BrowserRouter>
     ),

README.md

@@ -99,7 +99,7 @@ As mentioned on https://designmanual.ndla.no/?path=/story/components--icons, new
 - Sizing is written in full (link-m-line = LinkMediumLine, arrow-up-s-line = ArrowUpShortLine)
 - Some icons have several variants, indicated by numbers. Since we won't be using more than one such variant, the number is omitted
 
-Icons are downloaded and placed in the best matching sub-folder in `frontend-packages/packages/ndla-icons/svg/`. Edit the svg and add license information matching the other svg files.
+Icons are downloaded and placed in the best matching sub-folder in `frontend-packages/packages/icons/svg/`. Edit the svg and add license information matching the other svg files.
 
 ### Generate typescript component file
 

babel.config.js

@@ -12,13 +12,6 @@ module.exports = {
     "@babel/preset-typescript",
     ["@babel/preset-react", { runtime: "automatic" }],
   ],
-  overrides: [
-    {
-      exclude:
-        /primitives|preset-panda|styled-system|ndla-icons|ndla-ui|audio-search|image-search|video-search|util|error-reporter|tracker|article-converter/,
-      plugins: [["@emotion", { autoLabel: "always" }]],
-    },
-  ],
   plugins: [],
   env: {
     test: {