Skip to content

Commit

Permalink
Drop support for Ember < 4.8 and node < 18 (#1655)
Browse files Browse the repository at this point in the history
* v5.1.0...v5.6.0

* Remove analytics mocking

Analytics were removed from ember-cli, so we don't need to mock them (and can't because the `mock-analytics` module was also deleted!

Note that we're leaving the `this.analytics` references in `electron.js` to maintain compatibility with `ember-cli` < 5.4

* Simplify end-to-end test matrix

There's no longer a reason to test against both npm and yarn, so simplify!

* Fix test command

Enable the `--test-port` option. It's a good one to have regardless, but also logic inside `ember-cli`'s `test` command blows up if the option isn't present.

* Remove unused method

This used to be an override of a method in the base class, but that method is long gone...
  • Loading branch information
bendemboski authored Feb 7, 2024
1 parent 84fd0a6 commit f62a751
Show file tree
Hide file tree
Showing 18 changed files with 255 additions and 413 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
7 changes: 2 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,21 @@ jobs:

# runs slow end-to-end tests, parallelizing yarn and npm cases
test-end-to-end:
name: End-to-end tests (${{ matrix.os }}/${{ matrix.package-manager }})
name: End-to-end tests (${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
package-manager: ['npm', 'yarn']

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
- run: yarn install --frozen-lockfile --network-timeout 100000

- name: 'End-to-end Tests (${{ matrix.package-manager }})'
- name: 'End-to-end Tests'
uses: GabrielBB/xvfb-action@v1
with:
run: yarn test-slow
env:
END_TO_END_TESTS: '${{ matrix.package-manager }}'

automerge:
needs: [lint, test, test-end-to-end]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# compiled output
/dist/
/declarations/

# dependencies
/node_modules/
Expand Down
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/).
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ An Ember addon to turn Ember apps into cross-platform desktop applications, taki

## Compatibility

* Ember.js v4.4 or above
* Ember CLI v4.4 or above
* Node.js v16 or above
* Ember.js v4.8 or above
* Ember CLI v4.8 or above
* Node.js v18 or above

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion 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": "5.1.0",
"version": "5.6.0",
"blueprints": [
{
"name": "addon",
Expand Down
13 changes: 1 addition & 12 deletions lib/commands/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@ module.exports = TestCommand.extend({

availableOptions: buildAvailableOptions(),

rmTmp() {
if (process.platform === 'win32') {
// There is some kind of race condition where we intermittently get EBUSY
// deleting the temp directory on windows, which causes the test to fail.
// Unfortunately adding logging to try to track it down makes it go away,
// so let's just delay for a bit as a dirty workaround.
require('child_process').execSync('ping 127.0.0.1 -n 2 > nul');
}

return this._super(...arguments);
},

async run(commandOptions) {
let _super = this._super;
await prepareRunCommand(this.project);
Expand All @@ -38,6 +26,7 @@ function buildAvailableOptions() {
'environment',
'config-file',
'server',
'test-port',
'filter',
'module',
'watcher',
Expand Down
Loading

0 comments on commit f62a751

Please sign in to comment.