Skip to content

Commit 679f38d

Browse files
committed
Add warning on how to import assets in the src
1 parent eda50d2 commit 679f38d

File tree

10 files changed

+115
-90
lines changed

10 files changed

+115
-90
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ yarn start_cra # For testing in in a Create React App setup
3333
yarn start_next # For testing in a Next.js setup
3434
```
3535

36+
> ⚠️: When you want to import assets from the `./dsfr/` directory
37+
> you must assume it's located in `./src/dsfr` because it's where
38+
> it's going to be relative to the transpiled JS files.
39+
3640
## How to publish a new version on NPM, how to release a beta version
3741

3842
This repo was bootstrapped form [garronej/ts-ci](https://github.com/garronej/ts-ci) have a look at the

src/bin/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"lib": ["es2015", "DOM", "ES2019.Object"],
88
"outDir": "../../dist/bin",
99
"rootDir": "."
10-
}
10+
},
11+
"exclude": ["./yarn_link.ts"]
1112
}

src/bin/yarn_link.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,6 @@ execYarnLink({ "cwd": pathJoin(projectDirPath, "dist") });
152152
testAppNames.forEach(testAppName =>
153153
execYarnLink({
154154
"cwd": getTestAppPath(testAppName),
155-
"targetModuleName": "react_dsfr"
155+
"targetModuleName": "dsfr-react"
156156
})
157157
);

src/test/apps/cra/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"name": "react_dsfr-test-app-cra",
2+
"name": "dsfr-react-test-app-cra",
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
66
"react": "18.1.0",
77
"react-dom": "^18.2.0",
88
"react-scripts": "5.0.1",
9-
"react_dsfr": "file:../../../../dist"
9+
"dsfr-react": "file:../../../../dist"
1010
},
1111
"devDependencies": {
1212
"@types/node": "^16.7.13",
@@ -19,7 +19,7 @@
1919
"build": "react-scripts build",
2020
"test": "react-scripts test",
2121
"eject": "react-scripts eject",
22-
"prestart": "node node_modules/react_dsfr/bin/update_dsfr_static_resources.js"
22+
"prestart": "node node_modules/dsfr-react/bin/update_dsfr_static_resources.js"
2323
},
2424
"eslintConfig": {
2525
"extends": [

src/test/apps/cra/src/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { StrictMode } from "react";
22
import { createRoot } from "react-dom/client";
3-
import { startReactDsfr, useColorScheme } from "react_dsfr";
4-
import artworkLightSvgUrl from "react_dsfr/dsfr/artwork/light.svg";
5-
import artworkDarkSvgUrl from "react_dsfr/dsfr/artwork/dark.svg";
6-
import artworkSystemSvgUrl from "react_dsfr/dsfr/artwork/system.svg";
3+
import { startReactDsfr, useColorScheme } from "dsfr-react";
4+
import artworkLightSvgUrl from "dsfr-react/dsfr/artwork/light.svg";
5+
import artworkDarkSvgUrl from "dsfr-react/dsfr/artwork/dark.svg";
6+
import artworkSystemSvgUrl from "dsfr-react/dsfr/artwork/system.svg";
77

88
startReactDsfr({
99
"defaultColorScheme": "system"

src/test/apps/cra/yarn.lock

Lines changed: 64 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@
12081208
resolved "https://registry.yarnpkg.com/@gouvfr/dsfr/-/dsfr-1.7.2.tgz#c522fce21a14989a10e30583160118c39c9c05d1"
12091209
integrity sha512-hPNtz+gHcc8m7ZPANxSOFMz4Ap+M9FHOudqoMR/+Kjl5FCOqwA6u/aoYnMJ8KqedS1k5XThFMp7jiktr53qXYw==
12101210

1211-
"@humanwhocodes/config-array@^0.10.4":
1211+
"@humanwhocodes/config-array@^0.10.5":
12121212
version "0.10.5"
12131213
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.5.tgz#bb679745224745fff1e9a41961c1d45a49f81c04"
12141214
integrity sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==
@@ -1765,9 +1765,9 @@
17651765
"@babel/types" "^7.0.0"
17661766

17671767
"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
1768-
version "7.18.1"
1769-
resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.1.tgz#ce5e2c8c272b99b7a9fd69fa39f0b4cd85028bd9"
1770-
integrity sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA==
1768+
version "7.18.2"
1769+
resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.2.tgz#235bf339d17185bdec25e024ca19cce257cc7309"
1770+
integrity sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==
17711771
dependencies:
17721772
"@babel/types" "^7.3.0"
17731773

@@ -1905,24 +1905,24 @@
19051905
integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
19061906

19071907
"@types/node@*":
1908-
version "18.7.18"
1909-
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz#633184f55c322e4fb08612307c274ee6d5ed3154"
1910-
integrity sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==
1908+
version "18.7.19"
1909+
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.19.tgz#ad83aa9b7af470fab7e0f562be87e97dc8ffe08e"
1910+
integrity sha512-Sq1itGUKUX1ap7GgZlrzdBydjbsJL/NSQt/4wkAxUJ7/OS5c2WkoN6WSpWc2Yc5wtKMZOUA0VCs/j2XJadN3HA==
19111911

19121912
"@types/node@^16.7.13":
1913-
version "16.11.59"
1914-
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.59.tgz#823f238b9063ccc3b3b7f13186f143a57926c4f6"
1915-
integrity sha512-6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw==
1913+
version "16.11.60"
1914+
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.60.tgz#a1fbca80c18dd80c8783557304cdb7d55ac3aff5"
1915+
integrity sha512-kYIYa1D1L+HDv5M5RXQeEu1o0FKA6yedZIoyugm/MBPROkLpX4L7HRxMrPVyo8bnvjpW/wDlqFNGzXNMb7AdRw==
19161916

19171917
"@types/parse-json@^4.0.0":
19181918
version "4.0.0"
19191919
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
19201920
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
19211921

19221922
"@types/prettier@^2.1.5":
1923-
version "2.7.0"
1924-
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc"
1925-
integrity sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==
1923+
version "2.7.1"
1924+
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.1.tgz#dfd20e2dc35f027cdd6c1908e80a5ddc7499670e"
1925+
integrity sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==
19261926

19271927
"@types/prop-types@*":
19281928
version "15.7.5"
@@ -1952,9 +1952,9 @@
19521952
"@types/react" "*"
19531953

19541954
"@types/react@*":
1955-
version "18.0.20"
1956-
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.20.tgz#e4c36be3a55eb5b456ecf501bd4a00fd4fd0c9ab"
1957-
integrity sha512-MWul1teSPxujEHVwZl4a5HxQ9vVNsjTchVA+xRqv/VYGCuKGAU6UhfrTdF5aBefwD1BHUD8i/zq+O/vyCm/FrA==
1955+
version "18.0.21"
1956+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.21.tgz#b8209e9626bb00a34c76f55482697edd2b43cc67"
1957+
integrity sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==
19581958
dependencies:
19591959
"@types/prop-types" "*"
19601960
"@types/scheduler" "*"
@@ -2038,9 +2038,9 @@
20382038
"@types/yargs-parser" "*"
20392039

20402040
"@types/yargs@^17.0.8":
2041-
version "17.0.12"
2042-
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526"
2043-
integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==
2041+
version "17.0.13"
2042+
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76"
2043+
integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==
20442044
dependencies:
20452045
"@types/yargs-parser" "*"
20462046

@@ -2876,9 +2876,9 @@ caniuse-api@^3.0.0:
28762876
lodash.uniq "^4.5.0"
28772877

28782878
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001407:
2879-
version "1.0.30001409"
2880-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001409.tgz#6135da9dcab34cd9761d9cdb12a68e6740c5e96e"
2881-
integrity sha512-V0mnJ5dwarmhYv8/MzhJ//aW68UpvnQBXv8lJ2QUsvn2pHcmAuNtu8hQEDz37XnA1iE+lRR9CIfGWWpgJ5QedQ==
2879+
version "1.0.30001410"
2880+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz#b5a86366fbbf439d75dd3db1d21137a73e829f44"
2881+
integrity sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ==
28822882

28832883
case-sensitive-paths-webpack-plugin@^2.4.0:
28842884
version "2.4.0"
@@ -3623,6 +3623,12 @@ dotenv@^10.0.0:
36233623
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
36243624
integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
36253625

3626+
"dsfr-react@file:../../../../dist":
3627+
version "0.0.1"
3628+
dependencies:
3629+
"@gouvfr/dsfr" "1.7.2"
3630+
tsafe "^1.0.1"
3631+
36263632
duplexer@^0.1.2:
36273633
version "0.1.2"
36283634
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -3641,9 +3647,9 @@ ejs@^3.1.6:
36413647
jake "^10.8.5"
36423648

36433649
electron-to-chromium@^1.4.251:
3644-
version "1.4.256"
3645-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.256.tgz#c735032f412505e8e0482f147a8ff10cfca45bf4"
3646-
integrity sha512-x+JnqyluoJv8I0U9gVe+Sk2st8vF0CzMt78SXxuoWCooLLY2k5VerIBdpvG7ql6GKI4dzNnPjmqgDJ76EdaAKw==
3650+
version "1.4.261"
3651+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.261.tgz#31f14ad60c6f95bec404a77a2fd5e1962248e112"
3652+
integrity sha512-fVXliNUGJ7XUVJSAasPseBbVgJIeyw5M1xIkgXdTSRjlmCqBbiSTsEdLOCJS31Fc8B7CaloQ/BFAg8By3ODLdg==
36473653

36483654
emittery@^0.10.2:
36493655
version "0.10.2"
@@ -3703,21 +3709,21 @@ error-stack-parser@^2.0.6:
37033709
stackframe "^1.3.4"
37043710

37053711
es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.1:
3706-
version "1.20.2"
3707-
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.2.tgz#8495a07bc56d342a3b8ea3ab01bd986700c2ccb3"
3708-
integrity sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==
3712+
version "1.20.3"
3713+
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.3.tgz#90b143ff7aedc8b3d189bcfac7f1e3e3f81e9da1"
3714+
integrity sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw==
37093715
dependencies:
37103716
call-bind "^1.0.2"
37113717
es-to-primitive "^1.2.1"
37123718
function-bind "^1.1.1"
37133719
function.prototype.name "^1.1.5"
3714-
get-intrinsic "^1.1.2"
3720+
get-intrinsic "^1.1.3"
37153721
get-symbol-description "^1.0.0"
37163722
has "^1.0.3"
37173723
has-property-descriptors "^1.0.0"
37183724
has-symbols "^1.0.3"
37193725
internal-slot "^1.0.3"
3720-
is-callable "^1.2.4"
3726+
is-callable "^1.2.6"
37213727
is-negative-zero "^2.0.2"
37223728
is-regex "^1.1.4"
37233729
is-shared-array-buffer "^1.0.2"
@@ -3727,6 +3733,7 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19
37273733
object-keys "^1.1.1"
37283734
object.assign "^4.1.4"
37293735
regexp.prototype.flags "^1.4.3"
3736+
safe-regex-test "^1.0.0"
37303737
string.prototype.trimend "^1.0.5"
37313738
string.prototype.trimstart "^1.0.5"
37323739
unbox-primitive "^1.0.2"
@@ -3908,9 +3915,9 @@ eslint-plugin-react@^7.27.1:
39083915
string.prototype.matchall "^4.0.7"
39093916

39103917
eslint-plugin-testing-library@^5.0.1:
3911-
version "5.6.4"
3912-
resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.4.tgz#9dffd9feafbb08a36240f88156357685b56f0b8a"
3913-
integrity sha512-0oW3tC5NNT2WexmJ3848a/utawOymw4ibl3/NkwywndVAz2hT9+ab70imA7ccg3RaScQgMvJT60OL00hpmJvrg==
3918+
version "5.7.0"
3919+
resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.7.0.tgz#08046bce93c63c0d4bf01ec62550130237bb1575"
3920+
integrity sha512-pI8LKtFiAflBpN4h14vTtfhKqLwtIW40TNhWyw0ckqHm0W/J0VmYtThoxpTAdHrvEWnkALSG1Z8ABBkIncMIHA==
39143921
dependencies:
39153922
"@typescript-eslint/utils" "^5.13.0"
39163923

@@ -3959,12 +3966,12 @@ eslint-webpack-plugin@^3.1.1:
39593966
schema-utils "^4.0.0"
39603967

39613968
eslint@^8.3.0:
3962-
version "8.23.1"
3963-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.23.1.tgz#cfd7b3f7fdd07db8d16b4ac0516a29c8d8dca5dc"
3964-
integrity sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==
3969+
version "8.24.0"
3970+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.24.0.tgz#489516c927a5da11b3979dbfb2679394523383c8"
3971+
integrity sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==
39653972
dependencies:
39663973
"@eslint/eslintrc" "^1.3.2"
3967-
"@humanwhocodes/config-array" "^0.10.4"
3974+
"@humanwhocodes/config-array" "^0.10.5"
39683975
"@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
39693976
"@humanwhocodes/module-importer" "^1.0.1"
39703977
ajv "^6.10.0"
@@ -4384,7 +4391,7 @@ get-caller-file@^2.0.5:
43844391
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
43854392
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
43864393

4387-
get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.2:
4394+
get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
43884395
version "1.1.3"
43894396
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
43904397
integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
@@ -4830,10 +4837,10 @@ is-boolean-object@^1.1.0:
48304837
call-bind "^1.0.2"
48314838
has-tostringtag "^1.0.0"
48324839

4833-
is-callable@^1.1.4, is-callable@^1.2.4:
4834-
version "1.2.6"
4835-
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.6.tgz#fd6170b0b8c7e2cc73de342ef8284a2202023c44"
4836-
integrity sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==
4840+
is-callable@^1.1.4, is-callable@^1.2.6:
4841+
version "1.2.7"
4842+
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
4843+
integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
48374844

48384845
is-core-module@^2.8.1, is-core-module@^2.9.0:
48394846
version "2.10.0"
@@ -7185,12 +7192,6 @@ react@18.1.0:
71857192
dependencies:
71867193
loose-envify "^1.1.0"
71877194

7188-
"react_dsfr@file:../../../../dist":
7189-
version "0.0.1"
7190-
dependencies:
7191-
"@gouvfr/dsfr" "1.7.2"
7192-
tsafe "^1.0.1"
7193-
71947195
read-cache@^1.0.0:
71957196
version "1.0.0"
71967197
resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -7411,9 +7412,9 @@ rollup-plugin-terser@^7.0.0:
74117412
terser "^5.0.0"
74127413

74137414
rollup@^2.43.1:
7414-
version "2.79.0"
7415-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.0.tgz#9177992c9f09eb58c5e56cbfa641607a12b57ce2"
7416-
integrity sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==
7415+
version "2.79.1"
7416+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
7417+
integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
74177418
optionalDependencies:
74187419
fsevents "~2.3.2"
74197420

@@ -7434,6 +7435,15 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
74347435
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
74357436
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
74367437

7438+
safe-regex-test@^1.0.0:
7439+
version "1.0.0"
7440+
resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
7441+
integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
7442+
dependencies:
7443+
call-bind "^1.0.2"
7444+
get-intrinsic "^1.1.3"
7445+
is-regex "^1.1.4"
7446+
74377447
"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
74387448
version "2.1.2"
74397449
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -8779,9 +8789,9 @@ ws@^7.4.6:
87798789
integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
87808790

87818791
ws@^8.4.2:
8782-
version "8.8.1"
8783-
resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"
8784-
integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==
8792+
version "8.9.0"
8793+
resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e"
8794+
integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==
87858795

87868796
xml-name-validator@^3.0.0:
87878797
version "3.0.0"

src/test/apps/next/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "react_dsfr-test-app-next",
2+
"name": "dsfr-react-test-app-next",
33
"version": "0.1.0",
44
"private": true,
55
"scripts": {
@@ -14,7 +14,7 @@
1414
"next": "12.3.1",
1515
"react": "18.1.0",
1616
"react-dom": "18.1.0",
17-
"react_dsfr": "file:../../../../dist",
17+
"dsfr-react": "file:../../../../dist",
1818
"tss-react": "^4.1.3"
1919
},
2020
"devDependencies": {

src/test/apps/next/pages/_app.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Head from "next/head";
22
import type { AppProps } from 'next/app'
33
import { createEmotionSsrAdvancedApproach } from "tss-react/nextJs";
4-
import "react_dsfr/dsfr/dsfr.css";
5-
import { withDsfr } from "react_dsfr/lib/nextJs";
4+
import "dsfr-react/dsfr/dsfr.css";
5+
import { withDsfr } from "dsfr-react/lib/nextJs";
66

77
const { EmotionCacheProvider, withEmotionCache } = createEmotionSsrAdvancedApproach({ "key": "css" });
88

src/test/apps/next/pages/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
import artworkLightSvg from "react_dsfr/dsfr/artwork/light.svg";
3-
import artworkDarkSvg from "react_dsfr/dsfr/artwork/dark.svg";
4-
import artworkSystemSvg from "react_dsfr/dsfr/artwork/system.svg";
5-
import { useColorScheme } from "react_dsfr";
2+
import artworkLightSvg from "dsfr-react/dsfr/artwork/light.svg";
3+
import artworkDarkSvg from "dsfr-react/dsfr/artwork/dark.svg";
4+
import artworkSystemSvg from "dsfr-react/dsfr/artwork/system.svg";
5+
import { useColorScheme } from "dsfr-react";
66

77
export default function Index() {
88

0 commit comments

Comments
 (0)