diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json index 91967f8ba9b..9a46e4f68d8 100644 --- a/app/assets/javascripts/discourse/package.json +++ b/app/assets/javascripts/discourse/package.json @@ -22,7 +22,7 @@ "@messageformat/core": "^3.4.0", "@messageformat/runtime": "^3.0.1", "ace-builds": "^1.36.5", - "decorator-transforms": "^2.2.2", + "decorator-transforms": "^2.3.0", "discourse-hbr": "workspace:1.0.0", "discourse-widget-hbs": "workspace:1.0.0", "ember-route-template": "^1.0.3", diff --git a/app/assets/javascripts/theme-transpiler/package.json b/app/assets/javascripts/theme-transpiler/package.json index 89664490e9e..5c58d74d5f5 100644 --- a/app/assets/javascripts/theme-transpiler/package.json +++ b/app/assets/javascripts/theme-transpiler/package.json @@ -11,7 +11,7 @@ "@zxing/text-encoding": "^0.9.0", "babel-plugin-ember-template-compilation": "^2.3.0", "content-tag": "^3.0.0", - "decorator-transforms": "^2.2.2", + "decorator-transforms": "^2.3.0", "discourse-common": "workspace:1.0.0", "discourse-widget-hbs": "workspace:1.0.0", "ember-cli-htmlbars": "^6.3.0", diff --git a/package.json b/package.json index 70e41830cb3..bfe450ebef8 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,6 @@ "babel-plugin-debug-macros@0.3.4": "patches/babel-plugin-debug-macros@0.3.4.patch", "virtual-dom@2.1.1": "patches/virtual-dom@2.1.1.patch", "licensee@11.1.1": "patches/licensee@11.1.1.patch", - "decorator-transforms@2.2.2": "patches/decorator-transforms@2.2.2.patch", "content-tag@3.0.0": "patches/content-tag@3.0.0.patch", "@ember-compat/tracked-built-ins": "patches/@ember-compat__tracked-built-ins.patch" }, diff --git a/patches/decorator-transforms@2.2.2.patch b/patches/decorator-transforms@2.2.2.patch deleted file mode 100644 index 67987fcda93..00000000000 --- a/patches/decorator-transforms@2.2.2.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/dist/index.js b/dist/index.js -index a28eb37cf3d1d52ce6042881556b44fe67e0f355..3938062df30cebb58be220bc3dab03c61f1835ad 100644 ---- a/dist/index.js -+++ b/dist/index.js -@@ -4,10 +4,13 @@ import { - import "./chunk-CSAU5B4Q.js"; - - // src/index.ts --import { createRequire } from "module"; -+ - import { ImportUtil } from "babel-import-util"; --var req = createRequire(import.meta.url); --var { default: decoratorSyntax } = req("@babel/plugin-syntax-decorators"); -+ -+// https://github.com/ef4/decorator-transforms/pull/27 -+import PluginSyntaxDecorators from "@babel/plugin-syntax-decorators"; -+const decoratorSyntax = PluginSyntaxDecorators.default || PluginSyntaxDecorators; -+ - function makeVisitor(babel) { - const t = babel.types; - return { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c628e20b620..e9fcd369e9b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,9 +14,6 @@ patchedDependencies: content-tag@3.0.0: hash: lgdkxhmahesfzwpl4vwprolz5m path: patches/content-tag@3.0.0.patch - decorator-transforms@2.2.2: - hash: fjlfhpth5cfhuq4pce5qq7awku - path: patches/decorator-transforms@2.2.2.patch ember-this-fallback@0.4.0: hash: znalyv6akdxlqfpmxunrdi3osa path: patches/ember-this-fallback@0.4.0.patch @@ -288,8 +285,8 @@ importers: specifier: ^1.36.5 version: 1.36.5 decorator-transforms: - specifier: ^2.2.2 - version: 2.2.2(patch_hash=fjlfhpth5cfhuq4pce5qq7awku)(@babel/core@7.26.0) + specifier: ^2.3.0 + version: 2.3.0(@babel/core@7.26.0) discourse-hbr: specifier: workspace:1.0.0 version: link:../discourse-hbr @@ -503,7 +500,7 @@ importers: version: 3.0.1(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)(webpack@5.96.1(@swc/core@1.9.3)(esbuild@0.24.0))) ember-modifier: specifier: ^4.2.0 - version: 4.2.0(@babel/core@7.26.0)(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)(webpack@5.96.1(@swc/core@1.9.3)(esbuild@0.24.0))) + version: 4.2.0(@babel/core@7.26.0)(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)) ember-on-resize-modifier: specifier: ^2.0.2 version: 2.0.2(@babel/core@7.26.0)(@glint/template@1.5.0)(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)(webpack@5.96.1(@swc/core@1.9.3)(esbuild@0.24.0)))(webpack@5.96.1(@swc/core@1.9.3)(esbuild@0.24.0)) @@ -1076,8 +1073,8 @@ importers: specifier: ^3.0.0 version: 3.0.0(patch_hash=lgdkxhmahesfzwpl4vwprolz5m) decorator-transforms: - specifier: ^2.2.2 - version: 2.2.2(patch_hash=fjlfhpth5cfhuq4pce5qq7awku)(@babel/core@7.26.0) + specifier: ^2.3.0 + version: 2.3.0(@babel/core@7.26.0) discourse-common: specifier: workspace:1.0.0 version: link:../discourse-common @@ -1356,12 +1353,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-syntax-decorators@7.25.7': - resolution: {integrity: sha512-oXduHo642ZhstLVYTe2z2GSJIruU0c/W3/Ghr6A5yGMsVrvdnxO1z+3pbTcT7f3/Clnt+1z8D/w1r1f1SHaCHw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@babel/plugin-syntax-decorators@7.25.9': resolution: {integrity: sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==} engines: {node: '>=6.9.0'} @@ -4089,8 +4080,8 @@ packages: resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==} engines: {node: '>=0.10'} - decorator-transforms@2.2.2: - resolution: {integrity: sha512-NHCSJXOUQ29YFli1QzstXWo72EyASpoVx+s0YdkMwswpovf/iAJP580nD1tB0Ph9exvtbfWdVrSAloXrWVo1Xg==} + decorator-transforms@2.3.0: + resolution: {integrity: sha512-jo8c1ss9yFPudHuYYcrJ9jpkDZIoi+lOGvt+Uyp9B+dz32i50icRMx9Bfa8hEt7TnX1FyKWKkjV+cUdT/ep2kA==} deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} @@ -8700,11 +8691,6 @@ snapshots: '@babel/core': 7.26.0(supports-color@8.1.1) '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-syntax-decorators@7.25.7(@babel/core@7.26.0)': - dependencies: - '@babel/core': 7.26.0(supports-color@8.1.1) - '@babel/helper-plugin-utils': 7.25.9 - '@babel/plugin-syntax-decorators@7.25.9(@babel/core@7.26.0)': dependencies: '@babel/core': 7.26.0(supports-color@8.1.1) @@ -9417,7 +9403,7 @@ snapshots: '@embroider/addon-shim': 1.9.0 '@embroider/macros': 1.16.9(@glint/template@1.5.0) '@simple-dom/interface': 1.4.0 - decorator-transforms: 2.2.2(patch_hash=fjlfhpth5cfhuq4pce5qq7awku)(@babel/core@7.26.0) + decorator-transforms: 2.3.0(@babel/core@7.26.0) dom-element-descriptors: 0.5.1 ember-source: 5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)(webpack@5.96.1(@swc/core@1.9.3)(esbuild@0.24.0)) transitivePeerDependencies: @@ -9957,7 +9943,7 @@ snapshots: '@glint/template': 1.5.0 optionalDependencies: ember-cli-htmlbars: 6.3.0 - ember-modifier: 4.2.0(@babel/core@7.26.0)(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)(webpack@5.96.1(@swc/core@1.9.3)(esbuild@0.24.0))) + ember-modifier: 4.2.0(@babel/core@7.26.0)(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)) '@glint/environment-ember-template-imports@1.5.0(@glint/environment-ember-loose@1.5.0(@glimmer/component@1.1.2(@babel/core@7.26.0))(@glint/template@1.5.0)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.0(@babel/core@7.26.0)(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5))))(@glint/template@1.5.0)': dependencies: @@ -12010,9 +11996,9 @@ snapshots: decode-uri-component@0.2.2: {} - decorator-transforms@2.2.2(patch_hash=fjlfhpth5cfhuq4pce5qq7awku)(@babel/core@7.26.0): + decorator-transforms@2.3.0(@babel/core@7.26.0): dependencies: - '@babel/plugin-syntax-decorators': 7.25.7(@babel/core@7.26.0) + '@babel/plugin-syntax-decorators': 7.25.9(@babel/core@7.26.0) babel-import-util: 3.0.0 transitivePeerDependencies: - '@babel/core' @@ -12657,10 +12643,10 @@ snapshots: - '@babel/core' - supports-color - ember-modifier@4.2.0(@babel/core@7.26.0)(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)(webpack@5.96.1(@swc/core@1.9.3)(esbuild@0.24.0))): + ember-modifier@4.2.0(@babel/core@7.26.0)(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)): dependencies: '@embroider/addon-shim': 1.9.0 - decorator-transforms: 2.2.2(patch_hash=fjlfhpth5cfhuq4pce5qq7awku)(@babel/core@7.26.0) + decorator-transforms: 2.3.0(@babel/core@7.26.0) ember-cli-normalize-entity-name: 1.0.0 ember-cli-string-utils: 1.1.0 optionalDependencies: @@ -12674,7 +12660,7 @@ snapshots: ember-auto-import: 2.10.0(@glint/template@1.5.0)(webpack@5.96.1(@swc/core@1.9.3)(esbuild@0.24.0)) ember-cli-babel: 7.26.11 ember-cli-htmlbars: 5.7.2 - ember-modifier: 4.2.0(@babel/core@7.26.0)(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)(webpack@5.96.1(@swc/core@1.9.3)(esbuild@0.24.0))) + ember-modifier: 4.2.0(@babel/core@7.26.0)(ember-source@5.5.0(@babel/core@7.26.0)(@glint/template@1.5.0)(rsvp@4.8.5)) ember-resize-observer-service: 1.1.0 transitivePeerDependencies: - '@babel/core'