From 25925889f5af436feb5643361295bb1c46296b83 Mon Sep 17 00:00:00 2001 From: Scott Newcomer Date: Thu, 4 Nov 2021 18:46:10 -0500 Subject: [PATCH] Remove TARGET_IE11 flag --- .github/workflows/main.yml | 6 +----- packages/-ember-data/config/ember-try.js | 7 ------- packages/-ember-data/ember-cli-build.js | 3 +-- packages/-ember-data/tests/dummy/config/targets.js | 5 ----- packages/adapter/tests/dummy/config/targets.js | 6 ------ packages/debug/tests/dummy/config/targets.js | 6 ------ packages/model/tests/dummy/config/targets.js | 6 ------ packages/record-data/tests/dummy/config/targets.js | 5 ----- packages/serializer/tests/dummy/config/targets.js | 6 ------ packages/store/tests/dummy/config/targets.js | 6 ------ .../unpublished-model-encapsulation-test-app/testem.js | 9 +-------- 11 files changed, 3 insertions(+), 62 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b2db912bf62..4771d818fdd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -147,13 +147,9 @@ jobs: strategy: fail-fast: false matrix: - launcher: [Chrome, Firefox, IE] + launcher: [Chrome, Firefox] os: [macos-latest, windows-latest, ubuntu-latest] exclude: - - os: macos-latest - launcher: IE - - os: ubuntu-latest - launcher: IE - os: ubuntu-latest launcher: Firefox - os: windows-latest diff --git a/packages/-ember-data/config/ember-try.js b/packages/-ember-data/config/ember-try.js index 2e6f57560f7..64bcc741163 100644 --- a/packages/-ember-data/config/ember-try.js +++ b/packages/-ember-data/config/ember-try.js @@ -7,13 +7,6 @@ module.exports = function () { return { useYarn: true, scenarios: [ - { - name: 'with-max-transpilation', - env: { - TARGET_IE11: true, - }, - npm: {}, - }, { name: 'with-ember-fetch-no-jquery', env: { diff --git a/packages/-ember-data/ember-cli-build.js b/packages/-ember-data/ember-cli-build.js index 709aa618f50..1c29f48d99c 100644 --- a/packages/-ember-data/ember-cli-build.js +++ b/packages/-ember-data/ember-cli-build.js @@ -5,14 +5,13 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function (defaults) { const isTest = process.env.EMBER_CLI_TEST_COMMAND; const isProd = process.env.EMBER_ENV === 'production'; - const needsIE11 = !!process.env.TARGET_IE11; const compatWith = process.env.EMBER_DATA_FULL_COMPAT ? '99.0' : null; const terserSettings = { exclude: ['assets/dummy.js', 'assets/tests.js', 'assets/test-support.js', 'dist/docs/*', 'docs/*'], }; - if (isTest && isProd && needsIE11) { + if (isTest && isProd) { terserSettings.enabled = false; } diff --git a/packages/-ember-data/tests/dummy/config/targets.js b/packages/-ember-data/tests/dummy/config/targets.js index 4fd3ea66e38..ebb51ba5a8d 100644 --- a/packages/-ember-data/tests/dummy/config/targets.js +++ b/packages/-ember-data/tests/dummy/config/targets.js @@ -1,11 +1,6 @@ 'use strict'; const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions']; -const targetIsIE11 = process.env.TESTEM_CI_LAUNCHER === 'IE' || !!process.env.TARGET_IE11; - -if (targetIsIE11) { - browsers.push('ie 11'); -} module.exports = { browsers, diff --git a/packages/adapter/tests/dummy/config/targets.js b/packages/adapter/tests/dummy/config/targets.js index 23eb67a388d..ebb51ba5a8d 100644 --- a/packages/adapter/tests/dummy/config/targets.js +++ b/packages/adapter/tests/dummy/config/targets.js @@ -2,12 +2,6 @@ const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions']; -const needsIE11 = !!process.env.TARGET_IE11; - -if (needsIE11) { - browsers.push('ie 11'); -} - module.exports = { browsers, node: 'current', diff --git a/packages/debug/tests/dummy/config/targets.js b/packages/debug/tests/dummy/config/targets.js index 23eb67a388d..ebb51ba5a8d 100644 --- a/packages/debug/tests/dummy/config/targets.js +++ b/packages/debug/tests/dummy/config/targets.js @@ -2,12 +2,6 @@ const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions']; -const needsIE11 = !!process.env.TARGET_IE11; - -if (needsIE11) { - browsers.push('ie 11'); -} - module.exports = { browsers, node: 'current', diff --git a/packages/model/tests/dummy/config/targets.js b/packages/model/tests/dummy/config/targets.js index 23eb67a388d..ebb51ba5a8d 100644 --- a/packages/model/tests/dummy/config/targets.js +++ b/packages/model/tests/dummy/config/targets.js @@ -2,12 +2,6 @@ const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions']; -const needsIE11 = !!process.env.TARGET_IE11; - -if (needsIE11) { - browsers.push('ie 11'); -} - module.exports = { browsers, node: 'current', diff --git a/packages/record-data/tests/dummy/config/targets.js b/packages/record-data/tests/dummy/config/targets.js index 4fd3ea66e38..ebb51ba5a8d 100644 --- a/packages/record-data/tests/dummy/config/targets.js +++ b/packages/record-data/tests/dummy/config/targets.js @@ -1,11 +1,6 @@ 'use strict'; const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions']; -const targetIsIE11 = process.env.TESTEM_CI_LAUNCHER === 'IE' || !!process.env.TARGET_IE11; - -if (targetIsIE11) { - browsers.push('ie 11'); -} module.exports = { browsers, diff --git a/packages/serializer/tests/dummy/config/targets.js b/packages/serializer/tests/dummy/config/targets.js index 23eb67a388d..ebb51ba5a8d 100644 --- a/packages/serializer/tests/dummy/config/targets.js +++ b/packages/serializer/tests/dummy/config/targets.js @@ -2,12 +2,6 @@ const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions']; -const needsIE11 = !!process.env.TARGET_IE11; - -if (needsIE11) { - browsers.push('ie 11'); -} - module.exports = { browsers, node: 'current', diff --git a/packages/store/tests/dummy/config/targets.js b/packages/store/tests/dummy/config/targets.js index 23eb67a388d..ebb51ba5a8d 100644 --- a/packages/store/tests/dummy/config/targets.js +++ b/packages/store/tests/dummy/config/targets.js @@ -2,12 +2,6 @@ const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions']; -const needsIE11 = !!process.env.TARGET_IE11; - -if (needsIE11) { - browsers.push('ie 11'); -} - module.exports = { browsers, node: 'current', diff --git a/packages/unpublished-model-encapsulation-test-app/testem.js b/packages/unpublished-model-encapsulation-test-app/testem.js index e11b225fce9..6284ee221b7 100644 --- a/packages/unpublished-model-encapsulation-test-app/testem.js +++ b/packages/unpublished-model-encapsulation-test-app/testem.js @@ -1,18 +1,11 @@ // eslint-disable-next-line node/no-unpublished-require const customDotReporter = require('@ember-data/unpublished-test-infra/src/testem/custom-dot-reporter'); -const TestIE = process.env.TEST_IE11; - -if (TestIE) { - // eslint-disable-next-line no-console - console.log('\n\nLaunching with IE\n\n'); -} - module.exports = { test_page: 'tests/index.html?hidepassed&nocontainer', disable_watching: true, reporter: customDotReporter, - launch_in_ci: TestIE ? ['IE'] : ['Chrome'], + launch_in_ci: ['Chrome'], launch_in_dev: ['Chrome'], browser_start_timeout: 120, browser_args: {