From 00ae6cc430bb122e7e805dcd52872465ffa97f9c Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 12 Sep 2024 12:09:11 +0200 Subject: [PATCH] DEV: Update ember-resolver to 13.0.0 (#28876) See: https://github.com/ember-cli/ember-resolver/releases/tag/v13.0.0 --- app/assets/javascripts/admin/package.json | 2 +- .../discourse-common/addon/resolver.js | 8 ++--- .../javascripts/discourse-common/package.json | 2 +- .../discourse-widget-hbs/package.json | 2 +- app/assets/javascripts/float-kit/package.json | 2 +- .../javascripts/pretty-text/package.json | 2 +- .../javascripts/select-kit/package.json | 2 +- pnpm-lock.yaml | 30 +++++++++---------- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json index 4279b6780de..4e20f9d3a5b 100644 --- a/app/assets/javascripts/admin/package.json +++ b/app/assets/javascripts/admin/package.json @@ -35,7 +35,7 @@ "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", - "ember-resolver": "^12.0.1", + "ember-resolver": "^13.0.0", "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js index 6cfbded2825..117e5468377 100644 --- a/app/assets/javascripts/discourse-common/addon/resolver.js +++ b/app/assets/javascripts/discourse-common/addon/resolver.js @@ -233,18 +233,18 @@ export function buildResolver(baseName) { return normalized; } - chooseModuleName(moduleName, parsedName) { - let resolved = super.chooseModuleName(moduleName, parsedName); + findModuleName(parsedName) { + let resolved = super.findModuleName(parsedName); + if (resolved) { return resolved; } const standard = parsedName.fullNameWithoutType; - let variants = [standard]; if (standard.includes("/")) { - variants.push(parsedName.fullNameWithoutType.replace(/\//g, "-")); + variants.push(standard.replace(/\//g, "-")); } for (let name of variants) { diff --git a/app/assets/javascripts/discourse-common/package.json b/app/assets/javascripts/discourse-common/package.json index 31c0821be95..eaca3fbde7e 100644 --- a/app/assets/javascripts/discourse-common/package.json +++ b/app/assets/javascripts/discourse-common/package.json @@ -26,7 +26,7 @@ "ember-auto-import": "^2.7.4", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", - "ember-resolver": "^12.0.1", + "ember-resolver": "^13.0.0", "handlebars": "^4.7.8", "truth-helpers": "workspace:1.0.0" }, diff --git a/app/assets/javascripts/discourse-widget-hbs/package.json b/app/assets/javascripts/discourse-widget-hbs/package.json index b66a8955cba..36c37e5e63a 100644 --- a/app/assets/javascripts/discourse-widget-hbs/package.json +++ b/app/assets/javascripts/discourse-widget-hbs/package.json @@ -32,7 +32,7 @@ "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", - "ember-resolver": "^12.0.1", + "ember-resolver": "^13.0.0", "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", diff --git a/app/assets/javascripts/float-kit/package.json b/app/assets/javascripts/float-kit/package.json index 2d13f82797b..f40808f8c30 100644 --- a/app/assets/javascripts/float-kit/package.json +++ b/app/assets/javascripts/float-kit/package.json @@ -35,7 +35,7 @@ "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", - "ember-resolver": "^12.0.1", + "ember-resolver": "^13.0.0", "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", diff --git a/app/assets/javascripts/pretty-text/package.json b/app/assets/javascripts/pretty-text/package.json index 7437eb3e13e..91cb8ec5018 100644 --- a/app/assets/javascripts/pretty-text/package.json +++ b/app/assets/javascripts/pretty-text/package.json @@ -36,7 +36,7 @@ "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", - "ember-resolver": "^12.0.1", + "ember-resolver": "^13.0.0", "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", diff --git a/app/assets/javascripts/select-kit/package.json b/app/assets/javascripts/select-kit/package.json index e1c290ab7c4..c08da6b333c 100644 --- a/app/assets/javascripts/select-kit/package.json +++ b/app/assets/javascripts/select-kit/package.json @@ -36,7 +36,7 @@ "ember-cli-terser": "^4.0.2", "ember-disable-prototype-extensions": "^1.1.3", "ember-load-initializers": "^2.1.1", - "ember-resolver": "^12.0.1", + "ember-resolver": "^13.0.0", "ember-source": "~5.5.0", "ember-source-channel-url": "^3.0.0", "loader.js": "^4.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dda579745b1..e9e93a197d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -189,8 +189,8 @@ importers: specifier: ^2.1.1 version: 2.1.2(@babel/core@7.25.2) ember-resolver: - specifier: ^12.0.1 - version: 12.0.1(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) + specifier: ^13.0.0 + version: 13.0.0(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) ember-source: specifier: ~5.5.0 version: 5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)) @@ -634,8 +634,8 @@ importers: specifier: ^6.3.0 version: 6.3.0 ember-resolver: - specifier: ^12.0.1 - version: 12.0.1(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) + specifier: ^13.0.0 + version: 13.0.0(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) handlebars: specifier: ^4.7.8 version: 4.7.8 @@ -823,8 +823,8 @@ importers: specifier: ^2.1.1 version: 2.1.2(@babel/core@7.25.2) ember-resolver: - specifier: ^12.0.1 - version: 12.0.1(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) + specifier: ^13.0.0 + version: 13.0.0(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) ember-source: specifier: ~5.5.0 version: 5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)) @@ -903,8 +903,8 @@ importers: specifier: ^2.1.1 version: 2.1.2(@babel/core@7.25.2) ember-resolver: - specifier: ^12.0.1 - version: 12.0.1(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) + specifier: ^13.0.0 + version: 13.0.0(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) ember-source: specifier: ~5.5.0 version: 5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)) @@ -982,8 +982,8 @@ importers: specifier: ^2.1.1 version: 2.1.2(@babel/core@7.25.2) ember-resolver: - specifier: ^12.0.1 - version: 12.0.1(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) + specifier: ^13.0.0 + version: 13.0.0(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) ember-source: specifier: ~5.5.0 version: 5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)) @@ -1061,8 +1061,8 @@ importers: specifier: ^2.1.1 version: 2.1.2(@babel/core@7.25.2) ember-resolver: - specifier: ^12.0.1 - version: 12.0.1(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) + specifier: ^13.0.0 + version: 13.0.0(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))) ember-source: specifier: ~5.5.0 version: 5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1)) @@ -4453,8 +4453,8 @@ packages: resolution: {integrity: sha512-/vbfxtHSyOGSNdjPKL8X3SyvUnYo3z88sJtD/bLJ0ZGhqVPaXCmtSkLyr/Fh75ckJDixRFxK4i4zEUSlrbk0PA==} engines: {node: 12.* || 14.* || >= 16} - ember-resolver@12.0.1: - resolution: {integrity: sha512-U+ZBdbEHMhmvcZly1xhZKwqeH5/igjT93p9bbD6x+mQVg7hm4jrsQA4jsxHu3BqgL5MmqOVx0gtAuYEWV1x2MQ==} + ember-resolver@13.0.0: + resolution: {integrity: sha512-CHt3RdHsjHnVA6wJY9Rw3n73RNfG7JBoqPAhlt4AD+leQPdY8QDKroWd9u5IM+YhCje46jhxEJAtQ733pFiS5Q==} engines: {node: 14.* || 16.* || >= 18} peerDependencies: ember-source: ^4.12.0 || >= 5.0.0 @@ -12935,7 +12935,7 @@ snapshots: transitivePeerDependencies: - supports-color - ember-resolver@12.0.1(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))): + ember-resolver@13.0.0(ember-source@5.5.0(@babel/core@7.25.2)(@glint/template@1.4.1-unstable.ff9ea6c)(rsvp@4.8.5)(webpack@5.94.0(@swc/core@1.7.26)(esbuild@0.23.1))): dependencies: ember-cli-babel: 7.26.11 optionalDependencies: