Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ember-cli-update to 4.9, bump ember-basic-dropdown to v6, other required updates #273

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .ember-cli
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,11 @@

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": false
"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.
*/
"isTypeScriptProject": false
}
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@
# 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
25 changes: 14 additions & 11 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,15 @@ module.exports = {
// node files
{
files: [
'.eslintrc.js',
'.prettierrc.js',
'.template-lintrc.js',
'.eslintrc.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js',
'lib/*/index.js',
'index.js',
'./.eslintrc.js',
'./.prettierrc.js',
'./.template-lintrc.js',
'./ember-cli-build.js',
'./index.js',
'./testem.js',
'./blueprints/*/index.js',
'./config/**/*.js',
'./tests/dummy/config/**/*.js',
],
excludedFiles: [
'addon/**',
Expand All @@ -52,5 +50,10 @@ module.exports = {
plugins: ['node'],
extends: ['plugin:node/recommended'],
},
{
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
],
};
5 changes: 2 additions & 3 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ jobs:
# Keep this in sync with config/ember-try.js
ember:
[
ember-lts-3.16,
ember-lts-3.20,
ember-lts-3.28,
ember-lts-4.4,
ember-release,
ember-default-with-jquery,
ember-classic,
]

Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,17 @@ name: ci
on:
push:
branches:
- main
- master
pull_request: {}

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

jobs:
test:
name: "Tests"
runs-on: ubuntu-latest
timeout-minutes: 5

Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,10 @@
# 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

# broccoli-debug
/DEBUG/
6 changes: 5 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
/.prettierignore
/.prettierrc.js
/.template-lintrc.js
/.travis.yml
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
/yarn-error.log
/yarn.lock
.gitkeep
/.idea
Expand All @@ -42,4 +43,7 @@ CHANGELOG.md
# 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
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
/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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
* `ember serve`
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).

For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
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 @@ -7,9 +7,9 @@ An Ember add-on which provides pure Ember-based date picker components.

## Compatibility

* Ember.js v3.16 or above
* Ember CLI v2.13 or above
* Node.js v10 or above
* Ember.js v3.28 or above
* Ember CLI v3.28 or above
* Node.js v14 or above

## Installation

Expand Down
3 changes: 1 addition & 2 deletions addon-test-support/helpers/date-picker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { click, find } from '@ember/test-helpers';
import moment from 'moment';
import { assert } from '@ember/debug';
import { deprecate } from '@ember/application/deprecations';
import { assert, deprecate } from '@ember/debug';
import { selectTime } from './time-picker';

export function getDatePicker(element) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "3.26.1",
"version": "4.9.2",
"blueprints": [
{
"name": "addon",
Expand Down
28 changes: 7 additions & 21 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,18 @@ module.exports = async function () {
useYarn: true,
scenarios: [
{
name: 'ember-lts-3.16',
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'ember-source': '~3.16.0',
'ember-source': '~3.28.0',
},
},
},
{
name: 'ember-lts-3.20',
name: 'ember-lts-4.4',
npm: {
devDependencies: {
'ember-source': '~3.20.5',
},
resolutions: {
'ember-basic-dropdown/@embroider/macros': '^0.40.0',
'ember-bootstrap/@embroider/macros': '^0.40.0',
'ember-source': '~4.4.0',
},
},
},
Expand Down Expand Up @@ -51,19 +47,6 @@ module.exports = async function () {
},
},
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true,
}),
},
npm: {
devDependencies: {
'@ember/jquery': '^1.1.0',
},
},
},
{
name: 'ember-classic',
env: {
Expand All @@ -74,6 +57,9 @@ module.exports = async function () {
}),
},
npm: {
devDependencies: {
'ember-source': '~3.28.0',
},
ember: {
edition: 'classic',
},
Expand Down
5 changes: 0 additions & 5 deletions config/environment.js

This file was deleted.

10 changes: 8 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
let app = new EmberAddon(defaults, {
const app = new EmberAddon(defaults, {
sassOptions: {},
'ember-bootstrap': {
importBootstrapTheme: true,
Expand Down Expand Up @@ -35,5 +35,11 @@ module.exports = function (defaults) {
*/

const { maybeEmbroider } = require('@embroider/test-setup');
return maybeEmbroider(app);
return maybeEmbroider(app, {
skipBabel: [
{
package: 'qunit',
},
],
});
};
90 changes: 48 additions & 42 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,76 +4,82 @@
"description": "An Ember add-on which provides pure Ember-based date picker components.",
"scripts": {
"build": "ember build --environment=production",
"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": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:hbs": "ember-template-lint ./addon ./app",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"run-prettier": "prettier --write \"**/*.{js,scss}\"",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"test": "npm-run-all lint test:*",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test",
"test:ember-compatibility": "ember try:each",
"test:one": "ember try:one"
},
"peerDependencies": {
"ember-moment": ">=9.0.0",
"ember-source": "^3.28.0 || ^4.0.0"
},
"engines": {
"node": "10.* || >= 12"
"node": "14.* || 16.* || >= 18"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/eslint-parser": "^7.19.1",
"@babel/helper-get-function-arity": "^7.16.7",
"@ember/optional-features": "~2.0.0",
"@ember/test-helpers": "^2.2.5",
"@embroider/test-setup": "^0.40.0",
"babel-eslint": "~10.1.0",
"@ember/test-helpers": "^2.8.1",
"@embroider/test-setup": "^2.0.2",
"bootstrap": "^4.3.1",
"broccoli-asset-rev": "~3.0.0",
"ember-auto-import": "~1.11.3",
"ember-bootstrap": "~4.6.3",
"ember-cli": "~3.26.1",
"concurrently": "^7.6.0",
"ember-auto-import": "~2.5.0",
"ember-bootstrap": "~5.1.1",
"ember-cli": "~4.9.2",
"ember-cli-app-version": "~5.0.0",
"ember-cli-dependency-checker": "~3.2.0",
"ember-cli-dependency-checker": "~3.3.1",
"ember-cli-github-pages": "~0.2.0",
"ember-cli-inject-live-reload": "~2.0.2",
"ember-cli-moment-shim": "~3.8.0",
"ember-cli-inject-live-reload": "~2.1.0",
"ember-cli-release-tag": "~0.1.5",
"ember-cli-sass": "~10.0.1",
"ember-cli-terser": "^4.0.1",
"ember-disable-prototype-extensions": "~1.1.3",
"ember-export-application-global": "~2.0.1",
"ember-cli-terser": "^4.0.2",
"ember-focus-trap": "^1.0.1",
"ember-load-initializers": "~2.1.2",
"ember-maybe-import-regenerator": "~0.1.6",
"ember-moment": "~8.0.0",
"ember-page-title": "^6.2.1",
"ember-prism": "~0.7.0",
"ember-qunit": "~5.1.4",
"ember-resolver": "~8.0.2",
"ember-source": "~3.26.1",
"ember-moment": "~10.0.0",
"ember-page-title": "^7.0.0",
"ember-prism": "~0.13.0",
"ember-qunit": "~6.0.0",
"ember-resolver": "~8.0.3",
"ember-source": "~4.9.1",
"ember-source-channel-url": "~3.0.0",
"ember-template-lint": "~3.2.0",
"ember-template-lint": "~5.2.0",
"ember-try": "~1.4.0",
"eslint": "~7.25.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-ember": "~10.4.1",
"eslint": "~7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "~11.2.1",
"eslint-plugin-node": "~11.1.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.4",
"loader.js": "~4.7.0",
"npm-run-all": "~4.1.5",
"prettier": "^2.2.1",
"qunit": "^2.14.1",
"qunit-dom": "~1.6.0",
"sass": "~1.32.11"
"moment": "^2.29.4",
"prettier": "^2.8.1",
"qunit": "^2.19.3",
"qunit-dom": "~2.0.0",
"sass": "~1.32.11",
"webpack": "^5.75.0"
},
"dependencies": {
"@ember/render-modifiers": "^1.0.2",
"@glimmer/component": "~1.0.4",
"@glimmer/tracking": "~1.0.4",
"ember-basic-dropdown": "^3.0.6",
"ember-cached-decorator-polyfill": "^0.1.1",
"ember-classic-decorator": "^2.0.0",
"ember-cli-babel": "^7.26.3",
"ember-cli-htmlbars": "^5.7.1",
"@ember/render-modifiers": "^2.0.4",
"@glimmer/component": "~1.1.2",
"@glimmer/tracking": "~1.1.2",
"ember-basic-dropdown": "^6.0.0",
"ember-cached-decorator-polyfill": "^1.0.1",
"ember-classic-decorator": "^3.0.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.1.1",
"ember-decorators": "^6.1.1",
"ember-named-blocks-polyfill": "^0.2.4"
"ember-named-blocks-polyfill": "^0.2.5"
},
"keywords": [
"ember-addon",
Expand Down
Loading