Merge branch 'main' into dependabot/npm_and_yarn/d3-dag-1.1.0

weaveworks · Jan 11, 2025 · db0078e · db0078e
2 parents c10df1d + 9930bf1
commit db0078e
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 30 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -72,6 +72,8 @@ jobs:
   build-push-image:
     name: CI Build Image
     runs-on: ubuntu-latest
+    env:
+      IMAGE_NAME: ghcr.io/${{ github.repository }}/${{ matrix.docker-image }}
     permissions:
       packages: write # for docker/build-push-action to push images
       id-token: write # for Cosign to be able to sign images with GHA token
@@ -89,7 +91,7 @@ jobs:
       - uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
         id: meta
         with:
-          images: ghcr.io/${{ github.repository }}/${{ matrix.docker-image }}
+          images: ${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -119,13 +121,14 @@ jobs:
       - name: Keyless signing of image
         if: ${{ github.event_name != 'pull_request' && github.repository == 'weaveworks/weave-gitops' }}
         run: |
+          echo ${{ steps.build.outputs.imageid }}
           echo ${{ steps.build.outputs.digest }}
-          cosign sign --yes ${{ steps.build.outputs.digest }}
+          cosign sign --yes ${{ env.IMAGE_NAME }}@${{ steps.build.outputs.digest }}
       - name: Verify the image signing
         if: ${{ github.event_name != 'pull_request' && github.repository == 'weaveworks/weave-gitops' }}
         run: |
-          cosign verify ${{ steps.build.outputs.digest }}
-            --certificate-identity "https://github.com/${{ github.workflow_ref }}"
+          cosign verify ${{ env.IMAGE_NAME }}@${{ steps.build.outputs.digest }} \
+            --certificate-identity "https://github.com/${{ github.workflow_ref }}" \
             --certificate-oidc-issuer "https://token.actions.githubusercontent.com" | jq .
 
   ci-upload-binary:

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -19,31 +19,27 @@ export default tseslint.config([
             importPlugin.flatConfigs.typescript,
         ],
         rules: {
-            "import/default": 0,
-            "import/no-named-as-default-member": 0,
             "import/named": 2,
-            "import/order": [
-                2,
+            "import/order": [2,
                 {
                     alphabetize: {
                         order: "asc",
                         caseInsensitive: true,
                     },
                 }
             ],
-            "@typescript-eslint/explicit-module-boundary-types": 0,
             "@typescript-eslint/no-explicit-any": 0,
             "@typescript-eslint/ban-ts-comment": 0,
             "import/no-named-as-default": 0,
-            "@typescript-eslint/switch-exhaustiveness-check": ["error",
+            "@typescript-eslint/switch-exhaustiveness-check": [2,
                 {
                     "considerDefaultExhaustiveForUnions": true
                 }],
             "import/no-unresolved": 0,
         },
         languageOptions: {
-            ecmaVersion: 5,
-            sourceType: "script",
+            ecmaVersion: 2018,
+            sourceType: "commonjs",
             parserOptions: {
                 project: "./tsconfig.json",
             },

diff --git a/jest.config.js b/jest.config.js
@@ -1,3 +1,23 @@
+const transformIgnorePatterns = [
+  '@emotion\/.*',
+  '@mui\/.*',
+  'd3',
+  'd3-dag',
+  'history',
+  'http-proxy-middleware',
+  'install',
+  'jest-canvas-mock',
+  'js-sha3',
+  'lodash',
+  'luxon',
+  'mnemonic-browser',
+  'postcss',
+  'react',
+  'react-.*',
+  'remark-gfm',
+  'styled-components',
+].join('|');
+
 /** @type {import('jest').Config} */
 const config = {
   preset: "ts-jest",
@@ -15,7 +35,7 @@ const config = {
       },
     ],
   },
-  transformIgnorePatterns: ["/node_modules/(?!(yaml|@asamuzakjp\/css-color))"],
+  transformIgnorePatterns: [`/node_modules/(?:${transformIgnorePatterns})/`],
   setupFilesAfterEnv: ["<rootDir>/setup-jest.ts"],
   modulePathIgnorePatterns: ["<rootDir>/dist/"],
   testEnvironment: "jsdom",

diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "luxon": "^3.5.0",
     "mnemonic-browser": "^0.0.1",
     "postcss": "^8.4.49",
-    "query-string": "^4.3.4",
+    "query-string": "^9.1.1",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-is": "^18.0.0",

diff --git a/ui/pages/SignIn.tsx b/ui/pages/SignIn.tsx
@@ -93,7 +93,8 @@ function SignIn({ darkModeEnabled = true }: Props) {
   const [showPassword, setShowPassword] = React.useState<boolean>(false);
 
   const handleOIDCSubmit = () => {
-    const redirect = qs.parse(window.location.search).redirect || "";
+    const redirect =
+      (qs.parse(window.location.search).redirect as string) || "";
 
     // Head to the BE to start the OIDC flow so we do not use any of
     // react-router or other client-side routing

diff --git a/yarn.lock b/yarn.lock
@@ -4387,7 +4387,7 @@ __metadata:
     postcss: "npm:^8.4.49"
     prettier: "npm:^3.4.2"
     process: "npm:^0.11.10"
-    query-string: "npm:^4.3.4"
+    query-string: "npm:^9.1.1"
     react: "npm:^18.0.0"
     react-dom: "npm:^18.0.0"
     react-is: "npm:^18.0.0"
@@ -6005,6 +6005,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"decode-uri-component@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "decode-uri-component@npm:0.4.1"
+  checksum: 10c0/a180bbdb5398ec8270d236a3ac07cb988bbf6097428481780b85840f088951dc0318a8d8f9d56796e1a322b55b29859cea29982f22f9b03af0bc60974c54e591
+  languageName: node
+  linkType: hard
+
 "dedent@npm:^1.0.0":
   version: 1.5.3
   resolution: "dedent@npm:1.5.3"
@@ -6888,6 +6895,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"filter-obj@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "filter-obj@npm:5.1.0"
+  checksum: 10c0/716e8ad2bc352e206556b3e5695b3cdff8aab80c53ea4b00c96315bbf467b987df3640575100aef8b84e812cf5ea4251db4cd672bbe33b1e78afea88400c67dd
+  languageName: node
+  linkType: hard
+
 "find-root@npm:^1.1.0":
   version: 1.1.0
   resolution: "find-root@npm:1.1.0"
@@ -10254,7 +10268,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
+"object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
   checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
@@ -10840,13 +10854,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"query-string@npm:^4.3.4":
-  version: 4.3.4
-  resolution: "query-string@npm:4.3.4"
+"query-string@npm:^9.1.1":
+  version: 9.1.1
+  resolution: "query-string@npm:9.1.1"
   dependencies:
-    object-assign: "npm:^4.1.0"
-    strict-uri-encode: "npm:^1.0.0"
-  checksum: 10c0/6181c343074c2049fbbcde63f87c1da5d3a49c6e34c8d94a61d692e886e0b8cd1ae4a4be00b598112bb9c4cb819e423ed503a5d246e4d24ecb0990d8bb21570b
+    decode-uri-component: "npm:^0.4.1"
+    filter-obj: "npm:^5.1.0"
+    split-on-first: "npm:^3.0.0"
+  checksum: 10c0/16481f17754f660aec3cae7abb838a70e383dfcf152414d184e0d0f81fae426acf112b4d51bf754f9c256eaf83ba4241241ba907c8d58b6ed9704425e1712e8c
   languageName: node
   linkType: hard
 
@@ -11755,6 +11770,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"split-on-first@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "split-on-first@npm:3.0.0"
+  checksum: 10c0/a1262eae12b68de235e1a08e011bf5b42c42621985ddf807e6221fb1e2b3304824913ae7019f18436b96b8fab8aef5f1ad80dedd2385317fdc51b521c3882cd0
+  languageName: node
+  linkType: hard
+
 "sprintf-js@npm:^1.1.3":
   version: 1.1.3
   resolution: "sprintf-js@npm:1.1.3"
@@ -11794,13 +11816,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strict-uri-encode@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "strict-uri-encode@npm:1.1.0"
-  checksum: 10c0/eb8a4109ba2588239787389313ba58ec49e043d4c64a1d44716defe5821a68ae49abe0cdefed9946ca9fc2a4af7ecf321da92422b0a67258ec0a3638b053ae62
-  languageName: node
-  linkType: hard
-
 "string-length@npm:^4.0.1":
   version: 4.0.2
   resolution: "string-length@npm:4.0.2"