Skip to content

Commit

Permalink
fix: v3.28.3...v4.1.0
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Drop Ember < 3.24
  • Loading branch information
knownasilya committed Jan 13, 2022
1 parent 333f9d8 commit 7031937
Show file tree
Hide file tree
Showing 12 changed files with 1,421 additions and 648 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@
# 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 .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module.exports = {
extends: ['plugin:node/recommended'],
},
{
// Test files:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ name: CI

on: [push, pull_request]

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

jobs:
lint:
name: Lint
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try

# IDE project files
/.idea/
/*.iml
/.vscode/
/.history/
/package-lock.json.ember-try
/yarn.lock.ember-try
4 changes: 4 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
/.prettierignore
/.prettierrc.js
Expand All @@ -32,4 +33,7 @@
# 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
24 changes: 9 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Here's the official [demo] using this component.

## Compatibility

- Ember.js v3.20 or above
- Ember CLI v3.20 or above
- Ember.js v3.24 or above
- Ember CLI v3.24 or above
- Node.js v12 or above

## Install
Expand All @@ -22,10 +22,7 @@ Here's the official [demo] using this component.
## Basic Usage

```hbs
<XToggle
@value={{this.myValue}}
@onToggle={{fn (mut this.myValue)}}
/>
<XToggle @value={{this.myValue}} @onToggle={{fn (mut this.myValue)}} />
```

### Themes
Expand Down Expand Up @@ -148,10 +145,11 @@ The `x-toggle` component also provides a composable component API.
@showLabels={{true}}
@value={{this.value}}
@onToggle={{fn (mut this.value)}}
as |toggle|>
<toggle.offLabel/>
<toggle.switch/>
<toggle.onLabel/>
as |toggle|
>
<toggle.offLabel />
<toggle.switch />
<toggle.onLabel />
</XToggle>
```

Expand All @@ -173,11 +171,7 @@ This format allows greater flexibility with labels, like the single label use-ca
<b>turn {{if this.value 'off' 'on'}}</b>
</toggle.label>
<toggle.switch
@theme='flip'
@onLabel='diff on'
@offLabel='diff off'
/>
<toggle.switch @theme='flip' @onLabel='diff on' @offLabel='diff off' />
</XToggle>
```

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.20',
name: 'ember-lts-3.24',
npm: {
devDependencies: {
'ember-source': '~3.20.5',
'ember-source': '~3.24.3',
},
},
},
{
name: 'ember-lts-3.24',
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'ember-source': '~3.24.3',
'ember-source': '~3.28.0',
},
},
},
Expand Down
33 changes: 16 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@
},
"dependencies": {
"@ember/render-modifiers": "^2.0.0",
"ember-cli-babel": "^7.26.6",
"ember-cli-htmlbars": "^6.0.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1",
"ember-gesture-modifiers": "^1.1.1"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.4.2",
"@embroider/test-setup": "^0.47.0",
"@ember/test-helpers": "^2.6.0",
"@embroider/test-setup": "^0.49.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^2.2.3",
"ember-cli": "~3.28.3",
"ember-auto-import": "^2.2.4",
"ember-cli": "~4.1.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-github-pages": "^0.2.0",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -55,28 +55,27 @@
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-page-title": "^6.2.2",
"ember-qunit": "^5.1.4",
"ember-page-title": "^7.0.0",
"ember-qunit": "^5.1.5",
"ember-resolver": "^8.0.3",
"ember-source": "~3.28.0",
"ember-source": "~4.1.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^3.6.0",
"ember-try": "^1.4.0",
"ember-template-lint": "^4.0.0",
"ember-try": "^2.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.4",
"eslint-plugin-ember": "^10.5.8",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.0.0",
"eslint-plugin-qunit": "^7.2.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.2",
"qunit": "^2.16.0",
"prettier": "^2.5.1",
"qunit": "^2.17.2",
"qunit-dom": "^2.0.0",
"standard-version": "^9.3.2",
"stylelint-config-standard": "^22.0.0",
"webpack": "^5.59.0"
"webpack": "^5.66.0"
},
"engines": {
"node": "12.* || 14.* || >= 16"
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": "3.28.3",
"version": "4.1.0",
"blueprints": [
{
"name": "addon",
Expand Down
15 changes: 0 additions & 15 deletions tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,6 @@ const browsers = [
'last 1 Safari versions',
];

// Ember's browser support policy is changing, and IE11 support will end in
// v4.0 onwards.
//
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
//
// If you need IE11 support on a version of Ember that still offers support
// for it, uncomment the code block below.
//
// const isCI = Boolean(process.env.CI);
// const isProduction = process.env.EMBER_ENV === 'production';
//
// if (isCI || isProduction) {
// browsers.push('ie 11');
// }

module.exports = {
browsers,
};
Loading

0 comments on commit 7031937

Please sign in to comment.