Merge branch 'master' into jmainguy/feat/CDM-261/add_code_in_DS

Talend · Jul 24, 2023 · f099aa2 · f099aa2
2 parents 4f8ca3a + cdf2489
commit f099aa2
Show file tree

Hide file tree

Showing 236 changed files with 2,553 additions and 1,915 deletions.
diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml
@@ -44,12 +44,8 @@ jobs:
         id: eslint
         run: yarn lint
 
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@2a968ff601949c81b47d9c1fdb789b0d25ddeea2 #v37.1.2
-
       - name: Merge lint
-        run: node merge-report.js ${{ steps.changed-files.outputs.all_changed_files }}
+        run: yarn lint-merge-report master ${GITHUB_HEAD_REF}
 
       - name: Annotate Code Linting Results
         uses: ataylorme/eslint-annotate-action@2c426a387ed738e9522e93abfcb4cfc57b46458a #v2.2.0

diff --git a/fork/bootstrap-sass/assets/stylesheets/bootstrap/_labels.scss b/fork/bootstrap-sass/assets/stylesheets/bootstrap/_labels.scss
@@ -3,64 +3,64 @@
 // --------------------------------------------------
 
 .label {
-  display: inline;
-  padding: .2em .6em .3em;
-  font-size: 75%;
-  font-weight: 700;
-  line-height: 1;
-  color: $label-color;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  border-radius: .25em;
+	display: inline;
+	padding: 0.2em 0.6em 0.3em;
+	font-size: 75%;
+	font-weight: 700;
+	line-height: 1;
+	color: $label-color;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	border-radius: 0.25em;
 
-  // [converter] extracted a& to a.label
+	// [converter] extracted a& to a.label
 
-  // Empty labels collapse automatically (not available in IE8)
-  &:empty {
-    display: none;
-  }
+	// Empty labels collapse automatically (not available in IE8)
+	&:empty {
+		display: none;
+	}
 
-  // Quick fix for labels in buttons
-  .btn & {
-    position: relative;
-    top: -1px;
-  }
+	// Quick fix for labels in buttons
+	.btn & {
+		position: relative;
+		top: -1px;
+	}
 }
 
 // Add hover effects, but only for links
 a.label {
-  &:hover,
-  &:focus {
-    color: $label-link-hover-color;
-    text-decoration: none;
-    cursor: pointer;
-  }
+	&:hover,
+	&:focus {
+		color: $label-link-hover-color;
+		text-decoration: none;
+		cursor: pointer;
+	}
 }
 
 // Colors
 // Contextual variations (linked labels get darker on :hover)
 
 .label-default {
-  @include label-variant($label-default-bg);
+	@include label-variant($label-default-bg);
 }
 
 .label-primary {
-  @include label-variant($label-primary-bg);
+	@include label-variant($label-primary-bg);
 }
 
 .label-success {
-  @include label-variant($label-success-bg);
+	@include label-variant($label-success-bg);
 }
 
 .label-info {
-  @include label-variant($label-info-bg);
+	@include label-variant($label-info-bg);
 }
 
 .label-warning {
-  @include label-variant($label-warning-bg);
+	@include label-variant($label-warning-bg);
 }
 
 .label-danger {
-  @include label-variant($label-danger-bg);
+	@include label-variant($label-danger-bg);
 }
diff --git a/fork/react-bootstrap/package.json b/fork/react-bootstrap/package.json
@@ -41,8 +41,8 @@
     "react-dom": ">=16.3.0"
   },
   "devDependencies": {
-    "@talend/scripts-core": "^13.3.0",
-    "@talend/scripts-config-react-webpack": "^15.4.0",
+    "@talend/scripts-core": "^14.0.0",
+    "@talend/scripts-config-react-webpack": "^15.4.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.5",
     "@testing-library/user-event": "^13.5.0",

diff --git a/merge-report.js b/merge-report.js
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "release": "yarn pre-release && yarn changeset publish",
     "lint-staged": "lint-staged",
     "lint": "cross-env WORKSPACE_RUN_FAIL=no-bail talend-yarn-workspace run lint",
+    "lint-merge-report": "talend-yarn-workspace lint-merge-report",
     "test": "cross-env TZ=Europe/Paris talend-yarn-workspace run test --silent",
     "test:update": "cross-env TZ=Europe/Paris yarn workspaces run test --silent -u",
     "test:cov": "cross-env TZ=Europe/Paris talend-yarn-workspace run test:cov",
@@ -36,7 +37,8 @@
     "**/webpack-dev-middleware": "^5.3.3",
     "**/@types/react": "^17.0.2",
     "**/@types/react-dom": "^17.0.2",
-    "**/i18next-scanner-typescript/typescript": "^4.9.5",
+    "**/i18next-scanner-typescript/typescript": "^5.0.4",
+    "**/browser-sync-client/typescript": "^5.0.4",
     "**/vinyl-fs/glob-parent": "^5.1.2",
     "**/fast-glob/glob-parent": "^5.1.2",
     "**/trim": "^1.0.1",
@@ -62,7 +64,7 @@
     "@types/react": "^17.0.62",
     "@types/react-dom": "^17.0.20",
     "terser-webpack-plugin": "^5.3.9",
-    "typescript": "^4.9.5",
+    "typescript": "^5.0.4",
     "webpack": "^5.87.0"
   }
 }
diff --git a/packages/a11y/package.json b/packages/a11y/package.json
@@ -29,7 +29,7 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@talend/scripts-core": "^13.3.0",
+    "@talend/scripts-core": "^14.0.0",
     "@testing-library/react": "^12.1.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"

diff --git a/packages/assets-api/package.json b/packages/assets-api/package.json
@@ -28,8 +28,8 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@talend/scripts-core": "^13.3.0",
-    "@talend/scripts-config-react-webpack": "^15.4.0",
+    "@talend/scripts-core": "^14.0.0",
+    "@talend/scripts-config-react-webpack": "^15.4.1",
     "read-pkg-up": "^7.0.1"
   },
   "publishConfig": {

diff --git a/packages/cmf-cqrs/package.json b/packages/cmf-cqrs/package.json
@@ -38,8 +38,8 @@
     "redux-saga": "^1.2.3"
   },
   "devDependencies": {
-    "@talend/scripts-core": "^13.3.0",
-    "@talend/scripts-config-react-webpack": "^15.4.0",
+    "@talend/scripts-core": "^14.0.0",
+    "@talend/scripts-config-react-webpack": "^15.4.1",
     "@testing-library/react-hooks": "^8.0.1",
     "mock-socket": "^9.2.1",
     "prop-types": "^15.8.1",

diff --git a/packages/cmf-router/package.json b/packages/cmf-router/package.json
@@ -34,8 +34,8 @@
   },
   "devDependencies": {
     "@redux-saga/testing-utils": "^1.1.5",
-    "@talend/scripts-core": "^13.3.0",
-    "@talend/scripts-config-react-webpack": "^15.4.0",
+    "@talend/scripts-core": "^14.0.0",
+    "@talend/scripts-config-react-webpack": "^15.4.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "redux-saga-tester": "^1.0.874"

diff --git a/packages/cmf/package.json b/packages/cmf/package.json
@@ -55,8 +55,8 @@
   },
   "devDependencies": {
     "@redux-saga/testing-utils": "^1.1.5",
-    "@talend/scripts-core": "^13.3.0",
-    "@talend/scripts-config-react-webpack": "^15.4.0",
+    "@talend/scripts-core": "^14.0.0",
+    "@talend/scripts-config-react-webpack": "^15.4.1",
     "@testing-library/react": "^12.1.5",
     "jest-in-case": "^1.0.2",
     "jsdoc": "^3.6.11",

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -1,5 +1,55 @@
 # @talend/react-components
 
+## 11.0.0
+
+### Major Changes
+
+- bfc02c4fb: Style now use design tokens instead of bootstrap sass variables
+
+  We have updated the following components:
+
+  - ActionBar
+  - ActionIconToggle
+  - AppLoader
+  - Badge
+  - CollapsiblePanel
+  - Datalist
+  - DataViewer
+  - DateTimePickers + Legacy
+  - Drawer
+  - EditableText
+  - Enumeration (bug on buttons)
+  - FilterBar
+  - FormatValue
+  - GuidedTour
+  - GridLayout aka Dashboard
+  - HeaderBar
+  - List (Virtualized and Composition)
+  - ListView
+  - MultiSelect
+  - Notification
+  - ObjectViewer
+  - PieChart
+  - Progress
+  - RadarChart
+  - ResourceList
+  - ResourcePicker
+  - RichLayout
+  - Skeleton
+  - Slider
+  - Status
+  - SubHeaderBar
+  - Toggle
+  - Tooltip
+  - TreeView
+  - Typeahead
+
+### Patch Changes
+
+- 40e70c055: chore: remove devDependencies to typescript
+- Updated dependencies [bfc02c4fb]
+  - @talend/bootstrap-theme@8.0.0
+
 ## 10.3.5
 
 ### Patch Changes

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -35,7 +35,8 @@
   },
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "@talend/bootstrap-theme": "^7.0.1",
+    "@talend/bootstrap-theme": "^8.0.0",
+    "@talend/design-tokens": "^2.7.3",
     "@talend/react-a11y": "^1.1.0",
     "@talend/icons": "^6.58.1",
     "@talend/utils": "^2.5.1",
@@ -69,13 +70,13 @@
   },
   "devDependencies": {
     "@storybook/addon-actions": "^6.5.16",
-    "@talend/bootstrap-theme": "^7.0.1",
+    "@talend/bootstrap-theme": "^8.0.0",
     "@talend/design-system": "^7.10.0",
     "@talend/icons": "^6.58.1",
     "@talend/locales-design-system": "^7.3.0",
     "@talend/locales-tui-components": "^9.5.0",
-    "@talend/scripts-core": "^13.3.0",
-    "@talend/scripts-config-react-webpack": "^15.4.0",
+    "@talend/scripts-core": "^14.0.0",
+    "@talend/scripts-config-react-webpack": "^15.4.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^12.1.5",
     "@testing-library/user-event": "^13.5.0",
@@ -96,8 +97,7 @@
     "react-dom": "^17.0.2",
     "react-i18next": "^11.18.6",
     "react-storybook-addon-props-combinations": "^1.1.0",
-    "react-test-renderer": "^17.0.2",
-    "typescript": "^4.9.5"
+    "react-test-renderer": "^17.0.2"
   },
   "peerDependencies": {
     "@talend/design-system": "^7.5.0",
@@ -113,5 +113,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "10.3.5"
+  "version": "11.0.0"
 }