Merge remote-tracking branch 'origin/master' into ingame-identifiers

Author: bhollis

.dockerignore

@@ -0,0 +1,16 @@
+# Dependency directories
+node_modules
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Documentation
+docs/
+
+# Misc.
+.vscode/
+build/

.eslintignore

@@ -1,9 +1,11 @@
-src/postcss.config.js
+src/postcss.config.cjs
 config/webpack.ts
 src/app/google.js
 src/browsercheck.js
 *.m.scss.d.ts
 *.test.ts
 *.test.tsx
 *.config.js
-Gruntfile.js
+src/build-browsercheck-utils.js
+src/testing/jest-setup.cjs
+src/fa-subset.js

.eslintrc

@@ -16,10 +16,8 @@
     "plugin:sonarjs/recommended"
   ],
   "globals": {
-    "Atomics": "readonly",
-    "SharedArrayBuffer": "readonly",
     "$featureFlags": "readonly",
-    "ga": true,
+    "ga": "readonly",
     "$DIM_FLAVOR": "readonly",
     "$DIM_VERSION": "readonly",
     "$DIM_BUILD_DATE": "readonly",
@@ -28,16 +26,16 @@
     "$DIM_WEB_CLIENT_SECRET": "readonly",
     "$DIM_API_KEY": "readonly",
     "$BROWSERS": "readonly",
-    "workbox": true,
-    "React": true,
-    "require": true,
+    "workbox": "readonly",
+    "React": "readonly",
+    "require": "readonly",
     "module": "readonly"
   },
   "parserOptions": {
     "ecmaFeatures": {
       "jsx": true
     },
-    "ecmaVersion": 2018,
+    "ecmaVersion": "latest",
     "sourceType": "module",
     "project": "./tsconfig.json"
   },
@@ -139,6 +137,11 @@
         "object": "_",
         "property": "noop",
         "message": "Import noop directly instead of using it through _.noop, to satisfy the unbound-method lint"
+      },
+      {
+        "object": "_",
+        "property": "groupBy",
+        "message": "Use Object.groupBy or Map.groupBy instead."
       }
     ],
     "no-restricted-imports": [
@@ -157,7 +160,12 @@
       {
         "selector": "CallExpression[callee.property.name='compact'][callee.object.name='_'][arguments.0.callee.property.name='map']",
         "message": "Please use `filterMap` instead"
-      }, {
+      },
+      {
+        "selector": "CallExpression[callee.name='clsx'][arguments.length=1][arguments.0.object.name='styles'],CallExpression[callee.name='clsx'][arguments.length=1][arguments.0.type='Literal']",
+        "message": "Unnecessary clsx"
+      },
+      {
         "selector": "TSEnumDeclaration:not([const=true])",
         "message": "Please only use `const enum`s."
       }
@@ -265,16 +273,7 @@
         "checksVoidReturn": false
       }
     ],
-    "@typescript-eslint/ban-types": [
-      "error",
-      {
-        "types": {
-          "BigInt": "BigInt isn't supported in old versions (pre-14) of Safari",
-          "bigint": "BigInt isn't supported in old versions (pre-14) of Safari"
-        },
-        "extendDefaults": false
-      }
-    ],
+    "@typescript-eslint/ban-types": "off",
     "@typescript-eslint/explicit-member-accessibility": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/explicit-module-boundary-types": "off",

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Added trailing commas everywhere
+4ecced03d68e8ef1c4addd24ad32d1cde3d393e9

.github/dependabot.yml

@@ -0,0 +1,28 @@
+version: 2
+updates:
+  - directory: /
+    package-ecosystem: "npm"
+    schedule:
+      interval: "weekly"
+      time: "18:00" # UTC, = ~10AM Pacific
+    groups:
+      major:
+        update-types:
+          - major
+      minor:
+        update-types:
+          - minor
+          - patch
+
+  - directory: /
+    package-ecosystem: "github-actions"
+    schedule:
+      interval: "weekly"
+      time: "18:00" # UTC, = ~10AM Pacific
+
+  # Dependabot doesn't support docker-compose yet
+  # - directory: /
+  #   package-ecosystem: "docker"
+  #   schedule:
+  #     interval: "weekly"
+  #     time: "18:00" # UTC, = ~10AM Pacific

.github/workflows/check-spelling.yml

@@ -0,0 +1,17 @@
+name: D2AI auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.actor == 'd2ai-bot'
+    steps:
+      - name: Enable auto-merge for d2ai PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/d2ai-auto-merge.yml

@@ -0,0 +1,23 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/dependabot-auto-merge.yml

@@ -13,27 +13,32 @@ concurrency:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    environment:
+      name: beta
+      url: https://beta.dim.gg
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 2 # So sentry can get the previous commit
 
+      - uses: pnpm/action-setup@v2
+
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
-          cache: yarn
+          cache: pnpm
 
       - name: Install SSH key
-        uses: benoitchantre/setup-ssh-authentication-action@1.0.0
+        uses: benoitchantre/setup-ssh-authentication-action@1.0.1
         with:
           private-key: ${{ secrets.SSH_KEY }}
           private-key-name: dim.rsa
           known-hosts: ${{ secrets.REMOTE_HOST }}
 
       - name: get-npm-version
         id: package-version
-        uses: martinbeentjes/npm-get-version-action@v1.1.0
+        uses: martinbeentjes/npm-get-version-action@v1.3.1
 
       - name: set beta
         run: |
@@ -46,15 +51,15 @@ jobs:
           echo "VERSION=${{ steps.package-version.outputs.current-version }}.$(($RUN_NUM+1000000))" >> $GITHUB_ENV
 
       - name: Install
-        run: yarn install --frozen-lockfile --prefer-offline
+        run: pnpm install --frozen-lockfile --prefer-offline
 
       - name: Build
-        run: yarn build:beta
+        run: pnpm build:beta
         env:
           NODE_OPTIONS: "--max_old_space_size=8192"
-          WEB_API_KEY: ${{ secrets.WEB_API_KEY }}
-          WEB_OAUTH_CLIENT_ID: ${{ secrets.WEB_OAUTH_CLIENT_ID }}
-          WEB_OAUTH_CLIENT_SECRET: ${{ secrets.WEB_OAUTH_CLIENT_SECRET }}
+          WEB_API_KEY: ${{ secrets.BUNGIE_API_KEY }}
+          WEB_OAUTH_CLIENT_ID: ${{ secrets.OAUTH_CLIENT_ID }}
+          WEB_OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_SECRET }}
           DIM_API_KEY: ${{ secrets.DIM_API_KEY }}
 
       # Send webpack stats and build information to RelativeCI
@@ -66,13 +71,14 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check Syntax
-        run: yarn syntax
+        run: pnpm syntax
 
       - name: Rsync to Server
         run: ./build/rsync-deploy.sh
         env:
             SSH_PRIVATE_KEY: ${{ secrets.SSH_KEY }}
             SOURCE: "dist/"
+            REMOTE_USER: ${{ secrets.REMOTE_USER }}
             REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
             REMOTE_PATH: beta.destinyitemmanager.com
 

.github/workflows/deploy-beta.yml

@@ -16,29 +16,34 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    environment:
+      name: release
+      url: https://app.dim.gg
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 2 # So sentry can get the previous commit
           # Use the dim-release-bot token rather than the default
           token: ${{ secrets.GH_TOKEN }}
 
+      - uses: pnpm/action-setup@v2
+
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
-          cache: yarn
+          cache: pnpm
 
       - name: Install SSH key
-        uses: benoitchantre/setup-ssh-authentication-action@1.0.0
+        uses: benoitchantre/setup-ssh-authentication-action@1.0.1
         with:
           private-key: ${{ secrets.SSH_KEY }}
           private-key-name: dim.rsa
           known-hosts: ${{ secrets.REMOTE_HOST }}
 
       - name: get-npm-version
         id: package-version
-        uses: martinbeentjes/npm-get-version-action@v1.1.0
+        uses: martinbeentjes/npm-get-version-action@v1.3.1
 
       - name: set feature
         if: ${{ !github.event.inputs.patch }}
@@ -52,7 +57,7 @@ jobs:
 
       - name: Bump release version
         id: bump_version
-        uses: christian-draeger/increment-semantic-version@1.0.2
+        uses: christian-draeger/increment-semantic-version@1.1.0
         with:
           current-version: ${{ steps.package-version.outputs.current-version }}
           version-fragment: ${{ env.build_level }}
@@ -67,16 +72,17 @@ jobs:
           version: ${{ env.VERSION }}
 
       - name: Install
-        run: yarn install --frozen-lockfile --prefer-offline
+        run: pnpm install --frozen-lockfile --prefer-offline
 
       - name: Build and deploy
         run: ./build/deploy-prod.sh
         env:
           NODE_OPTIONS: "--max_old_space_size=8192"
-          WEB_API_KEY: ${{ secrets.PROD_API_KEY }}
-          WEB_OAUTH_CLIENT_ID: ${{ secrets.PROD_OAUTH_CLIENT_ID }}
-          WEB_OAUTH_CLIENT_SECRET: ${{ secrets.PROD_OAUTH_CLIENT_SECRET }}
-          DIM_API_KEY: ${{ secrets.PROD_DIM_API_KEY }}
+          WEB_API_KEY: ${{ secrets.BUNGIE_API_KEY }}
+          WEB_OAUTH_CLIENT_ID: ${{ secrets.OAUTH_CLIENT_ID }}
+          WEB_OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_SECRET }}
+          DIM_API_KEY: ${{ secrets.DIM_API_KEY }}
+          REMOTE_USER: ${{ secrets.REMOTE_USER }}
           REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
           REMOTE_PATH: app.destinyitemmanager.com
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

.github/workflows/deploy-prod.yml

@@ -9,22 +9,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout DIM
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
           token: ${{ secrets.I18N_PAT }}
 
+      - uses: pnpm/action-setup@v2
+
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
-          cache: yarn
+          cache: pnpm
 
       - name: Install
-        run: yarn install --frozen-lockfile --prefer-offline
+        run: pnpm install --frozen-lockfile --prefer-offline
 
       - name: Download updated i18n files
-        uses: crowdin/github-action@1.4.7
+        uses: crowdin/github-action@v1.15.2
         with:
           upload_sources: false
           upload_translations: false
@@ -46,7 +48,7 @@ jobs:
           done
 
       - name: build browsercheck utils
-        run: yarn bcu
+        run: pnpm bcu
 
       - name: porcelain check
         uses: dorny/paths-filter@v2
@@ -59,7 +61,7 @@ jobs:
 
       - name: Commit files
         if: steps.filter.outputs.changed
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: i18n
           commit_user_name: DIM i18n Bot