diff --git a/packages/components/src/ActionList/ActionList.module.scss b/packages/components/src/ActionList/ActionList.module.scss index b2ef355da96..e9fc5c40801 100644 --- a/packages/components/src/ActionList/ActionList.module.scss +++ b/packages/components/src/ActionList/ActionList.module.scss @@ -1,6 +1,6 @@ @use '@talend/bootstrap-theme/src/theme/guidelines' as *; -@use '@talend/design-tokens/lib/_tokens.scss' as tokens; +@use '@talend/design-tokens/lib/_tokens' as tokens; //// /// Action list diff --git a/packages/components/src/Slider/Slider.module.scss b/packages/components/src/Slider/Slider.module.scss index be98e22cfad..35826168db1 100644 --- a/packages/components/src/Slider/Slider.module.scss +++ b/packages/components/src/Slider/Slider.module.scss @@ -1,6 +1,6 @@ @use '@talend/bootstrap-theme/src/theme/guidelines' as *; -@use '@talend/design-tokens/lib/_tokens.scss' as tokens; +@use '@talend/design-tokens/lib/_tokens' as tokens; $tc-slider-thumb-shadow: 0 1px 2px 0 rgba(117, 132, 149, 0.5); //$slate-gray; $tc-slider-thumb-shadow-focused: 0 3px 4px 0.5px rgba(0, 0, 0, 0.25); diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json index 1b326877385..5b10cd04196 100644 --- a/packages/components/tsconfig.json +++ b/packages/components/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@talend/scripts-config-typescript/tsconfig.json", "include": ["custom.d.ts", "src/**/*"], + "exclude": ["node_modules"], "compilerOptions": { "types": ["jest", "@testing-library/jest-dom"], "allowJs": true, diff --git a/packages/dataviz/src/components/LineChart/LineChart.module.scss b/packages/dataviz/src/components/LineChart/LineChart.module.scss index 77e2e49ee38..4f5b0321498 100644 --- a/packages/dataviz/src/components/LineChart/LineChart.module.scss +++ b/packages/dataviz/src/components/LineChart/LineChart.module.scss @@ -1,4 +1,4 @@ -@use '@talend/design-tokens/lib/_tokens.scss' as tokens; +@use '@talend/design-tokens/lib/_tokens' as tokens; $module: line-chart; diff --git a/packages/design-tokens/package.json b/packages/design-tokens/package.json index be8526c7cb0..1ae503c5dd0 100644 --- a/packages/design-tokens/package.json +++ b/packages/design-tokens/package.json @@ -16,8 +16,14 @@ "require": "./lib/_tokens.scss" }, "./lib/*": { - "import": "./lib-esm/*", - "require": "./lib/*" + "import": { + "types": "./lib-esm/*.d.ts", + "default": "./lib-esm/*.js" + }, + "require": { + "types": "./dist/*.d.ts", + "default": "./dist/*.js" + } }, "./dist/*": { "import": "./dist/*", diff --git a/packages/playground/vite.config.js b/packages/playground/vite.config.js index 09c91ca6266..3ade1e293e4 100644 --- a/packages/playground/vite.config.js +++ b/packages/playground/vite.config.js @@ -99,9 +99,6 @@ export default defineConfig({ '~@talend/design-tokens/lib/tokens': fileURLToPath( import.meta.resolve('@talend/design-tokens/lib/tokens'), ), - '~@talend/design-tokens/lib/_tokens.scss': fileURLToPath( - import.meta.resolve('@talend/design-tokens/lib/_tokens.scss'), - ), }, }, }); diff --git a/packages/stepper/src/components/StepperForm/StepperForm.module.scss b/packages/stepper/src/components/StepperForm/StepperForm.module.scss index caba149c4bf..1f81d026c11 100644 --- a/packages/stepper/src/components/StepperForm/StepperForm.module.scss +++ b/packages/stepper/src/components/StepperForm/StepperForm.module.scss @@ -1,4 +1,4 @@ -@use '@talend/design-tokens/lib/_tokens.scss'; +@use '@talend/design-tokens/lib/_tokens'; .stepper-form { display: flex; diff --git a/packages/storybook-docs/package.json b/packages/storybook-docs/package.json index c128e9b64f2..adfd78825d1 100644 --- a/packages/storybook-docs/package.json +++ b/packages/storybook-docs/package.json @@ -51,7 +51,6 @@ "postcss-loader": "^7.3.4", "resolve-url-loader": "^5.0.0", "sass": "^1.75.0", - "sass-embedded": "^1.75.0", "sass-loader": "^14.2.0", "webpack": "^5.90.3", "webpack-cli": "^4.10.0" diff --git a/tools/scripts-config-react-webpack/config/webpack.config.common.js b/tools/scripts-config-react-webpack/config/webpack.config.common.js index 92d7a49aa1a..09dcdc45992 100644 --- a/tools/scripts-config-react-webpack/config/webpack.config.common.js +++ b/tools/scripts-config-react-webpack/config/webpack.config.common.js @@ -81,7 +81,7 @@ function getSassLoaders(enableModules, sassData, isEnvDevelopmentServe) { * This difference reflects ESM's design philosophy which aims for more predictability and less implicit behavior compared to CommonJS. * As a result, the structure and location of your modules might need to be more precisely managed when working with ESM in Node.js. */ - includePaths: ['./node_modules', '../../node_modules'], + includePaths: ['./node_modules', '../node_modules', '../../node_modules'], }, }, }, diff --git a/yarn.lock b/yarn.lock index c9252331b24..bb29e7a151c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1410,11 +1410,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@bufbuild/protobuf@^1.0.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-1.8.0.tgz#1c8651ea34adb8019b483e09de02aeeb1cd57d79" - integrity sha512-qR9FwI8QKIveDnUYutvfzbC21UZJJryYrLuZGjeZ/VGz+vXelUkK+xgkOHsvPEdYEdxtgUUq4313N8QtOehJ1Q== - "@changesets/apply-release-plan@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@changesets/apply-release-plan/-/apply-release-plan-7.0.0.tgz#ce3c3dfc5720550a5d592b54ad2f411f816ec5ff" @@ -6782,11 +6777,6 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -buffer-builder@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/buffer-builder/-/buffer-builder-0.2.0.tgz#3322cd307d8296dab1f604618593b261a3fade8f" - integrity sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg== - buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -17128,7 +17118,7 @@ rxjs@^6.6.0: dependencies: tslib "^1.9.0" -rxjs@^7.4.0, rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.1: +rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.1: version "7.8.1" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== @@ -17176,121 +17166,6 @@ safe-regex-test@^1.0.3: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass-embedded-android-arm64@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.75.0.tgz#839434888b8966e90a20777ad93613a1c6479ddd" - integrity sha512-puVKsTovpqntG0b/jjxg6+jWD907UEnc/oJ1ia89KRkvLOPD8kE+EYzxxRYrgaG2tiGSMZNuOmYcAKfQNdLdig== - -sass-embedded-android-arm@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-android-arm/-/sass-embedded-android-arm-1.75.0.tgz#6b2a9e0c328f1a5d4f8fb4deec4eed8711db308c" - integrity sha512-3GNCfVEw2D34aEntYHv1+VFb0fOsU2nJdz/kpHXDlE7m/zIsi9ySn9WhvYlXkNQKBXvHRf8mWrU2/mC0QXTxxQ== - -sass-embedded-android-ia32@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.75.0.tgz#2feb6381e82cc3afbde5634bcfdee422ed5cdc10" - integrity sha512-SObSy6USALhGQoX/Lu1Gctwsb6Ob4Hkg1ISHSV8SNHeWIko4ZiHbAb1r9UMJtRznyawvZ6fjKgOY5fLJAfk3xQ== - -sass-embedded-android-x64@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-android-x64/-/sass-embedded-android-x64-1.75.0.tgz#0fadfac767452bb8370e48368ef018967088097d" - integrity sha512-CCroBmmwbVZbwOXzFg6GdbOwcczhtjJ/75cfpAoku0InDJzxCP+sVJz8LL16rLWDsVveDoXX7JKFw9Nb9zQyjQ== - -sass-embedded-darwin-arm64@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.75.0.tgz#0824391bb7884b5534a8a2e3b9e93b44026d7031" - integrity sha512-lb7Wkq69+AfD/tnopRX9RSu3d99Gsu1iIAhs3GyMh2N2AnVooASqKJ6I3IAbKnGh+MkXOISsoeyTP4hSnPyuqw== - -sass-embedded-darwin-x64@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.75.0.tgz#aaa78c19ec9be7b155c4f69be30f969744d0b4c9" - integrity sha512-Lw02PAS0bY7Q4v2fWxlFUU/T/1AV49H2+Oirxtij5nF8rTgjNHlr/7cOQp/f8bRdG5SnPhJspy//c6K8X7cF9w== - -sass-embedded-linux-arm64@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.75.0.tgz#b092eec77eb973c071f5e1301d07b80785880eb3" - integrity sha512-v1d1Zzje46dXzRFm594RfkwdFnbPz1vlxM5vtLoz2d/r+TijhpVzNyy4dY4Dz0MEIcAU+edzB2P9MIHdX9yP9A== - -sass-embedded-linux-arm@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.75.0.tgz#90f57a7cc199c6c44a401115243c2a3d6145cf78" - integrity sha512-s4yDbv/MEMVWr6E6uk7T/Fh4iX71NQDBDVQ/tbq4+VgF/SAo2YdnW1p97zwJjqwxNgIo76o21HaZO4rs66Ur8A== - -sass-embedded-linux-ia32@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.75.0.tgz#e9cbbfd1993bcbed11c24fa66525ac1983d901da" - integrity sha512-fxpWoX9Bc4rSA863aehnPPibiIRisSBktqKY5vkQnTg4L7SDxPwXMvHeL0LZQOG1t6+baSnjhOUZSjfwbl09MQ== - -sass-embedded-linux-musl-arm64@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.75.0.tgz#eea2a50d90d4590b35483ba9012433192e322009" - integrity sha512-5ZlghwIG82spTNvutXbyXRC2cOMx7TZdWoiEqZ5QXuhChB35AHk43Ex1CdItPOLX0JjRv5eSuSelCY4nBGDe8A== - -sass-embedded-linux-musl-arm@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.75.0.tgz#775c6cc1701f0e7044a48decd875fcc7ac247d14" - integrity sha512-mVczW2hkGxXAs8I7H+m4bfZZIHd9tFR+UA2mHI+XkLE+cjyPC2FuWokc+WXyaWpqbE/KDSwqgSqY08zND7gcbA== - -sass-embedded-linux-musl-ia32@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.75.0.tgz#42b213f4dad025245617c409354af03696579529" - integrity sha512-8RjKtvc1F9xP1hr+ht72CawkSr7/fZMSAhE/TORFncsPKpwN2WGqkoTBXdL22WGwi95ZAz5Zr2ZnGy8OXMDprQ== - -sass-embedded-linux-musl-x64@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.75.0.tgz#1b0d3171a16b150384f4715e65be5ef9c1d2a4b7" - integrity sha512-bsuOEy6rjIwfc7qihDSrEnmaePUn8bR5NAAzeljlfQkRFRxivB1gysQfRPjLPbheJfChFDLiiFX2z2CQkcdKuQ== - -sass-embedded-linux-x64@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.75.0.tgz#05be7840b52041b55110b1e4fd39676061ee8cb0" - integrity sha512-L7x3orLODCRds6PpDfrb6bbh6IdqHDzcwyt6VkcbTN+KtbMI4PfNGKHeo7f2K8wMbCiFK3BGJqMSPxNRuVp19A== - -sass-embedded-win32-arm64@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.75.0.tgz#c4ba3ae36fe10cff75b690f041f9615fc450a8e1" - integrity sha512-wdVHtJBVykRWA2YEYsJ1bLf9sjcwa9BhHRzf03nSwS88Vc7GmflY6HyuY2Ynz+dWoth7MelgJL/XlonOs5y6/Q== - -sass-embedded-win32-ia32@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.75.0.tgz#9a8170647af76eb976b876b124559dbbc5e43ddc" - integrity sha512-q/uE8q8PLG7Y7mcP1Lsiwg+6FwShj8dLk76Fa2FB68odLn42/aZ2eDHbpy+bbMgAqZqlcDDsqbCDHF9O3d0KrA== - -sass-embedded-win32-x64@1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.75.0.tgz#df0b1f549f3370f6e7d03d849da99a36b27345a3" - integrity sha512-lIT3ziKm2L9XGwP3S1D0Kk9ySJ6lVBLm+GZ2goQi8cAWepHSnmRz+mcd/AEqxDGEvrgNmmmvu3ylwlJ/6Nrm9w== - -sass-embedded@^1.75.0: - version "1.75.0" - resolved "https://registry.yarnpkg.com/sass-embedded/-/sass-embedded-1.75.0.tgz#99fc600bf38506a2033852487349dd8b177d0207" - integrity sha512-8ZhQYJSCcjMRClyPpA09ZQ9p0Q9NtYxfMbhifBgUoQZC47Co5QJa0ykhfV/SY6mIqK7aAhMF7NAD5h0MEe2vpg== - dependencies: - "@bufbuild/protobuf" "^1.0.0" - buffer-builder "^0.2.0" - immutable "^4.0.0" - rxjs "^7.4.0" - supports-color "^8.1.1" - varint "^6.0.0" - optionalDependencies: - sass-embedded-android-arm "1.75.0" - sass-embedded-android-arm64 "1.75.0" - sass-embedded-android-ia32 "1.75.0" - sass-embedded-android-x64 "1.75.0" - sass-embedded-darwin-arm64 "1.75.0" - sass-embedded-darwin-x64 "1.75.0" - sass-embedded-linux-arm "1.75.0" - sass-embedded-linux-arm64 "1.75.0" - sass-embedded-linux-ia32 "1.75.0" - sass-embedded-linux-musl-arm "1.75.0" - sass-embedded-linux-musl-arm64 "1.75.0" - sass-embedded-linux-musl-ia32 "1.75.0" - sass-embedded-linux-musl-x64 "1.75.0" - sass-embedded-linux-x64 "1.75.0" - sass-embedded-win32-arm64 "1.75.0" - sass-embedded-win32-ia32 "1.75.0" - sass-embedded-win32-x64 "1.75.0" - sass-loader@^14.2.0: version "14.2.0" resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.2.0.tgz#0d4440170fd9c9d93684e274a5ef73dbf55f414b" @@ -19641,11 +19516,6 @@ value-or-function@^4.0.0: resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-4.0.0.tgz#70836b6a876a010dc3a2b884e7902e9db064378d" integrity sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg== -varint@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0" - integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg== - varstream@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz#18ac6494765f3ff1a35ad9a4be053bec188a5de1"