Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ember 5.6.0 upgrade #170

Merged
merged 4 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/green-tomatoes-promise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"mx-ui-components": major
---

Ember 5.6.0 upgrade
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Use Node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: '18'

- name: Install dependencies
run: yarn install --frozen-lockfile
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Use Node
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'

- name: Install dependencies
run: yarn install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Use Node
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'

- name: Install Dependencies
run: yarn
Expand Down
7 changes: 7 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
module.exports = {
name: require('./package').name,

options: {
babel: {
// eslint-disable-next-line n/no-unpublished-require
plugins: [...require('ember-cli-code-coverage').buildBabelPlugin()],
},
},

included: function (appOrAddon) {
let app = appOrAddon.app || appOrAddon;
this._super.included.apply(this, arguments);
Expand Down
61 changes: 26 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@
},
"dependencies": {
"@ember/string": "^3.1.1",
"ember-auto-import": "^2.6.3",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.2.0",
"ember-keyboard": "8.2.0",
"ember-auto-import": "^2.7.2",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-concurrency": "^4.0.0",
"ember-keyboard": "8.2.1",
"ember-modifier": "^4.1.0",
"ember-named-blocks-polyfill": "^0.2.5",
"ember-root-url": "^1.0.1"
Expand All @@ -53,10 +54,12 @@
"@babel/preset-env": "^7.20.2",
"@changesets/changelog-github": "^0.4.6",
"@changesets/cli": "^2.24.4",
"@ember/optional-features": "^2.0.0",
"@ember/render-modifiers": "^2.0.3",
"@ember/test-helpers": "^2.9.3",
"@embroider/test-setup": "^2.1.1",
"@ember/optional-features": "^2.1.0",
"@ember/render-modifiers": "^2.1.0",
"@ember/test-helpers": "^3.3.0",
"@embroider/macros": "^1.14.0",
"@embroider/test-setup": "^3.0.3",
"@embroider/util": "^1.12.1",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@meroxa/ui-base": "https://github.com/meroxa/ui-base.git#v2.0.0",
Expand All @@ -79,28 +82,28 @@
"chromatic": "^6.19.9",
"concurrently": "^8.0.1",
"core-js": "^3.9.1",
"ember-a11y-testing": "^5.2.1",
"ember-cli": "~4.12.1",
"ember-cli-code-coverage": "^1.0.2",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-deprecation-workflow": "^2.1.0",
"ember-a11y-testing": "^6.1.1",
"ember-cli": "~5.6.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-code-coverage": "^2.1.1",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-deprecation-workflow": "^2.2.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-postcss": "^7.0.0",
"ember-cli-postcss": "^8.2.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-concurrency": "^3.0.0",
"ember-keyboard": "8.2.0",
"ember-concurrency": "^4.0.0",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^4.1.0",
"ember-page-title": "^7.0.0",
"ember-qunit": "^6.2.0",
"ember-resolver": "^10.1.0",
"ember-source": "~4.12.0",
"ember-page-title": "^8.2.2",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.6.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.7.2",
"ember-template-lint": "^5.13.0",
"ember-tooltips": "^3.6.0",
"ember-truth-helpers": "^3.0.0",
"ember-try": "^2.0.0",
"ember-truth-helpers": "^4.0.3",
"ember-try": "^3.0.0",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-ember": "^11.5.0",
Expand All @@ -121,25 +124,13 @@
"tailwindcss": "^3.3.2",
"webpack": "^5.88.1"
},
"overrides": {
"@storybook/ember": {
"ember-source": "~4.12.0"
}
},
"peerDependencies": {
"ember-source": "^4.0.0"
},
"engines": {
"node": "14.* || 16.* || >= 18"
},
"resolutions": {
"minimist": "^1.2.6",
"hawk": "^8.0.1",
"ansi-html": "^0.0.8",
"@embroider/macros": "^1.10.0",
"@embroider/util": "^1.10.0",
"ember-cli-babel": "^7.26.11",
"ember-modifier": "^4.1.0",
"engine.io": "^6.4.2",
"socket.io-parser": "^4.2.3"
},
Expand Down
9 changes: 9 additions & 0 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ import { setApplication } from '@ember/test-helpers';
import { setup } from 'qunit-dom';
import { start } from 'ember-qunit';
import { setupGlobalA11yHooks } from 'ember-a11y-testing/test-support';
import {
forceModulesToBeLoaded,
sendCoverage,
} from 'ember-cli-code-coverage/test-support';

QUnit.done(async function () {
forceModulesToBeLoaded();
await sendCoverage();
});

setApplication(Application.create(config.APP));
setupGlobalA11yHooks(() => true);
Expand Down
Loading
Loading