Merge branch 'master' into jmfrancois/chore/ds-no-reakit

Talend · Jul 26, 2023 · ee40aed · ee40aed
2 parents 7094afa + fbc72ef
commit ee40aed
Show file tree

Hide file tree

Showing 289 changed files with 3,226 additions and 2,187 deletions.
diff --git a/.changeset/good-radios-push.md b/.changeset/good-radios-push.md
diff --git a/.changeset/grumpy-cars-teach.md b/.changeset/grumpy-cars-teach.md
diff --git a/.changeset/tidy-suits-mix.md b/.changeset/tidy-suits-mix.md
diff --git a/.github/workflows/changeset.yml b/.github/workflows/changeset.yml
@@ -30,7 +30,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           registry-url: "https://registry.npmjs.org/"
@@ -42,7 +42,7 @@ jobs:
 
       - name: Create Release Pull Request or Publish to npm
         id: changesets
-        uses: changesets/action@d89c1de63c7f28ac47ec85ed395f5f1d045d4697 #v1.4.4
+        uses: changesets/action@f13b1baaa620fde937751f5d2c3572b9da32af23 #v1.4.5
         with:
           # This expects you to have a script called release which does a build for your packages and calls changeset publish
           publish: yarn release

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
 
       - name: Use Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           registry-url: "https://registry.npmjs.org/"

diff --git a/.github/workflows/design-system-component-testing.yml b/.github/workflows/design-system-component-testing.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
 
-      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           registry-url: "https://registry.npmjs.org/"

diff --git a/.github/workflows/icons.yml b/.github/workflows/icons.yml
@@ -25,7 +25,7 @@ jobs:
           persist-credentials: false
 
       - name: Use Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           check-latest: true

diff --git a/.github/workflows/pr-demo.yml b/.github/workflows/pr-demo.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
 
       - name: Use Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           registry-url: "https://registry.npmjs.org/"

diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml
@@ -28,7 +28,7 @@ jobs:
           fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
 
       - name: Use Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           check-latest: true
@@ -44,12 +44,8 @@ jobs:
         id: eslint
         run: yarn lint
 
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@e1754a427f478b8778d349341b8f1d80f1f47f44 #v36.4.0
-
       - 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/.github/workflows/pr-playground.yml b/.github/workflows/pr-playground.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
 
       - name: Use Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           registry-url: "https://registry.npmjs.org/"

diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
 
       - name: Use Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           check-latest: true

diff --git a/.github/workflows/surge-cleanup.yml b/.github/workflows/surge-cleanup.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Use Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
 

diff --git a/.github/workflows/tests-cron.yml b/.github/workflows/tests-cron.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
 
       - name: Use Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           registry-url: "https://registry.npmjs.org/"

diff --git a/.github/workflows/visual-testing.yml b/.github/workflows/visual-testing.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+      - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           cache: "yarn"

diff --git a/.github/workflows/yarn-deduplicate.yml b/.github/workflows/yarn-deduplicate.yml
@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
 
       - name: Use Node.js
-        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
           node-version: 18
           registry-url: "https://registry.npmjs.org/"

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/module-to-cdn/CHANGELOG.md b/fork/module-to-cdn/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @talend/module-to-cdn
 
+## 9.9.0
+
+### Minor Changes
+
+-   f65073eb9: feat: add ace-builds
+
 ## 9.8.5
 
 ### Patch Changes

diff --git a/fork/module-to-cdn/modules.json b/fork/module-to-cdn/modules.json
@@ -155,6 +155,14 @@
       }
     }
   },
+  "ace-builds": {
+    "versions": {
+      ">= 1.10.1": {
+        "development": "/",
+        "production": "/"
+      }
+    }
+  },
   "aframe": {
     "var": "AFRAME",
     "versions": {

diff --git a/fork/module-to-cdn/package.json b/fork/module-to-cdn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@talend/module-to-cdn",
-  "version": "9.8.5",
+  "version": "9.9.0",
   "description": "Get cdn config from npm module name",
   "license": "MIT",
   "repository": "https://github.com/Talend/ui",

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",
@@ -63,7 +65,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"
   }
 }