Skip to content

Commit

Permalink
Drop support for Ember < 4.12 (#444)
Browse files Browse the repository at this point in the history
* Drop support for Ember < 4.12

* Fix lint, add @ember/string
  • Loading branch information
RobbieTheWagner authored Apr 26, 2024
1 parent 12e1c60 commit 151a2e9
Show file tree
Hide file tree
Showing 21 changed files with 574 additions and 644 deletions.
8 changes: 0 additions & 8 deletions .ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Expand Down
13 changes: 1 addition & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/declarations/
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 18
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
Expand All @@ -40,7 +40,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 18
cache: yarn
- name: Install Dependencies
run: yarn install --no-lockfile
Expand All @@ -57,8 +57,8 @@ jobs:
fail-fast: false
matrix:
try-scenario:
- ember-lts-4.4
- ember-lts-4.8
- ember-lts-4.12
- ember-lts-5.4
- ember-release
- ember-beta
- ember-canary
Expand All @@ -70,7 +70,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 18
cache: yarn
- name: Install Dependencies
run: yarn install --frozen-lockfile
Expand Down
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
8 changes: 2 additions & 6 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/.bowerrc
/.editorconfig
/.ember-cli
/.env*
Expand All @@ -23,18 +19,18 @@
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
/tsconfig.declarations.json
/tsconfig.json
/yarn-error.log
/yarn.lock
.gitkeep

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
14 changes: 1 addition & 13 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

## Running tests

* `ember test` – Runs the test suite on the current Ember version
* `ember test --server` – Runs the test suite in "watch mode"
* `ember try:each` – Runs the test suite against multiple Ember versions
* `yarn test` – Runs the test suite on the current Ember version
* `yarn test:ember --server` – Runs the test suite in "watch mode"
* `yarn test:ember-compatibility` – Runs the test suite against multiple Ember versions

## Running the dummy application

* `ember serve`
* `yarn start`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ and [Highmaps](http://www.highcharts.com/products/highmaps) component for [Ember

## Compatibility

* Ember.js v4.4 or above
* Ember CLI v4.4 or above
* Ember.js v4.12 or above
* Ember CLI v4.12 or above
* Node.js v18 or above

* If you need support for Ember < 3, use ember-highcharts < v1.2.0
* If you need support for Ember < 2.12.0, use ember-highcharts < v1.0.0
* If you need support for Ember < 1.13.0, use ember-highcharts v0.1.3
## Legacy versions

* If you need support for Ember < 3, use ember-highcharts < v1.2.0
* If you need support for Ember < 2.12.0, use ember-highcharts < v1.0.0
* If you need support for Ember < 1.13.0, use ember-highcharts v0.1.3


## Installation
Expand Down
2 changes: 0 additions & 2 deletions blueprints/chart-test/files/tests/units/__path__/__test__.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ moduleForComponent('<%= dasherizedModuleName %>', '<%= camelizedModuleName %>',
});

test('it renders', function(assert) {
assert.expect(2);

// creates the component instance
let component = this.subject();
assert.strictEqual(component._state, 'preRender');
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ module.exports = {
trees.push(
new Funnel(highchartsPath, {
destDir: 'highcharts',
})
}),
);

return mergeTrees(trees);
Expand Down
54 changes: 28 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,60 +32,62 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babel/core": "^7.24.4",
"@ember/render-modifiers": "^2.0.0",
"broccoli-funnel": "^3.0.3",
"broccoli-merge-trees": "^4.2.0",
"deepmerge": "^4.3.1",
"ember-auto-import": "^2.6.3",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.2.0",
"ember-auto-import": "^2.7.2",
"ember-cli-babel": "^8.2.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-copy": "^2.0.1",
"webpack": "^5.78.0"
"webpack": "^5.91.0"
},
"devDependencies": {
"@babel/core": "^7.24.4",
"@babel/eslint-parser": "^7.24.1",
"@babel/helper-explode-assignable-expression": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.24.1",
"@ember/optional-features": "^2.1.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@embroider/test-setup": "^2.1.1",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.3.0",
"@embroider/test-setup": "^3.0.3",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@release-it-plugins/lerna-changelog": "^6.1.0",
"babel-plugin-dynamic-import-node": "^2.3.3",
"bootstrap": "^4.5.0",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.0.1",
"ember-cli": "~4.12.2",
"concurrently": "^8.2.2",
"ember-cli": "~5.8.0",
"ember-cli-app-version": "^5.0.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-load-initializers": "^2.1.2",
"ember-qunit": "^6.2.0",
"ember-resolver": "^10.0.0",
"ember-source": "~4.12.0",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.7.2",
"ember-try": "^2.0.0",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-ember": "^11.5.0",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.4",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.1.1",
"highcharts": "^11.4.1",
"loader.js": "^4.7.0",
"prettier": "^2.8.7",
"qunit": "^2.19.4",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"qunit-dom": "^2.0.0",
"release-it": "^17.2.1",
"stylelint": "^15.4.0",
"stylelint-config-standard": "^32.0.0",
"stylelint-prettier": "^3.0.0"
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^4.1.0"
},
"peerDependencies": {
"ember-source": ">= 4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/components/chart-highstock-interactive.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default class BarBasic extends Component {
setSeriesCount(numSeries) {
let newChartData = this.dynamicChart.updateSeriesCount(
stockData,
numSeries
numSeries,
);
this.chartData = newChartData;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/components/chart-line-interactive.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default class BarBasic extends Component {
setSeriesCount(numSeries) {
let newChartData = this.dynamicChart.updateSeriesCount(
commitStats,
numSeries
numSeries,
);
this.chartData = newChartData;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/components/chart-scatter.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default class Scatter extends Component {
text: `Scatter chart with ${Highcharts.numberFormat(
totalData,
0,
' '
' ',
)} points`,
},
legend: {
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "4.12.1",
"version": "5.8.0",
"blueprints": [
{
"name": "addon",
Expand Down
8 changes: 4 additions & 4 deletions tests/dummy/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ module.exports = async function () {
useYarn: true,
scenarios: [
{
name: 'ember-lts-4.4',
name: 'ember-lts-4.12',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
'ember-source': '~4.12.0',
},
},
},
{
name: 'ember-lts-4.8',
name: 'ember-lts-5.4',
npm: {
devDependencies: {
'ember-source': '~4.8.0',
'ember-source': '~5.4.0',
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
setupTest as upstreamSetupTest,
} from 'ember-qunit';

// This file exists to provide wrappers around ember-qunit's / ember-mocha's
// This file exists to provide wrappers around ember-qunit's
// test setup functions. This way, you can easily extend the setup that is
// needed per test type.

Expand Down
Loading

0 comments on commit 151a2e9

Please sign in to comment.