Skip to content

Commit

Permalink
Require node >= 14, bump deps (#1270)
Browse files Browse the repository at this point in the history
* Require node >= 14, bump deps

* Fix lint
  • Loading branch information
RobbieTheWagner committed Aug 2, 2022
1 parent 6766bd7 commit b6e8cd0
Show file tree
Hide file tree
Showing 8 changed files with 1,600 additions and 1,718 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ jobs:
test:
name: "Tests"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.x
cache: yarn
Expand All @@ -33,10 +34,11 @@ jobs:
floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16.x
cache: yarn
Expand All @@ -49,6 +51,7 @@ jobs:
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
needs: "test"
timeout-minutes: 10

strategy:
fail-fast: false
Expand All @@ -64,9 +67,9 @@ jobs:
- embroider-optimized

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.x
cache: yarn
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/package-lock.json.ember-try
/yarn.lock.ember-try

.idea/

# broccoli-debug
/DEBUG/

.idea/
17 changes: 6 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ember-flatpickr
==============================================================================
# ember-flatpickr

<a href="https://shipshape.io/"><img src="http://i.imgur.com/DWHQjA5.png" alt="Ship Shape" width="100" height="100"/></a>

Expand All @@ -14,15 +13,13 @@ ember-flatpickr

This is an Ember addon that wraps the date picker [flatpickr](http://chmln.github.io/flatpickr/).

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

* Ember.js v3.24 or above
* Ember CLI v3.24 or above
* Node.js v12 or above
* Node.js v14 or above

Installation
------------------------------------------------------------------------------
## Installation

```
ember install ember-flatpickr
Expand All @@ -32,13 +29,11 @@ ember install ember-flatpickr

[View Docs](https://shipshapecode.github.io/ember-flatpickr/)

Contributing
------------------------------------------------------------------------------
## Contributing

See the [Contributing](CONTRIBUTING.md) guide for details.


License
------------------------------------------------------------------------------
## License

This project is licensed under the [MIT License](LICENSE.md).
2 changes: 1 addition & 1 deletion addon-test-support/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export function closeFlatpickrDate(selector) {
export function clearFlatpickrDate(selector) {
const flatpickrInput = find(selector);
if (!flatpickrInput) _throwSelectorError(selector, 'clearFlatpickrDate');
flatpickrInput._flatpickr.clear();
flatpickrInput._flatpickr.clear(); // eslint-disable-line
}

// Registers helpers for acceptance tests
Expand Down
37 changes: 18 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
},
"dependencies": {
"@ember/render-modifiers": "^2.0.3",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-funnel": "^3.0.3",
"broccoli-merge-trees": "^4.2.0",
"broccoli-stew": "^3.0.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-htmlbars": "^6.1.0",
"ember-cli-typescript": "^5.0.0",
"flatpickr": "^4.6.9"
},
Expand All @@ -53,8 +53,8 @@
"@babel/plugin-proposal-decorators": "^7.18.2",
"@babel/preset-env": "^7.18.2",
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "^1.7.1",
"@ember/test-helpers": "^2.8.1",
"@embroider/test-setup": "^1.8.3",
"@types/ember-qunit": "^5.0.0",
"@types/ember-resolver": "^5.0.11",
"@types/ember__application": "^4.0.0",
Expand All @@ -80,12 +80,12 @@
"@typescript-eslint/parser": "^5.11.0",
"broccoli-asset-rev": "^3.0.0",
"codeclimate-test-reporter": "^0.5.1",
"ember-auto-import": "^2.4.1",
"ember-cli": "~4.3.0",
"ember-auto-import": "^2.4.2",
"ember-cli": "~4.6.0",
"ember-cli-addon-docs": "^5.0.0",
"ember-cli-addon-docs-yuidoc": "^1.0.0",
"ember-cli-code-coverage": "^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",
Expand All @@ -96,39 +96,38 @@
"ember-cli-typescript-blueprints": "^3.0.0",
"ember-data": "^4.1.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^8.0.2",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^7.0.0",
"ember-power-select": "^5.0.3",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "^4.3.0",
"ember-source": "^4.6.0",
"ember-source-channel-url": "^3.0.0",
"ember-svg-jar": "^2.3.4",
"ember-template-lint": "^4.3.0",
"ember-template-lint": "^4.10.1",
"ember-try": "^2.0.0",
"eslint": "^8.16.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^10.5.9",
"eslint-plugin-ember": "^11.0.2",
"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",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.6.1",
"qunit": "^2.18.0",
"prettier": "^2.7.1",
"qunit": "^2.19.1",
"qunit-dom": "^2.0.0",
"release-it": "^15.1.3",
"release-it-lerna-changelog": "^5.0.0",
"typescript": "^4.5.5",
"webpack": "^5.70.0"
"webpack": "^5.74.0"
},
"resolutions": {
"colors": "1.4.0"
},
"engines": {
"node": "12.* || 14.* || >= 16"
"node": "14.* || >= 16"
},
"publishConfig": {
"registry": "https://registry.npmjs.org"
Expand Down Expand Up @@ -157,6 +156,6 @@
},
"volta": {
"node": "16.15.1",
"yarn": "1.22.17"
"yarn": "1.22.19"
}
}
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.6.0",
"blueprints": [
{
"name": "addon",
Expand Down
4 changes: 0 additions & 4 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ module.exports = function (environment) {
FEATURES: {
// 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
}
},

Expand Down
Loading

0 comments on commit b6e8cd0

Please sign in to comment.