Merge branch 'appdir'

Author: garronej

.eslintignore

@@ -3,5 +3,4 @@ dist/
 CHANGELOG.md
 .yarn_home/
 src/integration/
-src/lib/tools/@mui/
 

.gitattributes

@@ -1,5 +1,4 @@
 test/integration/**/* linguist-documentation
-src/lib/tools/@mui/**/* linguist-documentation
 .eslintrc.js linguist-documentation
 src/bin/copy-dsfr-to-public.ts -linguist-detectable
 src/bin/only-include-used-icons.ts -linguist-detectable

.gitignore

@@ -44,7 +44,7 @@ jspm_packages
 /dist
 /.yarn_home
 /dsfr
-/src/lib/generatedFromCss
+/src/fr/generatedFromCss
 /storybook-static
 
 

.prettierignore

@@ -4,4 +4,3 @@ node_modules/
 /.yarn_home/
 /test/integration/
 /dsfr/
-/src/lib/tools/@mui/

.storybook/DocsContainer.js

@@ -5,7 +5,9 @@ import { useDarkMode } from "storybook-dark-mode";
 import { darkTheme, lightTheme } from "./customTheme";
 import "../dist/dsfr/dsfr.css";
 import "../dist/dsfr/utility/icons/icons.min.css";
-import { startReactDsfr, useIsDark, useColors } from "../dist";
+import { useIsDark } from "../dist/useIsDark";
+import { startReactDsfr } from "../dist/spa";
+import { useColors } from "../dist/useColors";
 
 startReactDsfr({
     "defaultColorScheme": "system",

COMPONENTS.md

@@ -40,4 +40,4 @@
 -   [ ] Tag
 -   [ ] Download
 -   [ ] Transcription
--   [x] Tile
+-   [ ] Tile

README.md

@@ -92,8 +92,9 @@ yarn storybook
 
 # Starting test apps
 yarn start-cra  # For testing in in a Create React App setup
-yarn start-next # For testing in a Next.js setup
 yarn start-vite # For testing in a Vite setup
+yarn start-next-pagesdir # For testing in a Next.js 13 PagesDir setup (the default setup)
+yarn start-next-appdir # For testing in a Next.js 13 AppDir setup
 
 # Run all unit test (test/runtime):
 yarn test

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@codegouvfr/react-dsfr",
-    "version": "0.13.0",
+    "version": "0.12.1",
     "description": "French State Design System React integration library",
     "repository": {
         "type": "git",
@@ -10,8 +10,9 @@
         "build": "ts-node -T src/scripts/build",
         "yarn-link": "ts-node -T src/scripts/yarn-link.ts",
         "start-cra": "yarn build && yarn yarn-link && ((tsc -w -p src) & (cd test/integration/cra && yarn start))",
-        "start-next": "yarn build && yarn yarn-link && ((tsc -w -p src) & (cd test/integration/next && yarn dev))",
         "start-vite": "yarn build && yarn yarn-link && ((tsc -w -p src) & (cd test/integration/vite && yarn dev))",
+        "start-next-pagesdir": "yarn build && yarn yarn-link && ((tsc -w -p src) & (cd test/integration/next-pagesdir && yarn dev))",
+        "start-next-appdir": "yarn build && yarn yarn-link && ((tsc -w -p src) & (cd test/integration/next-appdir && yarn dev))",
         "test": "vitest",
         "lint:check": "eslint . --ext .ts,.tsx",
         "lint": "yarn lint:check --fix",
@@ -115,15 +116,21 @@
         "typescript": "^4.9.1-beta",
         "vitest": "^0.24.3"
     },
-    "main": "dist/lib/index.js",
-    "types": "dist/lib/index.d.ts",
-    "module": "dist/lib/index.js",
+    "main": "dist/fr/index.js",
+    "types": "dist/fr/index.d.ts",
+    "module": "dist/fr/index.js",
     "exports": {
-        ".": "./dist/lib/index.js",
-        "./next": "./dist/next.js",
+        ".": "./dist/fr/index.js",
+        "./spa": "./dist/spa.js",
+        "./next-appdir": "./dist/next-appdir/index.js",
+        "./next-appdir/DsfrHead": "./dist/next-appdir/DsfrHead.js",
+        "./next-appdir/DsfrProvider": "./dist/next-appdir/DsfrProvider.js",
+        "./next-appdir/getColorSchemeHtmlAttributes": "./dist/next-appdir/getColorSchemeHtmlAttributes.js",
+        "./next-pagesdir": "./dist/next-pagesdir.js",
+        "./useIsDark": "./dist/useIsDark/index.js",
+        "./useColors": "./dist/useColors.js",
+        "./i18n": "./dist/i18n/index.js",
         "./mui": "./dist/mui.js",
-        "./lib": "./dist/lib/index.js",
-        "./Tile": "./dist/Tile.js",
         "./Tabs": "./dist/Tabs.js",
         "./Summary": "./dist/Summary.js",
         "./Stepper": "./dist/Stepper.js",

src/Accordion.tsx

@@ -1,10 +1,12 @@
+"use client";
+
 import React, { forwardRef, memo, ReactNode, useId, useState } from "react";
 import { assert } from "tsafe";
 import type { Equals } from "tsafe";
-import { fr } from "./lib";
-import { cx } from "./lib/tools/cx";
+import { fr } from "./fr";
+import { cx } from "./tools/cx";
 import { symToStr } from "tsafe/symToStr";
-import { useConstCallback } from "./lib/tools/powerhooks/useConstCallback";
+import { useConstCallback } from "./tools/powerhooks/useConstCallback";
 import "./dsfr/component/accordion/accordion.css";
 
 export type AccordionProps = AccordionProps.Controlled | AccordionProps.Uncontrolled;

src/Alert.tsx

@@ -1,18 +1,15 @@
+"use client";
+
 import React, { memo, forwardRef, useState, useEffect, useRef } from "react";
 import type { ReactNode } from "react";
-import type { FrClassName } from "./lib/generatedFromCss/classNames";
+import type { FrClassName } from "./fr/generatedFromCss/classNames";
 import { symToStr } from "tsafe/symToStr";
-import { fr } from "./lib";
-import { cx } from "./lib/tools/cx";
+import { fr } from "./fr";
+import { cx } from "./tools/cx";
 import { assert } from "tsafe/assert";
 import type { Equals } from "tsafe";
-import { useConstCallback } from "./lib/tools/powerhooks/useConstCallback";
-import { createComponentI18nApi } from "./lib/i18n";
-// We make users import dsfr.css so we don't need to import the scoped CSS
-// but in the future if we have a complete component coverage it
-// we could stop requiring users to import the hole CSS and only import on a
-// per component basis.
-import "./dsfr/component/alert/alert.css";
+import { useConstCallback } from "./tools/powerhooks/useConstCallback";
+import { createComponentI18nApi } from "./i18n/i18n";
 
 export type AlertProps = {
     className?: string;