From fade0031f687364b62be29f105541ce8047e667f Mon Sep 17 00:00:00 2001 From: nadnoslen Date: Tue, 12 Apr 2022 16:32:15 -0600 Subject: [PATCH] :arrow_up: v3.14.0...v3.15.2 --- .npmignore | 2 +- .template-lintrc.js | 2 +- .travis.yml | 14 +- README.md | 2 + config/ember-try.js | 23 +- package.json | 22 +- tests/dummy/app/app.js | 2 +- .../demo/input-text-ctrl-enter-submits.js | 4 +- .../demo/input-text-enter-submits.js | 19 +- .../demo/text-area-ctrl-enter-submits.js | 4 +- tests/dummy/app/resolver.js | 3 - tests/dummy/app/templates/application.hbs | 11 +- tests/dummy/app/templates/components/.gitkeep | 0 .../demo/input-text-ctrl-enter-submits.hbs | 111 +++------- .../demo/input-text-enter-submits.hbs | 83 +++---- .../demo/text-area-ctrl-enter-submits.hbs | 97 ++++----- tests/dummy/app/templates/index.hbs | 20 +- tests/dummy/config/ember-cli-update.json | 2 +- tests/dummy/config/optional-features.json | 5 +- yarn.lock | 206 ++++++++++++++---- 20 files changed, 356 insertions(+), 276 deletions(-) delete mode 100644 tests/dummy/app/resolver.js delete mode 100644 tests/dummy/app/templates/components/.gitkeep diff --git a/.npmignore b/.npmignore index 81cd0a6..bd09adf 100644 --- a/.npmignore +++ b/.npmignore @@ -8,7 +8,7 @@ # misc /.bowerrc /.editorconfig -/.ember-cli.js +/.ember-cli /.env* /.eslintignore /.eslintrc.js diff --git a/.template-lintrc.js b/.template-lintrc.js index 3ef8ceb..48bc05b 100644 --- a/.template-lintrc.js +++ b/.template-lintrc.js @@ -1,7 +1,7 @@ "use strict"; module.exports = { - extends: "recommended", + extends: "octane", rules: { "self-closing-void-elements": false, }, diff --git a/.travis.yml b/.travis.yml index ab3e592..1a49c3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/README.md b/README.md index 1c3a468..0099b57 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/config/ember-try.js b/config/ember-try.js index 05a54f3..454a1ce 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -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", }, }, }, @@ -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", + }, + }, + }, ], }; }; diff --git a/package.json b/package.json index d2e5fcf..3b09698 100644 --- a/package.json +++ b/package.json @@ -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" }, @@ -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", @@ -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", @@ -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/" diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js index 8df91db..d8e2088 100644 --- a/tests/dummy/app/app.js +++ b/tests/dummy/app/app.js @@ -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'; diff --git a/tests/dummy/app/controllers/demo/input-text-ctrl-enter-submits.js b/tests/dummy/app/controllers/demo/input-text-ctrl-enter-submits.js index c498fd9..bfca330 100644 --- a/tests/dummy/app/controllers/demo/input-text-ctrl-enter-submits.js +++ b/tests/dummy/app/controllers/demo/input-text-ctrl-enter-submits.js @@ -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 {} diff --git a/tests/dummy/app/controllers/demo/input-text-enter-submits.js b/tests/dummy/app/controllers/demo/input-text-enter-submits.js index 5410b49..b2ca616 100644 --- a/tests/dummy/app/controllers/demo/input-text-enter-submits.js +++ b/tests/dummy/app/controllers/demo/input-text-enter-submits.js @@ -1,15 +1,8 @@ -import Controller from '@ember/controller'; +import Controller from "@ember/controller"; -export default Controller.extend({ - actions: { - withSubmit(/*event*/) { - window.alert('
'); - return false; - }, - - withOnSubmit(/*event*/) { - window.alert(''); - return false; - } +export default class InputTextEnterSubmitsController extends Controller { + withSubmit(/*event*/) { + window.alert(''); + return false; } -}); +} diff --git a/tests/dummy/app/controllers/demo/text-area-ctrl-enter-submits.js b/tests/dummy/app/controllers/demo/text-area-ctrl-enter-submits.js index c498fd9..8078ed7 100644 --- a/tests/dummy/app/controllers/demo/text-area-ctrl-enter-submits.js +++ b/tests/dummy/app/controllers/demo/text-area-ctrl-enter-submits.js @@ -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 {} diff --git a/tests/dummy/app/resolver.js b/tests/dummy/app/resolver.js deleted file mode 100644 index 2fb563d..0000000 --- a/tests/dummy/app/resolver.js +++ /dev/null @@ -1,3 +0,0 @@ -import Resolver from 'ember-resolver'; - -export default Resolver; diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs index 67aa5a8..8400d87 100644 --- a/tests/dummy/app/templates/application.hbs +++ b/tests/dummy/app/templates/application.hbs @@ -1,6 +1,10 @@
- +
  • {{fa-icon "tv" size="2x"}} @@ -13,7 +17,10 @@
    - +
    diff --git a/tests/dummy/app/templates/components/.gitkeep b/tests/dummy/app/templates/components/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/tests/dummy/app/templates/demo/input-text-ctrl-enter-submits.hbs b/tests/dummy/app/templates/demo/input-text-ctrl-enter-submits.hbs index 6e3db3f..65af3df 100644 --- a/tests/dummy/app/templates/demo/input-text-ctrl-enter-submits.hbs +++ b/tests/dummy/app/templates/demo/input-text-ctrl-enter-submits.hbs @@ -1,19 +1,28 @@

    Triggered Via +
    {{fa-icon "angle-left"}}form - \{{action "withSubmit" on="submit"}}{{fa-icon "angle-right"}} + \{{on "submit" this.withSubmit}}{{fa-icon "angle-right"}} ...

    - +
    - + CTRL+ENTER will submit form : @@ -24,7 +33,7 @@
    - +
    - + - +
    - + \{{input-text ctrlEnterSubmitsForm?=false ...}}
    - - -

    - Triggered Via - - {{fa-icon "angle-left"}}form onsubmit=\{{action "withOnSubmit"}}{{fa-icon - "angle-right" - }} - ... - -

    - -
    -
    - - - - CTRL+ENTER - will submit form : - \{{input-text ctrlEnterSubmitsForm?=true ...}} - -
    -
    - -
    - -
    -
    - - - - CTRL+ENTER - will - NOT - submit form : - \{{input-text ctrlEnterSubmitsForm?=false ...}} - -
    -
    - -
    - -
    -
    - - - - ENTER - & - CTRL+ENTER - will - NOT - submit form : - - \{{input-text ctrlEnterSubmitsForm?=false enterSubmitsForm?=false ...}} - - -
    \ No newline at end of file diff --git a/tests/dummy/app/templates/demo/input-text-enter-submits.hbs b/tests/dummy/app/templates/demo/input-text-enter-submits.hbs index 6bdedec..6c18540 100644 --- a/tests/dummy/app/templates/demo/input-text-enter-submits.hbs +++ b/tests/dummy/app/templates/demo/input-text-enter-submits.hbs @@ -1,68 +1,57 @@

    Triggered Via +
    - {{fa-icon "angle-left"}}form \{{action "withSubmit" on="submit"}}{{fa-icon "angle-right"}}... + {{fa-icon "angle-left"}}form + \{{on "submit" this.withSubmit}}{{fa-icon "angle-right"}}...

    -
    +
    - + - ENTER will submit form : + ENTER + will submit form : \{{input-text ...}}
    -
    +
    -
    +
    - - - ENTER will NOT submit form : + + + ENTER + will + NOT + submit form : \{{input-text enterSubmitsForm?=false ...}}
    - - -

    - Triggered Via - - {{fa-icon "angle-left"}}form onsubmit=\{{action "withOnSubmit"}}{{fa-icon "angle-right"}} ... - -

    - -
    -
    - - - - ENTER will submit form : - \{{input-text ...}} - -
    -
    - -
    - -
    -
    - - - - ENTER will NOT submit form : - \{{input-text enterSubmitsForm?=false ...}} - -
    -
    + \ No newline at end of file diff --git a/tests/dummy/app/templates/demo/text-area-ctrl-enter-submits.hbs b/tests/dummy/app/templates/demo/text-area-ctrl-enter-submits.hbs index f3358c7..2f8d8b2 100644 --- a/tests/dummy/app/templates/demo/text-area-ctrl-enter-submits.hbs +++ b/tests/dummy/app/templates/demo/text-area-ctrl-enter-submits.hbs @@ -1,69 +1,68 @@

    Triggered Via +
    - {{fa-icon "angle-left"}}form \{{action "withSubmit" on="submit"}}{{fa-icon "angle-right"}} ... + {{fa-icon "angle-left"}}form + \{{on "submit" this.withSubmit}}{{fa-icon "angle-right"}} + ...

    -
    +
    -