Skip to content

Commit

Permalink
Ember 4.8 (#1263)
Browse files Browse the repository at this point in the history
* Ember 4.8

* Bump deps

* Bump sass
  • Loading branch information
RobbieTheWagner authored Oct 24, 2022
1 parent 54bdc61 commit 1656b02
Show file tree
Hide file tree
Showing 8 changed files with 3,192 additions and 3,209 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ browse.VC.db

# We don't use ember-try for testing right now,
# but there's no harm in ignoring these patterns anyway
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
Expand Down
18 changes: 10 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center"><img src="https://raw.githubusercontent.com/adopted-ember-addons/ember-electron/gh-pages/img/logo-github%402x.png" alt="Ember-Electron logo showing an electron orbiting a flame" width="300" height="250"></p>

# Ember-Electron
# ember-electron

![Latest release on NPM](https://img.shields.io/npm/v/ember-electron.svg)
[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/5rhwhar361uad07v?svg=true)](https://ci.appveyor.com/project/rwwagner90/ember-electron)
Expand All @@ -9,15 +9,13 @@

An Ember addon to turn Ember apps into cross-platform desktop applications, taking care of development, tests, compilation, and installer creation.

Compatibility
------------------------------------------------------------------------------
## Compatibility

* Ember.js v3.24 or above
* Ember CLI v3.24 or above
* Node.js v14.17.5 or above
* Ember.js v3.28 or above
* Ember CLI v3.28 or above
* Node.js v14 or above

Documentation
------------------------------------------------------------------------------
## Documentation

[View Docs](https://ember-electron.js.org)

Expand All @@ -38,3 +36,7 @@ Ember-Electron builds on prior work done by @brzpegasus (author of [`ember-cli-n
* Florian Pichler ([@pichfl](https://github.com/pichfl))
* Ben Demboski ([@bendemboski](https://github.com/bendemboski))
* [...and many other contributors](https://github.com/adopted-ember-addons/ember-electron/graphs/contributors)

## License

This project is licensed under the [MIT License](LICENSE.md).
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": "4.3.0",
"version": "4.8.0",
"blueprints": [
{
"name": "addon",
Expand Down
8 changes: 4 additions & 4 deletions 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-3.24',
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'ember-source': '~3.24.3',
'ember-source': '~3.28.0',
},
},
},
{
name: 'ember-lts-3.28',
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~3.28.0',
'ember-source': '~4.4.0',
},
},
},
Expand Down
54 changes: 25 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@
"test": "tests"
},
"scripts": {
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"release": "release-it",
"test": "npm-run-all lint test:electron",
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
"test:electron": "yarn test-fast && yarn test-slow",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each",
Expand All @@ -70,68 +70,67 @@
"devDependencies": {
"@babel/core": "^7.0.0-0",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "^1.5.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@ember/test-helpers": "^2.8.1",
"@embroider/test-setup": "^1.8.3",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"console-ui": "^3.1.1",
"ember-auto-import": "^2.4.1",
"ember-cli": "~4.3.0",
"ember-auto-import": "^2.4.3",
"ember-cli": "~4.8.0",
"ember-cli-addon-docs": "^5.0.0",
"ember-cli-addon-docs-yuidoc": "^1.0.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-deploy": "^1.0.2",
"ember-cli-deploy-build": "^2.0.0",
"ember-cli-deploy-git": "^1.3.4",
"ember-cli-deploy-git-ci": "^1.0.1",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^11.0.0",
"ember-cli-sass": "^11.0.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "^4.0.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.1.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^6.0.0",
"ember-resolver": "^8.0.3",
"ember-source": "~4.7.0",
"ember-source": "~4.8.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^4.3.0",
"ember-template-lint": "^4.16.1",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.0.4",
"eslint-plugin-ember": "^11.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
"fs-extra": "^10.0.0",
"loader.js": "^4.7.0",
"mocha": "^9.0.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.6.1",
"qunit": "^2.18.0",
"prettier": "^2.7.1",
"qunit": "^2.19.2",
"qunit-dom": "^2.0.0",
"release-it": "^14.0.1",
"release-it-lerna-changelog": "^4.0.0",
"sass": "^1.26.5",
"release-it": "^15.5.0",
"release-it-lerna-changelog": "^5.0.0",
"sass": "^1.55.0",
"sinon": "^14.0.0",
"sinon-chai": "^3.5.0",
"sinon-chai": "^3.7.0",
"tmp": "^0.2.1",
"webpack": "^5.70.0"
"webpack": "^5.74.0"
},
"peerDependencies": {
"ember-cli": ">= 3.4.0",
"ember-cli-dependency-checker": ">= 3.1.0"
},
"engines": {
"node": ">= 14.17.5 || >= 16"
"node": "14.* || 16.* || >= 18"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand All @@ -141,9 +140,6 @@
},
"ember-addon": {
"defaultBlueprint": "ember-electron-postinstall",
"versionCompatibility": {
"ember": ">=2.3.0"
},
"after": [
"ember-cli-sri",
"ember-engines"
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.3.0",
"version": "4.8.0",
"blueprints": [
{
"name": "addon",
Expand Down
6 changes: 1 addition & 5 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

module.exports = function (environment) {
let ENV = {
const ENV = {
modulePrefix: 'dummy',
environment,
rootURL: '/',
Expand All @@ -11,10 +11,6 @@ module.exports = function (environment) {
// Here you can enable experimental features on an ember canary build
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
},
EXTEND_PROTOTYPES: {
// Prevent Ember Data from overriding Date.parse.
Date: false,
},
},

APP: {
Expand Down
Loading

0 comments on commit 1656b02

Please sign in to comment.