Skip to content

Commit

Permalink
Drop support for Ember < 4.4 and node < 16
Browse files Browse the repository at this point in the history
  • Loading branch information
RobbieTheWagner committed Jul 14, 2023
1 parent bf25c31 commit 4ec9201
Show file tree
Hide file tree
Showing 15 changed files with 1,162 additions and 566 deletions.
12 changes: 1 addition & 11 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/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
12 changes: 8 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
legacyDecorators: true,
requireConfigFile: false,
babelOptions: {
plugins: [
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
],
},
},
plugins: ['ember'],
Expand Down Expand Up @@ -36,6 +39,7 @@ module.exports = {
files: [
'./.eslintrc.js',
'./.prettierrc.js',
'./.stylelintrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
- main
tags:
- v*

concurrency:
group: ci-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
lint:
Expand Down
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
Expand All @@ -25,7 +18,6 @@ browse.VC.db
# 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
/package.json.ember-try
/package-lock.json.ember-try
Expand Down
9 changes: 2 additions & 7 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
/.ember-cli.js
Expand All @@ -19,11 +15,11 @@
/.gitignore
/.prettierignore
/.prettierrc.js
/.stylelintignore
/.stylelintrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/dist
/CONTRIBUTING.md
/ember-cli-build.js
/tmp
Expand All @@ -37,7 +33,6 @@
# but we ignore them anyway
# 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: 2 additions & 12 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
# 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
8 changes: 8 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# unconventional files
/blueprints/*/files/

# compiled output
/dist/

# addons
/.node_modules.ember-try/
5 changes: 5 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use strict';

module.exports = {
extends: ['stylelint-config-standard-scss', 'stylelint-prettier/recommended'],
};
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"]
}
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 v3.28 or above
* Ember CLI v3.28 or above
* Node.js v14 or above
* Ember.js v4.4 or above
* Ember CLI v4.4 or above
* Node.js v16 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": "4.10.0",
"version": "5.1.0",
"blueprints": [
{
"name": "addon",
Expand Down
51 changes: 29 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
},
"scripts": {
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\"",
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
Expand Down Expand Up @@ -69,23 +71,25 @@
},
"devDependencies": {
"@babel/core": "^7.0.0-0",
"@babel/eslint-parser": "^7.22.5",
"@babel/plugin-proposal-decorators": "^7.22.5",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@embroider/test-setup": "^3.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.1.0",
"@embroider/test-setup": "^3.0.1",
"@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",
"concurrently": "^8.0.1",
"concurrently": "^8.2.0",
"console-ui": "^3.1.1",
"ember-auto-import": "^2.5.0",
"ember-cli": "~4.10.0",
"ember-auto-import": "^2.6.3",
"ember-cli": "~5.1.0",
"ember-cli-addon-docs": "^5.0.0",
"ember-cli-addon-docs-yuidoc": "^1.0.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-clean-css": "^2.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-deploy": "^2.0.0",
"ember-cli-deploy-build": "^3.0.0",
"ember-cli-deploy-git": "^1.3.4",
Expand All @@ -99,39 +103,42 @@
"ember-fetch": "^8.1.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-qunit": "^6.1.1",
"ember-resolver": "^10.0.0",
"ember-source": "~4.12.1",
"ember-qunit": "^7.0.0",
"ember-resolver": "^10.1.1",
"ember-source": "~5.1.1",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.3.1",
"ember-template-lint": "^5.11.0",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-ember": "^11.4.3",
"eslint-plugin-n": "^15.6.1",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-ember": "^11.9.0",
"eslint-plugin-n": "^16.0.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.4",
"eslint-plugin-qunit": "^8.0.0",
"fs-extra": "^11.0.0",
"loader.js": "^4.7.0",
"mocha": "^10.1.0",
"prettier": "^2.8.3",
"qunit": "^2.19.3",
"prettier": "^2.8.8",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"release-it": "^15.5.0",
"release-it-lerna-changelog": "^5.0.0",
"sass": "^1.55.0",
"sinon": "^15.0.1",
"sinon-chai": "^3.7.0",
"stylelint": "^15.9.0",
"stylelint-config-standard-scss": "^8.0.0",
"stylelint-prettier": "^3.0.0",
"tmp": "^0.2.1",
"webpack": "^5.75.0"
"webpack": "^5.88.1"
},
"peerDependencies": {
"ember-cli": ">= 3.4.0",
"ember-cli-dependency-checker": ">= 3.1.0",
"ember-source": "^3.28.0 || ^4.0.0"
"ember-source": ">= 4.0.0"
},
"engines": {
"node": "14.* || 16.* || >= 18"
"node": "16.* || >= 18"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
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.10.0",
"version": "5.1.0",
"blueprints": [
{
"name": "addon",
Expand Down
26 changes: 4 additions & 22 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-3.28',
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~3.28.0',
'ember-source': '~4.4.0',
},
},
},
{
name: 'ember-lts-4.4',
name: 'ember-lts-4.8',
npm: {
devDependencies: {
'ember-source': '~4.4.0',
'ember-source': '~4.8.0',
},
},
},
Expand Down Expand Up @@ -47,24 +47,6 @@ module.exports = async function () {
},
},
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false,
}),
},
npm: {
devDependencies: {
'ember-source': '~3.28.0',
},
ember: {
edition: 'classic',
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
Expand Down
Loading

0 comments on commit 4ec9201

Please sign in to comment.