From 54ac991b3b1755a423c974c9255fd6dd444a8d32 Mon Sep 17 00:00:00 2001 From: Marine Dunstetter Date: Fri, 2 Feb 2024 15:05:47 +0100 Subject: [PATCH 1/2] breaking(node support): drop support for node 12 and node 14 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- DEPRECATIONS.md | 4 +--- README.md | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7366dba3..94648a78 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: - name: Install Node uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 16.x cache: pnpm - name: Install Dependencies run: pnpm install diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4dfc73a..fb09f326 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 16 registry-url: 'https://registry.npmjs.org' - run: npm publish diff --git a/DEPRECATIONS.md b/DEPRECATIONS.md index bea9f915..5c9a50b9 100644 --- a/DEPRECATIONS.md +++ b/DEPRECATIONS.md @@ -36,8 +36,6 @@ export class ApplicationController extends Controller { -- [Replacing Component Helper.md](https://github.com/embroider-build/embroider/blob/main/docs/replacing-component-helper.md#when-youre-invoking-a-component-youve-been-given) -## Ember < 3.28 & node < 16 support +## Ember < 3.28 The v2 addon will no longer support Ember versions lower than 3.28. - -Additionally, it will have dependencies such as `ember-cli-babel@8.2.0` that require node 16, so node 12 and node 14 will be removed from the supported engines. diff --git a/README.md b/README.md index 2e539661..d4eeb631 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The better way to handle modals in your Ember.js apps. - Ember.js v3.4 or above - Ember CLI v3.4 or above -- Node.js v12, v14 or above +- Node.js v16 or above ## Installation diff --git a/package.json b/package.json index eaee28a4..ee5cf8a1 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "webpack": "5.90.0" }, "engines": { - "node": "12.* || 14.* || >= 16.*" + "node": ">= 16.*" }, "changelog": { "repo": "mainmatter/ember-promise-modals", From ba20c5bbcd9a57fe271e24d98e8e5020ae69b8d1 Mon Sep 17 00:00:00 2001 From: Marine Dunstetter Date: Fri, 2 Feb 2024 15:44:52 +0100 Subject: [PATCH 2/2] breaking(ember support): remove Ember < 3.28 support, disable jquery-integration by default --- .github/workflows/ci.yml | 5 ++-- DEPRECATIONS.md | 4 --- README.md | 4 +-- config/ember-try.js | 30 +++++------------------ tests/dummy/config/optional-features.json | 1 + 5 files changed, 11 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94648a78..b6753c1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,10 +64,9 @@ jobs: fail-fast: false matrix: try-scenario: - - ember-lts-3.4 - - ember-lts-3.8 - - ember-lts-3.12 - ember-lts-3.28 + - ember-lts-4.4 + - ember-lts-4.8 - ember-release - ember-beta - ember-canary diff --git a/DEPRECATIONS.md b/DEPRECATIONS.md index 5c9a50b9..baf7c69b 100644 --- a/DEPRECATIONS.md +++ b/DEPRECATIONS.md @@ -35,7 +35,3 @@ export class ApplicationController extends Controller { > Caution: old-style components that have their template in `app/templates/components` instead of co-located next to their Javascript in `app/components` can't work correctly when discovered via their component class, because there's no way to locate the template. They should either port to being co-located (which is a simple mechanical transformation and highly recommended) or should import their own template and set it as layout as was traditional in addons before co-location was available. -- [Replacing Component Helper.md](https://github.com/embroider-build/embroider/blob/main/docs/replacing-component-helper.md#when-youre-invoking-a-component-youve-been-given) - -## Ember < 3.28 - -The v2 addon will no longer support Ember versions lower than 3.28. diff --git a/README.md b/README.md index d4eeb631..26e7b76e 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ The better way to handle modals in your Ember.js apps. ## Compatibility -- Ember.js v3.4 or above -- Ember CLI v3.4 or above +- Ember.js v3.28 or above +- Ember CLI v3.28 or above - Node.js v16 or above ## Installation diff --git a/config/ember-try.js b/config/ember-try.js index 5cfa1028..05a47e14 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -7,44 +7,26 @@ module.exports = async function () { usePnpm: true, scenarios: [ { - name: 'ember-lts-3.4', - npm: { - devDependencies: { - 'ember-source': '~3.4.0', - '@ember/test-helpers': '2.7.0', - 'ember-decorators-polyfill': '^1.1.5', - }, - }, - }, - { - name: 'ember-lts-3.8', + name: 'ember-lts-3.28', npm: { devDependencies: { - 'ember-source': '~3.8.0', - '@ember/test-helpers': '2.7.0', - 'ember-decorators-polyfill': '^1.1.5', + 'ember-source': '~3.28.0', }, }, }, { - name: 'ember-lts-3.12', + name: 'ember-lts-4.4', npm: { devDependencies: { - 'ember-source': '~3.12.0', - '@ember/test-helpers': '2.7.0', + 'ember-source': '~4.4.0', }, }, }, { - name: 'ember-lts-3.28', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': false, - }), - }, + name: 'ember-lts-4.8', npm: { devDependencies: { - 'ember-source': '~3.28.0', + 'ember-source': '~4.8.0', }, }, }, diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json index fc2c2b0f..b26286e2 100644 --- a/tests/dummy/config/optional-features.json +++ b/tests/dummy/config/optional-features.json @@ -1,5 +1,6 @@ { "application-template-wrapper": false, "default-async-observers": true, + "jquery-integration": false, "template-only-glimmer-components": true }