Skip to content

Commit

Permalink
⬆️ v3.14.0...v3.15.2
Browse files Browse the repository at this point in the history
  • Loading branch information
nadnoslen committed Apr 12, 2022
1 parent a6d2e72 commit fade003
Show file tree
Hide file tree
Showing 20 changed files with 356 additions and 276 deletions.
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# misc
/.bowerrc
/.editorconfig
/.ember-cli.js
/.ember-cli
/.env*
/.eslintignore
/.eslintrc.js
Expand Down
2 changes: 1 addition & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use strict";

module.exports = {
extends: "recommended",
extends: "octane",
rules: {
"self-closing-void-elements": false,
},
Expand Down
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,36 +32,36 @@ jobs:

include:
# runs linting and tests with current locked deps

- stage: "Tests"
name: "Tests"
install:
- yarn install --non-interactive
script:
- yarn lint:hbs
- yarn lint:js
- yarn test

- name: "Floating Dependencies"
- stage: "Additional Tests"
name: "Floating Dependencies"
install:
- yarn install --no-lockfile --non-interactive
script:
- yarn test

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- stage: "Additional Tests"
env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
- env: EMBER_TRY_SCENARIO=ember-classic

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH

install:
- yarn install --no-lockfile --non-interactive
- yarn install --non-interactive

script:
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

Ember.TextSupport enhancements including a `{{input-text}}` and `{{text-area}}` component.

## Compatibility

- Ember.js v3.4 or above
- Ember CLI v2.13 or above
- Node.js v8 or above
Expand Down
23 changes: 19 additions & 4 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ module.exports = async function () {
useYarn: true,
scenarios: [
{
name: "ember-lts-3.4",
name: "ember-lts-3.8",
npm: {
devDependencies: {
"ember-source": "~3.4.0",
"ember-source": "~3.8.0",
},
},
},
{
name: "ember-lts-3.8",
name: "ember-lts-3.12",
npm: {
devDependencies: {
"ember-source": "~3.8.0",
"ember-source": "~3.12.0",
},
},
},
Expand Down Expand Up @@ -69,6 +69,21 @@ 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: {
ember: {
edition: "classic",
},
},
},
],
};
};
22 changes: 13 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"test:all": "ember try:each"
},
"dependencies": {
"ember-cli-babel": "^7.11.1",
"ember-cli-babel": "^7.13.0",
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-node-assets": "^0.2.2"
},
Expand All @@ -50,16 +50,17 @@
"@fortawesome/ember-fontawesome": "^0.1.8",
"@fortawesome/free-brands-svg-icons": "^5.5.0",
"@fortawesome/free-solid-svg-icons": "^5.5.0",
"@glimmer/component": "^1.0.0",
"babel-eslint": "^10.0.3",
"bootstrap": "^4.1.0",
"broccoli-asset-rev": "^3.0.0",
"clipboard": "^2.0.2",
"ct-emberjs-bling": "^0.0.1-rc.5",
"ember-auto-import": "^1.5.2",
"ember-cli": "~3.14.0",
"ember-auto-import": "^1.5.3",
"ember-cli": "~3.15.2",
"ember-cli-app-version": "^5.0.0",
"ember-cli-bootstrap-4": "^0.13.0",
"ember-cli-dependency-checker": "^3.1.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-deploy": "^1.0.2",
"ember-cli-deploy-build": "^2.0.0",
"ember-cli-deploy-gzip": "^2.0.1",
Expand All @@ -74,16 +75,16 @@
"ember-cli-uglify": "^3.0.0",
"ember-cli-update": "^1.0.1",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.1.0",
"ember-export-application-global": "^2.0.1",
"ember-load-initializers": "^2.1.1",
"ember-maybe-import-regenerator": "^1.0.0",
"ember-qunit": "^4.5.1",
"ember-qunit": "^4.6.0",
"ember-resolver": "^8.0.3",
"ember-route-action-helper": "^2.0.6",
"ember-source": "~3.14.1",
"ember-source": "~3.15.0",
"ember-source-channel-url": "^3.0.0",
"ember-try": "^2.0.0",
"eslint-plugin-ember": "^7.1.0",
"eslint-plugin-ember": "^7.7.1",
"eslint-plugin-node": "^11.1.0",
"keyevent": "^1.1.0",
"loader.js": "^4.7.0",
Expand All @@ -94,6 +95,9 @@
"engines": {
"node": "8.* || >= 10.*"
},
"ember": {
"edition": "octane"
},
"ember-addon": {
"configPath": "tests/dummy/config",
"demoURL": "http://ember-cli-text-support-mixins.cybertooth.io/"
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/app.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Application from '@ember/application';
import Resolver from './resolver';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import InputTextEnterSubmits from './input-text-enter-submits';
import InputTextEnterSubmits from "./input-text-enter-submits";

export default InputTextEnterSubmits.extend({});
export default class InputTextCtrlEnterSubmitsController extends InputTextEnterSubmits {}
19 changes: 6 additions & 13 deletions tests/dummy/app/controllers/demo/input-text-enter-submits.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
import Controller from '@ember/controller';
import Controller from "@ember/controller";

export default Controller.extend({
actions: {
withSubmit(/*event*/) {
window.alert('<form {{action "submitWithOn" on="submit"}}>');
return false;
},

withOnSubmit(/*event*/) {
window.alert('<form onsubmit={{action "submitWithOn"}}>');
return false;
}
export default class InputTextEnterSubmitsController extends Controller {
withSubmit(/*event*/) {
window.alert('<form {{on "submit" this.withSubmit}}>');
return false;
}
});
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import InputTextEnterSubmits from './input-text-enter-submits';
import InputTextEnterSubmits from "./input-text-enter-submits";

export default InputTextEnterSubmits.extend({});
export default class TextAreaCtrlEnterSubmitsController extends InputTextEnterSubmits {}
3 changes: 0 additions & 3 deletions tests/dummy/app/resolver.js

This file was deleted.

11 changes: 9 additions & 2 deletions tests/dummy/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<section class="my-2">
<div class="container">
<CtNavbar @appLabel="Text Support Mixins" @appName={{model.appName}} @class="bg-dark navbar-expand-md navbar-dark shadow rounded">
<CtNavbar
@appLabel="Text Support Mixins"
@appName={{@model.appName}}
@class="bg-dark navbar-expand-md navbar-dark shadow rounded"
>
<li class="nav-item">
<LinkTo @route="demo.index" class="nav-link">
{{fa-icon "tv" size="2x"}}
Expand All @@ -13,7 +17,10 @@
<section class="my-3">
<div class="container">
<BadgeFuryIo @appName={{read-config "APP.name"}} />
<BadgeInstallCommand @appName={{read-config "APP.name"}} @version={{app-version versionOnly=true}} />
<BadgeInstallCommand
@appName={{read-config "APP.name"}}
@version={{app-version versionOnly=true}}
/>
</div>
</section>

Expand Down
Empty file.
Loading

0 comments on commit fade003

Please sign in to comment.