From 302041438183ff9f24b5b2862b43b5153a6d21e7 Mon Sep 17 00:00:00 2001 From: Bert De Block Date: Thu, 7 Mar 2024 16:28:11 +0100 Subject: [PATCH 1/2] Add `@ember/string` as development dependency --- package.json | 5 +++++ pnpm-lock.yaml | 39 +++++++++++++++++++++++++-------------- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 5f887b2c..74fc689a 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "devDependencies": { "@babel/core": "7.21.3", "@ember/optional-features": "2.0.0", + "@ember/string": "3.1.1", "@ember/test-helpers": "2.9.3", "@embroider/test-setup": "1.8.3", "broccoli-stew": "3.0.0", @@ -89,5 +90,9 @@ "versionCompatibility": { "ember": "3.8 || 3.12 || 3.16 || 3.20 || >=3.24" } + }, + "volta": { + "node": "14.21.3", + "pnpm": "6.35.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6335e58d..1a887f72 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,8 +1,9 @@ -lockfileVersion: 5.4 +lockfileVersion: 5.3 specifiers: '@babel/core': 7.21.3 '@ember/optional-features': 2.0.0 + '@ember/string': 3.1.1 '@ember/test-helpers': 2.9.3 '@embroider/test-setup': 1.8.3 broccoli-stew: 3.0.0 @@ -46,7 +47,8 @@ dependencies: devDependencies: '@babel/core': 7.21.3 '@ember/optional-features': 2.0.0 - '@ember/test-helpers': 2.9.3_vhmtgy5g3g675connghzwama5y + '@ember/string': 3.1.1 + '@ember/test-helpers': 2.9.3_a9d93363a6d9bdfe89cd698f9b0180ee '@embroider/test-setup': 1.8.3 broccoli-stew: 3.0.0 ember-auto-import: 2.6.1_webpack@5.76.2 @@ -57,16 +59,16 @@ devDependencies: ember-disable-prototype-extensions: 1.1.3 ember-load-initializers: 2.1.2_@babel+core@7.21.3 ember-maybe-import-regenerator: 1.0.0 - ember-qunit: 6.0.0_bpyxhw4q4amqwk427hkb2mxhua + ember-qunit: 6.0.0_0bf173db90e0190b2b9af9d41d32e7a0 ember-resolver: 8.1.0_@babel+core@7.21.3 - ember-source: 4.11.0_h5x7dh6zbbyopr7jvxivhylqpa + ember-source: 4.11.0_3f6ff19fd90870e7c7e9add153e17078 ember-source-channel-url: 3.0.0 ember-try: 2.0.0 eslint: 8.36.0 eslint-config-prettier: 8.8.0_eslint@8.36.0 eslint-config-simplabs: 0.4.0_eslint@8.36.0 eslint-plugin-ember: 11.4.8_eslint@8.36.0 - eslint-plugin-prettier: 4.2.1_i2qmqyy4fgpgq2h7f6vnil3crq + eslint-plugin-prettier: 4.2.1_46a0c8631c299e6868ff2faad42f628c eslint-plugin-qunit: 7.3.4_eslint@8.36.0 lerna-changelog: 2.2.0 loader.js: 4.7.0 @@ -1253,7 +1255,16 @@ packages: - supports-color dev: true - /@ember/test-helpers/2.9.3_vhmtgy5g3g675connghzwama5y: + /@ember/string/3.1.1: + resolution: {integrity: sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==} + engines: {node: 12.* || 14.* || >= 16} + dependencies: + ember-cli-babel: 7.26.11 + transitivePeerDependencies: + - supports-color + dev: true + + /@ember/test-helpers/2.9.3_a9d93363a6d9bdfe89cd698f9b0180ee: resolution: {integrity: sha512-ejVg4Dj+G/6zyLvQsYOvmGiOLU6AS94tY4ClaO1E2oVvjjtVJIRmVLFN61I+DuyBg9hS3cFoPjQRTZB9MRIbxQ==} engines: {node: 10.* || 12.* || 14.* || 15.* || >= 16.*} peerDependencies: @@ -1267,7 +1278,7 @@ packages: ember-cli-babel: 7.26.11 ember-cli-htmlbars: 6.2.0 ember-destroyable-polyfill: 2.0.3_@babel+core@7.21.3 - ember-source: 4.11.0_h5x7dh6zbbyopr7jvxivhylqpa + ember-source: 4.11.0_3f6ff19fd90870e7c7e9add153e17078 transitivePeerDependencies: - '@babel/core' - '@glint/template' @@ -1337,7 +1348,7 @@ packages: '@embroider/macros': 1.10.0 broccoli-funnel: 3.0.8 ember-cli-babel: 7.26.11 - ember-source: 4.11.0_h5x7dh6zbbyopr7jvxivhylqpa + ember-source: 4.11.0_3f6ff19fd90870e7c7e9add153e17078 transitivePeerDependencies: - supports-color dev: true @@ -2349,7 +2360,7 @@ packages: engines: {node: '>= 12.*'} dev: true - /babel-loader/8.3.0_h5x7dh6zbbyopr7jvxivhylqpa: + /babel-loader/8.3.0_3f6ff19fd90870e7c7e9add153e17078: resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==} engines: {node: '>= 8.9'} peerDependencies: @@ -4103,7 +4114,7 @@ packages: '@babel/preset-env': 7.20.2_@babel+core@7.21.3 '@embroider/macros': 1.10.0 '@embroider/shared-internals': 2.0.0 - babel-loader: 8.3.0_h5x7dh6zbbyopr7jvxivhylqpa + babel-loader: 8.3.0_3f6ff19fd90870e7c7e9add153e17078 babel-plugin-ember-modules-api-polyfill: 3.5.0 babel-plugin-htmlbars-inline-precompile: 5.3.1 babel-plugin-syntax-dynamic-import: 6.18.0 @@ -4545,14 +4556,14 @@ packages: - supports-color dev: true - /ember-qunit/6.0.0_bpyxhw4q4amqwk427hkb2mxhua: + /ember-qunit/6.0.0_0bf173db90e0190b2b9af9d41d32e7a0: resolution: {integrity: sha512-idNWh9Ap2HN9e3Xozh5Jrciu5tDhn0okM/bgwDjdks3dwuMhEox45iiRTx469FWQ9+ixjZ40AsXsRTDkfCmvmw==} engines: {node: 14.* || 16.* || >= 17} peerDependencies: '@ember/test-helpers': ^2.4.0 qunit: ^2.13.0 dependencies: - '@ember/test-helpers': 2.9.3_vhmtgy5g3g675connghzwama5y + '@ember/test-helpers': 2.9.3_a9d93363a6d9bdfe89cd698f9b0180ee broccoli-funnel: 3.0.8 broccoli-merge-trees: 3.0.2 common-tags: 1.8.2 @@ -4607,7 +4618,7 @@ packages: - encoding dev: true - /ember-source/4.11.0_h5x7dh6zbbyopr7jvxivhylqpa: + /ember-source/4.11.0_3f6ff19fd90870e7c7e9add153e17078: resolution: {integrity: sha512-SNRHsQOvF3C9emS7Rg4zcFdwY6aiSkV/7CG+KBpmzLY6hIWQNruzEDZINpNgqBn7CicAJ6g573WG7zu6458agQ==} engines: {node: '>= 14.*'} peerDependencies: @@ -4948,7 +4959,7 @@ packages: - supports-color dev: true - /eslint-plugin-prettier/4.2.1_i2qmqyy4fgpgq2h7f6vnil3crq: + /eslint-plugin-prettier/4.2.1_46a0c8631c299e6868ff2faad42f628c: resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} peerDependencies: From cc9f296947ff1ccad00ae913e4e8542f12817a11 Mon Sep 17 00:00:00 2001 From: Bert De Block Date: Thu, 7 Mar 2024 16:44:23 +0100 Subject: [PATCH 2/2] Remove `ie 11` from targets --- tests/dummy/config/targets.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js index 326def3e..b08f1928 100644 --- a/tests/dummy/config/targets.js +++ b/tests/dummy/config/targets.js @@ -4,13 +4,6 @@ const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions']; -const isCI = Boolean(process.env.CI); -const isProduction = process.env.EMBER_ENV === 'production'; - -if (isCI || isProduction) { - browsers.push('ie 11'); -} - module.exports = { browsers, };