Skip to content

Commit a7df161

Browse files
Drop support for node < 16, ember-cli-update to 4.12 (#166)
* ember-cli-update to 4.12 * Downgrade release-it lerna changelog * Update ember-data * Drop support for node < 16 * Update @embroider/test-setup
1 parent b4bf87c commit a7df161

18 files changed

+1123
-595
lines changed

.ember-cli

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"disableAnalytics": false,
99

1010
/**
11-
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12-
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
1313
*/
1414
"isTypeScriptProject": false
1515
}

.eslintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ module.exports = {
3636
files: [
3737
'./.eslintrc.js',
3838
'./.prettierrc.js',
39+
'./.stylelintrc.js',
3940
'./.template-lintrc.js',
4041
'./ember-cli-build.js',
4142
'./index.js',
@@ -51,8 +52,7 @@ module.exports = {
5152
browser: false,
5253
node: true,
5354
},
54-
plugins: ['node'],
55-
extends: ['plugin:node/recommended'],
55+
extends: ['plugin:n/recommended'],
5656
},
5757
{
5858
// test files

.github/workflows/ci.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install Node
2323
uses: actions/setup-node@v3
2424
with:
25-
node-version: 14.x
25+
node-version: 16.x
2626
cache: yarn
2727
- name: Install Dependencies
2828
run: yarn install --frozen-lockfile
@@ -40,7 +40,7 @@ jobs:
4040
- uses: actions/checkout@v3
4141
- uses: actions/setup-node@v3
4242
with:
43-
node-version: 14.x
43+
node-version: 16.x
4444
cache: yarn
4545
- name: Install Dependencies
4646
run: yarn install --no-lockfile
@@ -57,12 +57,11 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
try-scenario:
60-
- ember-lts-3.28
6160
- ember-lts-4.4
61+
- ember-lts-4.8
6262
- ember-release
6363
- ember-beta
6464
- ember-canary
65-
- ember-classic
6665
- embroider-safe
6766
- embroider-optimized
6867

@@ -71,7 +70,7 @@ jobs:
7170
- name: Install Node
7271
uses: actions/setup-node@v3
7372
with:
74-
node-version: 14.x
73+
node-version: 16.x
7574
cache: yarn
7675
- name: Install Dependencies
7776
run: yarn install --frozen-lockfile

.npmignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
/.gitignore
1919
/.prettierignore
2020
/.prettierrc.js
21+
/.stylelintignore
22+
/.stylelintrc.js
2123
/.template-lintrc.js
2224
/.travis.yml
2325
/.watchmanconfig
2426
/bower.json
25-
/config/ember-try.js
2627
/CONTRIBUTING.md
2728
/ember-cli-build.js
2829
/testem.js

.prettierrc.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
'use strict';
22

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

.stylelintignore

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

.stylelintrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

README.md

+24-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,31 @@
1-
# Ember Inputmask (New Maintainer Needed)
2-
3-
Use https://github.com/sinankeskin/ember-inputmask for a maintained, up-to-date version of this addon
1+
# Ember Inputmask
42

53
[![Build Status](https://travis-ci.org/brandynbennett/ember-inputmask.svg)](https://travis-ci.org/brandynbennett/ember-inputmask)
64
[![Ember Observer Score](https://emberobserver.com/badges/ember-inputmask.svg)](https://emberobserver.com/addons/ember-inputmask)
75

86
Ember wrapper around
97
[Inputmask](https://github.com/RobinHerbots/Inputmask).
108

11-
[View the docs here](https://brandynbennett.github.io/ember-inputmask/)
9+
## Compatibility
10+
11+
- Ember.js v4.4 or above
12+
- Ember CLI v4.4 or above
13+
- Node.js v14 or above
14+
15+
## Installation
16+
17+
```
18+
ember install ember-inputmask
19+
```
20+
21+
## Usage
22+
23+
[View the docs here](https://adopted-ember-addons.github.io/ember-inputmask/)
24+
25+
## Contributing
26+
27+
See the [Contributing](CONTRIBUTING.md) guide for details.
28+
29+
## License
30+
31+
This project is licensed under the [MIT License](LICENSE.md).

config/environment.js

-5
This file was deleted.

package.json

+29-21
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,39 @@
2323
},
2424
"scripts": {
2525
"build": "ember build --environment=production",
26-
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
27-
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
26+
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
27+
"lint:css": "stylelint \"**/*.css\"",
28+
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
29+
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
2830
"lint:hbs": "ember-template-lint .",
2931
"lint:hbs:fix": "ember-template-lint . --fix",
3032
"lint:js": "eslint . --cache",
3133
"lint:js:fix": "eslint . --fix",
3234
"start": "ember serve",
33-
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
35+
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
3436
"test:ember": "ember test",
3537
"test:ember-compatibility": "ember try:each"
3638
},
3739
"dependencies": {
3840
"ember-auto-import": "^2.7.2",
3941
"ember-cli-babel": "^7.26.11",
40-
"ember-cli-htmlbars": "^6.1.1",
42+
"ember-cli-htmlbars": "^6.2.0",
4143
"inputmask": "^5.0.8"
4244
},
4345
"devDependencies": {
4446
"@babel/core": "^7.23.7",
4547
"@babel/eslint-parser": "^7.23.3",
4648
"@babel/plugin-proposal-decorators": "^7.23.7",
4749
"@ember/optional-features": "^2.0.0",
48-
"@ember/test-helpers": "^2.8.1",
49-
"@embroider/test-setup": "^1.8.3",
50+
"@ember/string": "^3.0.1",
51+
"@ember/test-helpers": "^2.9.3",
52+
"@embroider/test-setup": "^3.0.3",
5053
"@glimmer/component": "^1.1.2",
5154
"@glimmer/tracking": "^1.1.2",
52-
"@release-it-plugins/lerna-changelog": "^6.0.0",
55+
"@release-it-plugins/lerna-changelog": "^5.0.0",
5356
"broccoli-asset-rev": "^3.0.0",
54-
"ember-cli": "~4.8.1",
57+
"concurrently": "^8.0.1",
58+
"ember-cli": "~4.12.1",
5559
"ember-cli-addon-docs": "^5.0.0",
5660
"ember-cli-addon-docs-yuidoc": "^1.0.0",
5761
"ember-cli-dependency-checker": "^3.3.1",
@@ -62,34 +66,38 @@
6266
"ember-cli-inject-live-reload": "^2.1.0",
6367
"ember-cli-sri": "^2.1.1",
6468
"ember-cli-terser": "^4.0.2",
65-
"ember-data": "^3.28.13",
66-
"ember-disable-prototype-extensions": "^1.1.3",
69+
"ember-data": "~4.12.5",
6770
"ember-fetch": "^8.0.2",
6871
"ember-load-initializers": "^2.1.2",
6972
"ember-page-title": "^7.0.0",
70-
"ember-qunit": "^6.0.0",
71-
"ember-resolver": "^8.0.3",
73+
"ember-qunit": "^6.2.0",
74+
"ember-resolver": "^10.0.0",
7275
"ember-set-helper": "^2.0.1",
73-
"ember-source": "~4.8.0",
76+
"ember-source": "~4.12.0",
7477
"ember-source-channel-url": "^3.0.0",
75-
"ember-template-lint": "^4.16.1",
78+
"ember-template-lint": "^5.7.2",
7679
"ember-try": "^2.0.0",
7780
"eslint": "^8.56.0",
7881
"eslint-config-prettier": "^9.1.0",
79-
"eslint-plugin-ember": "^11.1.0",
80-
"eslint-plugin-node": "^11.1.0",
82+
"eslint-plugin-ember": "^11.5.0",
83+
"eslint-plugin-n": "^15.7.0",
8184
"eslint-plugin-prettier": "^5.1.2",
82-
"eslint-plugin-qunit": "^7.3.1",
85+
"eslint-plugin-qunit": "^7.3.4",
8386
"loader.js": "^4.7.0",
84-
"npm-run-all": "^4.1.5",
8587
"prettier": "^3.1.1",
86-
"qunit": "^2.19.2",
88+
"qunit": "^2.19.4",
8789
"qunit-dom": "^2.0.0",
88-
"release-it": "^16.3.0",
90+
"release-it": "^15.11.0",
91+
"stylelint": "^15.4.0",
92+
"stylelint-config-standard": "^32.0.0",
93+
"stylelint-prettier": "^4.0.0",
8994
"webpack": "^5.89.0"
9095
},
96+
"peerDependencies": {
97+
"ember-source": "^4.0.0 || ^5.0.0"
98+
},
9199
"engines": {
92-
"node": "14.* || 16.* || >= 18"
100+
"node": "16.* || >= 18"
93101
},
94102
"publishConfig": {
95103
"registry": "https://registry.npmjs.org"

tests/dummy/app/styles/app.css

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/* Ember supports plain CSS out of the box. More info: https://cli.emberjs.com/release/advanced-use/stylesheets/ */
File renamed without changes.
File renamed without changes.

tests/dummy/config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.8.1",
6+
"version": "4.12.1",
77
"blueprints": [
88
{
99
"name": "addon",

config/ember-try.js tests/dummy/config/ember-try.js

+4-22
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ module.exports = async function () {
88
useYarn: true,
99
scenarios: [
1010
{
11-
name: 'ember-lts-3.28',
11+
name: 'ember-lts-4.4',
1212
npm: {
1313
devDependencies: {
14-
'ember-source': '~3.28.0',
14+
'ember-source': '~4.4.0',
1515
},
1616
},
1717
},
1818
{
19-
name: 'ember-lts-4.4',
19+
name: 'ember-lts-4.8',
2020
npm: {
2121
devDependencies: {
22-
'ember-source': '~4.4.0',
22+
'ember-source': '~4.8.0',
2323
},
2424
},
2525
},
@@ -47,24 +47,6 @@ module.exports = async function () {
4747
},
4848
},
4949
},
50-
{
51-
name: 'ember-classic',
52-
env: {
53-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
54-
'application-template-wrapper': true,
55-
'default-async-observers': false,
56-
'template-only-glimmer-components': false,
57-
}),
58-
},
59-
npm: {
60-
devDependencies: {
61-
'ember-source': '~3.28.0',
62-
},
63-
ember: {
64-
edition: 'classic',
65-
},
66-
},
67-
},
6850
embroiderSafe(),
6951
embroiderOptimized(),
7052
],

tests/dummy/config/environment.js

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module.exports = function (environment) {
77
rootURL: '/',
88
locationType: 'history',
99
EmberENV: {
10+
EXTEND_PROTOTYPES: false,
1011
FEATURES: {
1112
// Here you can enable experimental features on an ember canary build
1213
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true

vendor/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)