From 4173512ee361694fbb688ff7c395898fcc3a1268 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 17:12:28 +0000 Subject: [PATCH 1/2] Update dependency prettier to v3 --- addon/package.json | 2 +- docs/package.json | 2 +- pnpm-lock.yaml | 28 +++++++++++++++++----------- test-app/package.json | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/addon/package.json b/addon/package.json index dba9e113..2e062db5 100644 --- a/addon/package.json +++ b/addon/package.json @@ -57,7 +57,7 @@ "eslint-plugin-prettier": "4.2.1", "eslint-plugin-qunit": "8.0.1", "npm-run-all": "4.1.5", - "prettier": "2.8.8", + "prettier": "3.0.3", "sass": "1.69.4", "webpack": "5.89.0" }, diff --git a/docs/package.json b/docs/package.json index 4c6b5e53..3626a6ef 100644 --- a/docs/package.json +++ b/docs/package.json @@ -70,7 +70,7 @@ "eslint-plugin-qunit": "8.0.1", "loader.js": "4.7.0", "npm-run-all": "4.1.5", - "prettier": "2.8.8", + "prettier": "3.0.3", "qunit": "2.20.0", "qunit-dom": "3.0.0", "sass": "1.69.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 29d1598f..961c8fe6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -96,7 +96,7 @@ importers: version: 11.1.0(eslint@8.51.0) eslint-plugin-prettier: specifier: 4.2.1 - version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@2.8.8) + version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3) eslint-plugin-qunit: specifier: 8.0.1 version: 8.0.1(eslint@8.51.0) @@ -104,8 +104,8 @@ importers: specifier: 4.1.5 version: 4.1.5 prettier: - specifier: 2.8.8 - version: 2.8.8 + specifier: 3.0.3 + version: 3.0.3 sass: specifier: 1.69.4 version: 1.69.4 @@ -231,7 +231,7 @@ importers: version: 11.1.0(eslint@8.51.0) eslint-plugin-prettier: specifier: 4.2.1 - version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@2.8.8) + version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3) eslint-plugin-qunit: specifier: 8.0.1 version: 8.0.1(eslint@8.51.0) @@ -242,8 +242,8 @@ importers: specifier: 4.1.5 version: 4.1.5 prettier: - specifier: 2.8.8 - version: 2.8.8 + specifier: 3.0.3 + version: 3.0.3 qunit: specifier: 2.20.0 version: 2.20.0 @@ -357,7 +357,7 @@ importers: version: 11.1.0(eslint@8.51.0) eslint-plugin-prettier: specifier: 4.2.1 - version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@2.8.8) + version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3) eslint-plugin-qunit: specifier: 8.0.1 version: 8.0.1(eslint@8.51.0) @@ -368,8 +368,8 @@ importers: specifier: 4.1.5 version: 4.1.5 prettier: - specifier: 2.8.8 - version: 2.8.8 + specifier: 3.0.3 + version: 3.0.3 qunit: specifier: 2.20.0 version: 2.20.0 @@ -9302,7 +9302,7 @@ packages: semver: 6.3.1 dev: true - /eslint-plugin-prettier@4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@2.8.8): + /eslint-plugin-prettier@4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3): resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} peerDependencies: @@ -9315,7 +9315,7 @@ packages: dependencies: eslint: 8.51.0 eslint-config-prettier: 9.0.0(eslint@8.51.0) - prettier: 2.8.8 + prettier: 3.0.3 prettier-linter-helpers: 1.0.0 dev: true @@ -14169,6 +14169,12 @@ packages: engines: {node: '>=10.13.0'} hasBin: true + /prettier@3.0.3: + resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} + engines: {node: '>=14'} + hasBin: true + dev: true + /pretty-hrtime@1.0.3: resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==} engines: {node: '>= 0.8'} diff --git a/test-app/package.json b/test-app/package.json index 63859559..a6ecc6f5 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -63,7 +63,7 @@ "eslint-plugin-qunit": "8.0.1", "loader.js": "4.7.0", "npm-run-all": "4.1.5", - "prettier": "2.8.8", + "prettier": "3.0.3", "qunit": "2.20.0", "qunit-dom": "3.0.0", "sass": "1.69.4", From 3dc7b2e0ded503742fde00a3f0c52f9b9ed3cb50 Mon Sep 17 00:00:00 2001 From: nickschot Date: Fri, 20 Oct 2023 19:20:09 +0200 Subject: [PATCH 2/2] Fix lint issues --- addon/addon/components/mobile-menu-wrapper.js | 4 +- addon/addon/components/mobile-menu.js | 4 +- addon/compile-css.js | 2 +- addon/package.json | 2 +- docs/package.json | 2 +- pnpm-lock.yaml | 46 ++++++++++++++----- test-app/package.json | 2 +- .../components/mobile-menu-test.js | 10 ++-- .../components/mobile-menu-toggle-test.js | 2 +- .../components/mobile-menu-wrapper-test.js | 4 +- .../components/mobile-menu/tray-test.js | 2 +- 11 files changed, 52 insertions(+), 28 deletions(-) diff --git a/addon/addon/components/mobile-menu-wrapper.js b/addon/addon/components/mobile-menu-wrapper.js index 119a44e1..c029fbe0 100644 --- a/addon/addon/components/mobile-menu-wrapper.js +++ b/addon/addon/components/mobile-menu-wrapper.js @@ -161,7 +161,7 @@ export default class MobileMenuWrapper extends Component { registerChild(component) { assert( 'component was already registered as a child', - !this.children.has(component) + !this.children.has(component), ); this.children.add(component); @@ -372,7 +372,7 @@ export default class MobileMenuWrapper extends Component { menu, targetPosition = 'open', currentVelocity = 0, - animate = true + animate = true, ) { const fromValue = this.position; const toValue = diff --git a/addon/addon/components/mobile-menu.js b/addon/addon/components/mobile-menu.js index 4e520fb5..d4ca53e7 100644 --- a/addon/addon/components/mobile-menu.js +++ b/addon/addon/components/mobile-menu.js @@ -216,11 +216,11 @@ export default class MobileMenu extends Component { assert( 'register function argument not passed. You should not be using directly.', - typeof this.args.register === 'function' + typeof this.args.register === 'function', ); assert( 'unregister function argument not passed. You should not be using directly.', - typeof this.args.unregister === 'function' + typeof this.args.unregister === 'function', ); if (this.args.parent?.isFastBoot && this.args.isOpen) { diff --git a/addon/compile-css.js b/addon/compile-css.js index 63a6a853..e823c0b5 100644 --- a/addon/compile-css.js +++ b/addon/compile-css.js @@ -8,7 +8,7 @@ const inputFile = path.join( __dirname, 'app', 'styles', - 'ember-mobile-menu.scss' + 'ember-mobile-menu.scss', ); const outputFile = path.join(__dirname, 'vendor', 'ember-mobile-menu.css'); diff --git a/addon/package.json b/addon/package.json index 2e062db5..b679196c 100644 --- a/addon/package.json +++ b/addon/package.json @@ -54,7 +54,7 @@ "eslint-config-prettier": "9.0.0", "eslint-plugin-ember": "11.11.1", "eslint-plugin-node": "11.1.0", - "eslint-plugin-prettier": "4.2.1", + "eslint-plugin-prettier": "5.0.1", "eslint-plugin-qunit": "8.0.1", "npm-run-all": "4.1.5", "prettier": "3.0.3", diff --git a/docs/package.json b/docs/package.json index 3626a6ef..9abfb3e9 100644 --- a/docs/package.json +++ b/docs/package.json @@ -66,7 +66,7 @@ "eslint-config-prettier": "9.0.0", "eslint-plugin-ember": "11.11.1", "eslint-plugin-node": "11.1.0", - "eslint-plugin-prettier": "4.2.1", + "eslint-plugin-prettier": "5.0.1", "eslint-plugin-qunit": "8.0.1", "loader.js": "4.7.0", "npm-run-all": "4.1.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 961c8fe6..647362b5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,8 +95,8 @@ importers: specifier: 11.1.0 version: 11.1.0(eslint@8.51.0) eslint-plugin-prettier: - specifier: 4.2.1 - version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3) + specifier: 5.0.1 + version: 5.0.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3) eslint-plugin-qunit: specifier: 8.0.1 version: 8.0.1(eslint@8.51.0) @@ -230,8 +230,8 @@ importers: specifier: 11.1.0 version: 11.1.0(eslint@8.51.0) eslint-plugin-prettier: - specifier: 4.2.1 - version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3) + specifier: 5.0.1 + version: 5.0.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3) eslint-plugin-qunit: specifier: 8.0.1 version: 8.0.1(eslint@8.51.0) @@ -356,8 +356,8 @@ importers: specifier: 11.1.0 version: 11.1.0(eslint@8.51.0) eslint-plugin-prettier: - specifier: 4.2.1 - version: 4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3) + specifier: 5.0.1 + version: 5.0.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3) eslint-plugin-qunit: specifier: 8.0.1 version: 8.0.1(eslint@8.51.0) @@ -2889,6 +2889,18 @@ packages: '@octokit/openapi-types': 18.1.1 dev: true + /@pkgr/utils@2.4.2: + resolution: {integrity: sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==} + engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} + dependencies: + cross-spawn: 7.0.3 + fast-glob: 3.3.1 + is-glob: 4.0.3 + open: 9.1.0 + picocolors: 1.0.0 + tslib: 2.6.2 + dev: true + /@pnpm/config.env-replace@1.1.0: resolution: {integrity: sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==} engines: {node: '>=12.22.0'} @@ -9302,14 +9314,17 @@ packages: semver: 6.3.1 dev: true - /eslint-plugin-prettier@4.2.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3): - resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} - engines: {node: '>=12.0.0'} + /eslint-plugin-prettier@5.0.1(eslint-config-prettier@9.0.0)(eslint@8.51.0)(prettier@3.0.3): + resolution: {integrity: sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==} + engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - eslint: '>=7.28.0' + '@types/eslint': '>=8.0.0' + eslint: '>=8.0.0' eslint-config-prettier: '*' - prettier: '>=2.0.0' + prettier: '>=3.0.0' peerDependenciesMeta: + '@types/eslint': + optional: true eslint-config-prettier: optional: true dependencies: @@ -9317,6 +9332,7 @@ packages: eslint-config-prettier: 9.0.0(eslint@8.51.0) prettier: 3.0.3 prettier-linter-helpers: 1.0.0 + synckit: 0.8.5 dev: true /eslint-plugin-qunit@8.0.1(eslint@8.51.0): @@ -16015,6 +16031,14 @@ packages: transitivePeerDependencies: - supports-color + /synckit@0.8.5: + resolution: {integrity: sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==} + engines: {node: ^14.18.0 || >=16.0.0} + dependencies: + '@pkgr/utils': 2.4.2 + tslib: 2.6.2 + dev: true + /tailwindcss@1.9.6: resolution: {integrity: sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==} engines: {node: '>=8.9.0'} diff --git a/test-app/package.json b/test-app/package.json index a6ecc6f5..d1589a1c 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -59,7 +59,7 @@ "eslint-config-prettier": "9.0.0", "eslint-plugin-ember": "11.11.1", "eslint-plugin-node": "11.1.0", - "eslint-plugin-prettier": "4.2.1", + "eslint-plugin-prettier": "5.0.1", "eslint-plugin-qunit": "8.0.1", "loader.js": "4.7.0", "npm-run-all": "4.1.5", diff --git a/test-app/tests/integration/components/mobile-menu-test.js b/test-app/tests/integration/components/mobile-menu-test.js index a7ca1206..e06dbfd4 100644 --- a/test-app/tests/integration/components/mobile-menu-test.js +++ b/test-app/tests/integration/components/mobile-menu-test.js @@ -14,7 +14,7 @@ module('Integration | Component | mobile-menu', function (hooks) { test('it renders', async function (assert) { await render( - hbs`` + hbs``, ); assert.strictEqual(this.element.textContent.trim(), ''); @@ -31,28 +31,28 @@ module('Integration | Component | mobile-menu', function (hooks) { test('it is a left menu by default', async function (assert) { await render( - hbs`` + hbs``, ); assert.dom('.mobile-menu').hasClass('mobile-menu--left'); }); test(`it is a right menu if type is 'right'`, async function (assert) { await render( - hbs`` + hbs``, ); assert.dom('.mobile-menu').hasClass('mobile-menu--right'); }); test(`it adds a mask by default`, async function (assert) { await render( - hbs`` + hbs``, ); assert.dom('.mobile-menu__mask').exists({ count: 1 }); }); test(`it doesn't add a mask by if maskEnabled=false`, async function (assert) { await render( - hbs` @parentBoundingClientRect={{hash}}` + hbs` @parentBoundingClientRect={{hash}}`, ); assert.dom('.mobile-menu__mask').doesNotExist(); }); diff --git a/test-app/tests/integration/components/mobile-menu-toggle-test.js b/test-app/tests/integration/components/mobile-menu-toggle-test.js index df08dbf3..a3469f25 100644 --- a/test-app/tests/integration/components/mobile-menu-toggle-test.js +++ b/test-app/tests/integration/components/mobile-menu-toggle-test.js @@ -41,7 +41,7 @@ module('Integration | Component | mobile-menu-toggle', function (hooks) { }; await render( - hbs`` + hbs``, ); await click('.mobile-menu__toggle'); diff --git a/test-app/tests/integration/components/mobile-menu-wrapper-test.js b/test-app/tests/integration/components/mobile-menu-wrapper-test.js index 5a333acb..c46a6f75 100644 --- a/test-app/tests/integration/components/mobile-menu-wrapper-test.js +++ b/test-app/tests/integration/components/mobile-menu-wrapper-test.js @@ -282,7 +282,7 @@ module('Integration | Component | mobile-menu-wrapper', function (hooks) { await pan( '.mobile-menu-wrapper--embedded .mobile-menu-wrapper__content', - 'right' + 'right', ); await settled(); @@ -314,7 +314,7 @@ module('Integration | Component | mobile-menu-wrapper', function (hooks) { await pan( '.mobile-menu-wrapper--embedded .mobile-menu-wrapper__content', - 'left' + 'left', ); await settled(); diff --git a/test-app/tests/integration/components/mobile-menu/tray-test.js b/test-app/tests/integration/components/mobile-menu/tray-test.js index c0fd1c6a..e8cdd412 100644 --- a/test-app/tests/integration/components/mobile-menu/tray-test.js +++ b/test-app/tests/integration/components/mobile-menu/tray-test.js @@ -26,7 +26,7 @@ module('Integration | Component | mobile-menu/tray', function (hooks) { this.set('isClosed', true); await render( - hbs`{{#if this.showMenu}}{{/if}}` + hbs`{{#if this.showMenu}}{{/if}}`, ); assert.strictEqual(document.body.style.overflow, '');