Merge branch 'main' into line_wrap

Author: akoreman

.eslintrc

@@ -15,7 +15,7 @@
       "jsx": true
     }
   },
-  "plugins": ["unicorn", "react-hooks", "no-unsanitized", "header", "import"],
+  "plugins": ["unicorn", "react-hooks", "no-unsanitized", "header", "import", "simple-import-sort"],
   "rules": {
     "@typescript-eslint/no-unused-vars": "error",
     "@typescript-eslint/consistent-type-definitions": ["error", "interface"],
@@ -69,14 +69,13 @@
         ]
       }
     ],
-    "sort-imports": ["error", { "ignoreDeclarationSort": true }],
-    "import/order": ["error", { "alphabetize": { "order": "asc" } }],
     "import/no-useless-path-segments": [
       "warn",
       {
         "noUselessIndex": true
       }
-    ]
+    ],
+    "simple-import-sort/imports": "error"
   },
   "settings": {
     "react": {
@@ -98,6 +97,30 @@
       "env": {
         "jest": true
       }
+    },
+    {
+      "files": ["src/**", "pages/**", "test/**", "scripts/**"],
+      "rules": {
+        "simple-import-sort/imports": [
+          "error",
+          {
+            "groups": [
+              // External packages come first.
+              ["^react", "^(?!@cloudscape)@?\\w"],
+              // Cloudscape packages.
+              ["^@cloudscape"],
+              // Things that start with a letter (or digit or underscore), or `~` followed by a letter.
+              ["^~\\w"],
+              // Anything not matched in another group.
+              ["^"],
+              // Styles come last.
+              [
+                "^.+\\.?(css)$","^.+\\.?(css.js)$", "^.+\\.?(scss)$", "^.+\\.?(selectors.js)$"
+              ]
+            ]
+          }
+        ]
+      }
     }
   ]
 }

.github/workflows/build-lint-test.yml

@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - main
+  merge_group:
 
 permissions:
   id-token: write
@@ -18,6 +19,7 @@ permissions:
 jobs:
   build:
     uses: cloudscape-design/actions/.github/workflows/build-lint-test.yml@main
+    secrets: inherit
     with:
       artifact-path: dist
       artifact-name: dev-pages

.github/workflows/dry-run.yml

@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
       - main
+  merge_group:
 
 jobs:
   dry-run:

.github/workflows/lint-pr.yml

@@ -6,6 +6,7 @@ on:
       - opened
       - edited
       - synchronize
+  merge_group:
 
 jobs:
   dry-run:

.github/workflows/visual-regression.yml

@@ -18,9 +18,9 @@ jobs:
     if: github.event.ref != 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: "npm"
       - name: "Download artifacts"
         # Turns out you can not use artifacts from a previous workflow run.
@@ -47,9 +47,9 @@ jobs:
     if: github.event.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: "npm"
       - run: npm install
       - run: npm run build

.stylelintrc

@@ -6,7 +6,13 @@
     "selector-pseudo-class-no-unknown": [true, { "ignorePseudoClasses": ["global"] }],
     "selector-max-type": [0, { "ignore": ["compounded"] }],
     "selector-max-universal": [0],
-    "order/order": ["rules"]
+    "order/order": ["rules"],
+    "@cloudscape-design/license-headers": [
+      true,
+      {
+        "header": "\n Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n SPDX-License-Identifier: Apache-2.0\n"
+      }
+    ]
   },
-  "plugins": ["stylelint-use-logical", "stylelint-order"]
+  "plugins": ["stylelint-use-logical", "stylelint-order", "@cloudscape-design/build-tools/stylelint"]
 }