Merge branch 'master' into dependabot/npm_and_yarn/multi-d983993043

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
           node-version: 18
           cache: npm
       - name: Install Dependencies
-        run: npm install --no-shrinkwrap
+        run: npm install --no-shrinkwrap --force
       - name: Run Tests
         run: npm run test:ember
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli-cloudinary-light",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Ember addon for Cloudinary without jquery",
   "keywords": [
     "ember-addon",
@@ -33,22 +33,22 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@babel/core": "^7.25.2",
+    "@babel/core": "^7.25.8",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.24.7",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
+    "@babel/eslint-parser": "^7.25.8",
+    "@babel/plugin-proposal-decorators": "^7.25.7",
     "@ember/optional-features": "^2.1.0",
-    "@ember/test-helpers": "^3.3.0",
-    "@embroider/test-setup": "^3.0.3",
+    "@ember/test-helpers": "^4.0.4",
+    "@embroider/test-setup": "^4.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.2.2",
-    "ember-auto-import": "^2.7.4",
-    "ember-cli": "~5.9.0",
+    "concurrently": "^9.0.1",
+    "ember-auto-import": "^2.8.1",
+    "ember-cli": "~5.12.0",
     "ember-cli-clean-css": "^3.0.0",
     "ember-cli-dependency-checker": "^3.3.2",
     "ember-cli-inject-live-reload": "^2.1.0",
@@ -57,27 +57,28 @@
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^8.2.3",
-    "ember-qunit": "^8.0.2",
-    "ember-resolver": "^11.0.1",
-    "ember-source": "~5.11.0",
+    "ember-qunit": "^8.1.0",
+    "ember-resolver": "^13.0.2",
+    "ember-source": "~5.12.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.13.0",
+    "ember-template-lint": "^6.0.0",
+    "ember-test-friendly-error-handler": "^3.0.0",
     "ember-try": "^3.0.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-ember": "^11.12.0",
-    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-qunit": "^8.1.1",
+    "eslint-plugin-ember": "^12.2.1",
+    "eslint-plugin-n": "^17.11.1",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-qunit": "^8.1.2",
     "loader.js": "^4.7.0",
     "pretender": "^3.4.7",
-    "prettier": "^3.3.1",
-    "qunit": "^2.21.0",
-    "qunit-dom": "^2.0.0",
-    "stylelint": "^15.11.0",
-    "stylelint-config-standard": "^34.0.0",
-    "stylelint-prettier": "^4.1.0",
-    "webpack": "^5.91.0"
+    "prettier": "^3.3.3",
+    "qunit": "^2.22.0",
+    "qunit-dom": "^3.2.1",
+    "stylelint": "^16.10.0",
+    "stylelint-config-standard": "^36.0.1",
+    "stylelint-prettier": "^5.0.2",
+    "webpack": "^5.95.0"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0"

tests/dummy/app/app.js

@@ -2,11 +2,20 @@ import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'dummy/config/environment';
+import Ember from 'ember';
+import buildErrorHandler from 'ember-test-friendly-error-handler';
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;
   Resolver = Resolver;
 }
 
+Ember.onerror = buildErrorHandler('Ember.onerror', (reason) => {
+  throw reason;
+  // reportErrorToService(reason);
+
+  // whatever else you might want here...
+});
+
 loadInitializers(App, config.modulePrefix);

tests/dummy/app/templates/application.hbs

@@ -1,4 +1,6 @@
 {{!-- The following component displays Ember's default welcome message. --}}
-{{!-- Feel free to remove this! --}}
-<TestComponent/>
+{{page-title "Dummy"}}
+
+<h2 id="title">Welcome to Ember</h2>
+
 {{outlet}}

tests/dummy/config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "5.9.0",
+      "version": "5.12.0",
       "blueprints": [
         {
           "name": "addon",

tests/helpers/index.js

@@ -3,6 +3,7 @@ import {
   setupRenderingTest as upstreamSetupRenderingTest,
   setupTest as upstreamSetupTest,
 } from 'ember-qunit';
+import Ember from 'ember';
 
 // This file exists to provide wrappers around ember-qunit's
 // test setup functions. This way, you can easily extend the setup that is
@@ -23,8 +24,16 @@ function setupApplicationTest(hooks, options) {
   // This is also a good place to call test setup functions coming
   // from other addons:
   //
-  // setupIntl(hooks); // ember-intl
+  // setupIntl(hooks, 'en-us'); // ember-intl
   // setupMirage(hooks); // ember-cli-mirage
+
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    Ember.onerror = function (error) {
+      throw error;
+    };
+  });
 }
 
 function setupRenderingTest(hooks, options) {

tests/integration/components/cloudinary-image-test.js

@@ -1,19 +1,34 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { setupRenderingTest } from '../../helpers';
+import { render, validateErrorHandler } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import {
+  squelchErrorHandlerFor,
+  unsquelchAllErrorHandlers,
+} from 'ember-test-friendly-error-handler';
 
 module('Integration | Component | cloudinary image', function (hooks) {
   setupRenderingTest(hooks);
 
+  hooks.afterEach(() => {
+    unsquelchAllErrorHandlers();
+  });
+
+  test('Ember.onerror is functioning properly', function (assert) {
+    let result = validateErrorHandler();
+    assert.ok(result.isValid, result.message);
+  });
+
   test('it renders image', async function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     await render(hbs`<CloudinaryImage @publicId='test'/>`);
     assert
       .dom('img')
       .hasAttribute('src', 'https://res.cloudinary.com/demo/image/upload/test');
   });
 
   test('it renders an image with width and height options', async function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     await render(
       hbs`<CloudinaryImage @publicId='test' @options={{hash width='100' height='100'}}/>`,
     );
@@ -29,6 +44,7 @@ module('Integration | Component | cloudinary image', function (hooks) {
   });
 
   test('it renders an image with width and height options in url and attributes', async function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     await render(
       hbs`<CloudinaryImage @publicId='test' @options={{hash width='100' height='100' crop='fill'}}/>`,
     );
@@ -44,6 +60,7 @@ module('Integration | Component | cloudinary image', function (hooks) {
   });
 
   test('it renders an image WHITOUT width and height options attributes for crop= limit', async function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     await render(
       hbs`<CloudinaryImage @publicId='test' @options={{hash height='100' crop='limit'}}/>`,
     );
@@ -58,6 +75,7 @@ module('Integration | Component | cloudinary image', function (hooks) {
     assert.dom('img').doesNotHaveAttribute('height');
   });
   test('it renders an image WHITOUT width and height options attributes for crop= lfill', async function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     await render(
       hbs`<CloudinaryImage @publicId='test' @options={{hash height='100' crop='lfill'}}/>`,
     );
@@ -72,6 +90,7 @@ module('Integration | Component | cloudinary image', function (hooks) {
     assert.dom('img').doesNotHaveAttribute('height');
   });
   test('it renders an image WHITOUT width and height options attributes for crop= fit', async function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     await render(
       hbs`<CloudinaryImage @publicId='test' @options={{hash width='100' height='100' crop='fit'}}/>`,
     );

tests/integration/components/cloudinary-resource-list-test.js

@@ -1,8 +1,12 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '../../helpers';
 import { render, find } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
 import Pretender from 'pretender';
+import {
+  squelchErrorHandlerFor,
+  unsquelchAllErrorHandlers,
+} from 'ember-test-friendly-error-handler';
 
 module('Integration | Component | cloudinary-resource-list', function (hooks) {
   setupRenderingTest(hooks);
@@ -12,6 +16,7 @@ module('Integration | Component | cloudinary-resource-list', function (hooks) {
   });
 
   hooks.afterEach(function () {
+    unsquelchAllErrorHandlers();
     this.server.shutdown();
   });
 
@@ -27,6 +32,7 @@ module('Integration | Component | cloudinary-resource-list', function (hooks) {
   });
 
   test('it renders cloudinary response in correct order', async function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     this.server.get(
       'https://res.cloudinary.com/demo/image/list/test.json',
       () => {
@@ -113,6 +119,7 @@ module('Integration | Component | cloudinary-resource-list', function (hooks) {
   });
 
   test('it fetches images without custom context', async function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     this.server.get(
       'https://res.cloudinary.com/demo/image/list/test.json',
       () => {

tests/integration/components/cloudinary-video-test.js

@@ -1,12 +1,21 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '../../helpers';
 import { render } from '@ember/test-helpers';
-import hbs from 'htmlbars-inline-precompile';
+import { hbs } from 'ember-cli-htmlbars';
+import {
+  squelchErrorHandlerFor,
+  unsquelchAllErrorHandlers,
+} from 'ember-test-friendly-error-handler';
 
 module('Integration | Component | cloudinary video', function (hooks) {
   setupRenderingTest(hooks);
 
+  hooks.afterEach(() => {
+    unsquelchAllErrorHandlers();
+  });
+
   test('it renders a video', async function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     await render(hbs`<CloudinaryVideo @publicId='dog'/>`);
     assert
       .dom('source')

tests/test-helper.js

@@ -9,4 +9,4 @@ setApplication(Application.create(config.APP));
 
 setup(QUnit.assert);
 
-start();
+start({ setupEmberOnerrorValidation: false });

tests/unit/utils/variable-formatter-test.js

@@ -1,14 +1,24 @@
 import variableFormatter from 'dummy/utils/variable-formatter';
 import { module, test } from 'qunit';
+import {
+  squelchErrorHandlerFor,
+  unsquelchAllErrorHandlers,
+} from 'ember-test-friendly-error-handler';
+
+module('Unit | Utility | variable formatter', function (hooks) {
+  hooks.afterEach(() => {
+    unsquelchAllErrorHandlers();
+  });
 
-module('Unit | Utility | variable formatter', function () {
   test('it works', function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     const options = { height: 200 };
     let result = variableFormatter(options);
     assert.strictEqual(result, '/h_200');
   });
 
   test('it works with more variables', function (assert) {
+    squelchErrorHandlerFor('Ember.onerror');
     const options = { height: 200, crop: 'fit' };
     let result = variableFormatter(options);
     assert.strictEqual(result, '/h_200,c_fit');