Merge branch 'WoWAnalyzer:dragonflight' into shattering-star

.github/workflows/build.yml

@@ -115,7 +115,7 @@ jobs:
           VITE_ENVIRONMENT_NAME: ${{ steps.environment-name.outputs.environment_name }}
           VITE_VERSION: ${{ github.sha }}
       - run: tar -czf dist.tar.gz dist
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist.tar.gz
@@ -151,7 +151,7 @@ jobs:
           VITE_VERSION: ${{ github.sha }}
           VITE_FORCE_PREMIUM: true
       - run: tar -czf dist.tar.gz dist
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: e2e-build
           path: dist.tar.gz
@@ -170,7 +170,7 @@ jobs:
           node-version: '20.x'
           cache: 'yarn'
       - run: yarn install --frozen-lockfile --prefer-offline
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: e2e-build
       - run: tar -xzf dist.tar.gz
@@ -212,7 +212,7 @@ jobs:
     if: github.event_name == 'push' && github.repository == 'wowanalyzer/wowanalyzer'
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v4
         with:
           name: dist
           path: .
@@ -221,22 +221,26 @@ jobs:
       - run: rm dist.tar.gz
       - name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: docker/metadata-action@v5
         with:
-          images: wowanalyzer/wowanalyzer
-          tag-sha: true
+          images: |
+            wowanalyzer/wowanalyzer
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=sha
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{secrets.DOCKER_USERNAME}}
           password: ${{secrets.DOCKER_PASSWORD}}
-      - name: 'Build martijnhols/healfie:${{env.DOCKER_BUILD_TAG}}'
+      - name: Build Docker image
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile

package.json

@@ -6,6 +6,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
+    "@emotion/is-prop-valid": "^1.2.2",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@lingui/core": "4.8.0",

src/CHANGELOG.tsx

@@ -35,6 +35,8 @@ import SpellLink from 'interface/SpellLink';
 
 // prettier-ignore
 export default [
+  change(date(2024, 5, 28), 'Add Cataclysm boss images and raid zones', emallson),
+  change(date(2024, 5, 22), 'Update GitHub Actions versions.', ToppleTheNun),
   change(date(2024, 5, 6), 'Add patch 10.2.7.', ToppleTheNun),
   change(date(2024, 5, 6), <>Add simple damage mitigated statistic for <ItemLink id={ITEMS.ENDURING_DREADPLATE.id} />.</>, ToppleTheNun),
   change(date(2024, 5, 3), 'Improve behavior of "Refresh" button', emallson),

src/analysis/classic/_templates/caster/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/_templates/healer/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/_templates/melee/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/deathknight/frost/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/druid/balance/CONFIG.tsx

@@ -25,7 +25,7 @@ const config: Config = {
   pages: {
     overview: {
       hideChecklist: false,
-      text: <>Classic WotLK support is still a Work in Progress.</>,
+      text: <>Classic Cataclysm support is still a Work in Progress.</>,
       type: 'info', // info, warning, or danger
     },
   },

src/analysis/classic/druid/feral/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/druid/restoration/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/hunter/marksman/CONFIG.tsx

@@ -14,11 +14,11 @@ const config: Config = {
   isPartial: true,
   // Explain the status of this spec's analysis here. Try to mention how complete it is, and perhaps show links to places users can learn more.
   // If this spec's analysis does not show a complete picture please mention this in the `<Warning>` component.
-  description: <>Classic WotLK support is still a Work in Progress.</>,
+  description: <>Classic Cataclysm support is still a Work in Progress.</>,
   pages: {
     overview: {
       hideChecklist: false,
-      text: <>Classic WotLK support is still a Work in Progress.</>,
+      text: <>Classic Cataclysm support is still a Work in Progress.</>,
       type: 'info',
     },
   },

src/analysis/classic/hunter/survival/CONFIG.tsx

@@ -14,11 +14,11 @@ const config: Config = {
   isPartial: true,
   // Explain the status of this spec's analysis here. Try to mention how complete it is, and perhaps show links to places users can learn more.
   // If this spec's analysis does not show a complete picture please mention this in the `<Warning>` component.
-  description: <>Classic WotLK support is still a Work in Progress.</>,
+  description: <>Classic Cataclysm support is still a Work in Progress.</>,
   pages: {
     overview: {
       hideChecklist: false,
-      text: <>Classic WotLK support is still a Work in Progress.</>,
+      text: <>Classic Cataclysm support is still a Work in Progress.</>,
       type: 'info',
     },
   },

src/analysis/classic/mage/arcane/CONFIG.tsx

@@ -33,7 +33,7 @@ const config: Config = {
   pages: {
     overview: {
       hideChecklist: false,
-      text: <>Classic WotLK support is still a Work in Progress.</>,
+      text: <>Classic Cataclysm support is still a Work in Progress.</>,
       type: 'info',
     },
   },

src/analysis/classic/mage/fire/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/paladin/holy/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/paladin/protection/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/paladin/retribution/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/priest/discipline/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/priest/shadow/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/rogue/assassination/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/shaman/enhancement/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/shaman/restoration/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/classic/warlock/affliction/CONFIG.tsx

@@ -33,7 +33,7 @@ const CONFIG: Config = {
   pages: {
     overview: {
       hideChecklist: false,
-      text: <>Classic WotLK support is still a Work in Progress.</>,
+      text: <>Classic Cataclysm support is still a Work in Progress.</>,
       type: 'info',
     },
   },

src/analysis/classic/warlock/demonology/CONFIG.tsx

@@ -33,7 +33,7 @@ const CONFIG: Config = {
   pages: {
     overview: {
       hideChecklist: false,
-      text: <>Classic WotLK support is still a Work in Progress.</>,
+      text: <>Classic Cataclysm support is still a Work in Progress.</>,
       type: 'info',
     },
   },

src/analysis/classic/warrior/fury/CONFIG.tsx

@@ -27,7 +27,7 @@ const config: Config = {
       hideChecklist: false,
       text: (
         <>
-          Classic WotLK support is still a Work in Progress. This spec guide is a stub. See the
+          Classic Cataclysm support is still a Work in Progress. This spec guide is a stub. See the
           "About" tab for information on contributing.
         </>
       ),

src/analysis/retail/deathknight/blood/CHANGELOG.tsx

@@ -5,11 +5,12 @@ import { SpellLink } from 'interface';
 
 
 export default [
+  change(date(2024, 5, 22), <>Extend <SpellLink spell={talents.DEATH_STRIKE_TALENT} /> section of the guide.</>, emallson),
   change(date(2024, 3, 26), 'Remove support for Shadowlands tier set.', ToppleTheNun),
-  change(date(2024, 3, 18), <>Updated spec to 10.2.5 and added new guide items</>,Arlie),
-  change(date(2023, 12, 15), <>Fix spell link suggestions for<SpellLink spell={talents.DANCING_RUNE_WEAPON_TALENT} /></>,Arlie),
-  change(date(2023, 8, 12), 'Large update to the abilities file to include many missing spells and talents.',Yajinni),
-  change(date(2023, 8, 11), <><SpellLink spell={talents.RUNE_TAP_TALENT} /> Updated it to show cast efficiency only if the talent was taken.</>,Yajinni),
+  change(date(2024, 3, 18), <>Updated spec to 10.2.5 and added new guide items</>, Arlie),
+  change(date(2023, 12, 15), <>Fix spell link suggestions for<SpellLink spell={talents.DANCING_RUNE_WEAPON_TALENT} /></>, Arlie),
+  change(date(2023, 8, 12), 'Large update to the abilities file to include many missing spells and talents.', Yajinni),
+  change(date(2023, 8, 11), <><SpellLink spell={talents.RUNE_TAP_TALENT} /> Updated it to show cast efficiency only if the talent was taken.</>, Yajinni),
   change(date(2023, 6, 19), 'Update SpellLink usage.', ToppleTheNun),
   change(date(2023, 4, 8), <><SpellLink spell={talents.DEATH_STRIKE_TALENT} /> casts while not tanking within the next 6 seconds now count as dumping RP.</>, emallson),
   change(date(2023, 4, 8), <><SpellLink spell={talents.DEATH_STRIKE_TALENT} /> problems are now ordered by amount of damage taken.</>, emallson),

src/analysis/retail/deathknight/blood/CombatLogParser.ts

@@ -1,5 +1,4 @@
 import {
-  RuneTracker,
   RuneDetails,
   RuneOfTheFallenCrusader,
   RuneOfHysteria,
@@ -45,6 +44,9 @@ import RelishInBlood from './modules/talents/RelishInBlood';
 import Tombstone from './modules/talents/Tombstone';
 import Voracious from './modules/talents/Voracious';
 import WillOfTheNecropolis from './modules/talents/WillOfTheNecropolis';
+import RuneTracker from './modules/core/RuneTracker';
+import ResourceOrderNormalizer from './modules/core/ResourceOrderNormalizer';
+import BoneShieldOrderNormalizer from './modules/core/BoneShieldOrderNormalizer';
 
 class CombatLogParser extends CoreCombatLogParser {
   static specModules = {
@@ -107,6 +109,8 @@ class CombatLogParser extends CoreCombatLogParser {
     // normalizers
     deathStrikeNormalizer: DeathStrikeLinkNormalizer,
     bloodShieldNormalizer: BloodShieldNormalizer,
+    resourceOrderNormalizer: ResourceOrderNormalizer,
+    boneShieldOrderNormalizer: BoneShieldOrderNormalizer,
   };
 
   static guide = BloodGuide;