ember-validated-form 4.1.0 → 5.0.0

package/addon/{templates/components → components}/validated-input.hbs

@@ -56,8 +56,7 @@
       @multiple={{@multiple}}
       @update={{this.update}}
       @setDirty={{this.setDirty}}
-      @labelComponent={{
-        component
+      @labelComponent={{component
         this.labelComponent
         label=@label
         required=@required
@@ -66,11 +65,10 @@
         inputId=this.inputId
       }}
       @hintComponent={{if @hint (component this.hintComponent hint=@hint)}}
-      @errorComponent={{
-        if
+      @errorComponent={{if
         (and this.showValidity this.errors)
         (component this.errorComponent errors=this.errors)
       }}
     />
   {{/let}}
-{{/if}}
+{{/if}}

package/addon/components/validated-input.js

@@ -1,11 +1,9 @@
-import { setComponentTemplate } from "@ember/component";
 import { action, set, get } from "@ember/object";
 import { guidFor } from "@ember/object/internals";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 
 import themedComponent from "../-private/themed-component";
-import template from "../templates/components/validated-input";
 
 /**
  * This component wraps form inputs.
@@ -20,7 +18,7 @@ import template from "../templates/components/validated-input";
  * @class validated-input
  * @export default
  */
-export class ValidatedInput extends Component {
+export default class ValidatedInputComponent extends Component {
   inputId = guidFor(this);
 
   @tracked dirty;
@@ -40,11 +38,6 @@ export class ValidatedInput extends Component {
     this.required = this.args.required ?? false;
     this.type = this.args.type ?? "text";
     this.validateBeforeSubmit = this.args.validateBeforeSubmit ?? true;
-
-    this.renderComponent = this.args.renderComponent ?? this.renderComponent;
-    this.labelComponent = this.args.labelComponent ?? this.labelComponent;
-    this.hintComponent = this.args.hintComponent ?? this.hintComponent;
-    this.errorComponent = this.args.errorComponent ?? this.errorComponent;
   }
 
   get _val() {
@@ -97,5 +90,3 @@ export class ValidatedInput extends Component {
     }
   }
 }
-
-export default setComponentTemplate(template, ValidatedInput);

package/app/components/validated-form.js

@@ -1,7 +1 @@
-import ValidatedForm from "ember-validated-form/components/validated-form";
-
-import config from "../config/environment";
-
-export default ValidatedForm.extend({
-  config: config["ember-validated-form"],
-});
+export { default } from "ember-validated-form/components/validated-form";

package/config/environment.js

@@ -1,5 +1,5 @@
 "use strict";
 
 module.exports = function (/* environment, appConfig */) {
-  return { historySupportMiddleware: true };
+  return {};
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-validated-form",
-  "version": "4.1.0",
+  "version": "5.0.0",
   "description": "Easily create forms with client-side validations",
   "keywords": [
     "ember-addon",
@@ -20,11 +20,14 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
+    "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:hbs": "ember-template-lint .",
-    "lint:js": "eslint .",
+    "lint:hbs:fix": "ember-template-lint . --fix",
+    "lint:js": "eslint . --cache",
+    "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "npm-run-all lint:* test:*",
+    "test": "npm-run-all lint test:*",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
@@ -35,27 +38,29 @@
     ]
   },
   "dependencies": {
-    "ember-auto-import": "^1.11.2",
-    "ember-cli-babel": "^7.26.3",
+    "ember-auto-import": "^2.2.0",
+    "ember-cli-babel": "^7.26.6",
     "ember-cli-htmlbars": "^5.7.1",
     "ember-one-way-select": "^4.0.1",
     "ember-truth-helpers": "^3.0.0"
   },
   "devDependencies": {
-    "@adfinis-sygroup/eslint-config": "1.3.2",
-    "@adfinis-sygroup/semantic-release-config": "3.1.0",
-    "@babel/core": "7.14.8",
+    "@adfinis-sygroup/eslint-config": "1.4.2",
+    "@adfinis-sygroup/semantic-release-config": "3.2.0",
+    "@babel/core": "7.15.8",
     "@ember/optional-features": "2.0.0",
+    "@ember/test-helpers": "2.5.0",
+    "@embroider/test-setup": "0.45.0",
     "@fortawesome/ember-fontawesome": "0.2.3",
-    "@fortawesome/free-solid-svg-icons": "5.15.3",
+    "@fortawesome/free-solid-svg-icons": "5.15.4",
     "@glimmer/component": "1.0.4",
     "@glimmer/tracking": "1.0.4",
     "babel-eslint": "10.1.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-changeset": "3.14.1",
-    "ember-changeset-validations": "3.15.2",
-    "ember-cli": "3.27.0",
-    "ember-cli-addon-docs": "3.0.0",
+    "ember-changeset": "3.15.0",
+    "ember-changeset-validations": "3.16.0",
+    "ember-cli": "3.28.1",
+    "ember-cli-addon-docs": "4.0.3",
     "ember-cli-dependency-checker": "3.2.0",
     "ember-cli-deploy": "1.0.2",
     "ember-cli-deploy-build": "2.0.0",
@@ -67,35 +72,42 @@
     "ember-cli-terser": "4.0.2",
     "ember-cli-test-loader": "3.0.0",
     "ember-concurrency": "2.1.2",
-    "ember-data": "3.27.1",
+    "ember-data": "3.28.3",
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-load-initializers": "2.1.2",
-    "ember-maybe-import-regenerator": "0.1.6",
+    "ember-maybe-import-regenerator": "1.0.0",
     "ember-power-select": "4.1.6",
-    "ember-qunit": "4.6.0",
-    "ember-resolver": "8.0.2",
-    "ember-source": "3.27.5",
+    "ember-qunit": "5.1.5",
+    "ember-resolver": "8.0.3",
+    "ember-source": "3.28.1",
     "ember-source-channel-url": "3.0.0",
-    "ember-template-lint": "2.21.0",
+    "ember-template-lint": "3.9.0",
+    "ember-template-lint-plugin-prettier": "2.0.1",
     "ember-try": "1.4.0",
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-ember": "9.6.0",
-    "eslint-plugin-import": "2.23.4",
+    "eslint-plugin-ember": "10.5.5",
+    "eslint-plugin-import": "2.24.2",
     "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-prettier": "3.4.0",
-    "husky": "7.0.1",
-    "lint-staged": "11.1.1",
+    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-qunit": "6.2.0",
+    "husky": "7.0.2",
+    "lint-staged": "11.2.0",
     "loader.js": "4.7.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.3.2",
-    "qunit-dom": "1.6.0"
+    "prettier": "2.4.1",
+    "qunit": "2.17.2",
+    "qunit-dom": "2.0.0",
+    "webpack": "5.58.0"
   },
   "resolutions": {
     "graceful-fs": ">=4.2.0"
   },
   "engines": {
-    "node": "14.* || >= 16"
+    "node": "12.* || 14.* || >= 16"
+  },
+  "ember": {
+    "edition": "octane"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",

package/.dependabot/config.yml

@@ -1,14 +0,0 @@
-version: 1
-update_configs:
-  - package_manager: "javascript"
-    directory: "/"
-    update_schedule: "live"
-    version_requirement_updates: "increase_versions"
-    automerged_updates:
-      - match:
-          dependency_type: "development"
-          update_type: "semver:minor"
-    commit_message:
-      prefix: "fix"
-      prefix_development: "chore"
-      include_scope: true

package/.prettierignore

@@ -1 +0,0 @@
-package.json

package/addon/templates/components/validated-button/button.hbs

@@ -1 +0,0 @@
-{{#if hasBlock}}{{~yield~}}{{else}}{{~label~}}{{/if}}

package/addon/templates/components/validated-button.hbs

@@ -1,7 +0,0 @@
-{{#with (component buttonComponent onclick=action disabled=disabled label=label type=type class=class) as |button|}}
-  {{#if hasBlock}}
-    {{#component button}}{{yield}}{{/component}}
-  {{else}}
-    {{component button}}
-  {{/if}}
-{{/with}}

package/addon/templates/components/validated-form.hbs

@@ -1,15 +0,0 @@
-{{yield (hash
-  model=model
-  loading=loading
-  input=(component "validated-input"
-    model=model
-    submitted=submitted
-    validateBeforeSubmit=validateBeforeSubmit
-  )
-  submit=(component "validated-button"
-    class=submitClass
-    type="submit"
-    loading=loading
-    label="Save"
-  )
-)}}

package/addon/templates/components/validated-input/-themes/uikit/render.hbs

@@ -1,108 +0,0 @@
-{{#unless (eq type "checkbox")}}
-  {{component labelComponent}}
-{{/unless}}
-
-<div class="uk-form-controls">
-  {{#if (eq type "select")}}
-    {{component selectComponent
-      disabled=disabled
-      name=(or inputName name)
-      optionLabelPath=optionLabelPath
-      optionValuePath=optionValuePath
-      optionTargetPath=optionTargetPath
-      includeBlank=includeBlank
-      multiple=multiple
-      value=value
-      options=options
-      inputId=inputId
-
-      isValid=isValid
-      isInvalid=isInvalid
-
-      update=update
-      setDirty=setDirty
-    }}
-  {{else if (or (eq type "radioGroup") (eq type "radio-group"))}}
-    {{component radioGroupComponent
-      value=value
-      options=options
-      inputId=inputId
-      name=(or inputName name)
-      disabled=disabled
-
-      isValid=isValid
-      isInvalid=isInvalid
-
-      update=update
-      setDirty=setDirty
-    }}
-  {{else if (or (eq type "checkboxGroup") (eq type "checkbox-group"))}}
-    {{component checkboxGroupComponent
-      value=value
-      options=options
-      inputId=inputId
-      name=(or inputName name)
-      disabled=disabled
-
-      isValid=isValid
-      isInvalid=isInvalid
-
-      update=update
-      setDirty=setDirty
-    }}
-  {{else if (eq type "checkbox")}}
-    {{component checkboxComponent
-      value=value
-      options=options
-      inputId=inputId
-      name=(or inputName name)
-      disabled=disabled
-
-      isValid=isValid
-      isInvalid=isInvalid
-
-      update=update
-      setDirty=setDirty
-
-      labelComponent=labelComponent
-    }}
-  {{else if (eq type "textarea")}}
-    {{component textareaComponent
-      inputId=inputId
-      name=(or inputName name)
-      value=value
-      placeholder=placeholder
-      disabled=disabled
-      autofocus=autofocus
-      autocomplete=autocomplete
-      rows=rows
-      cols=cols
-
-      isValid=isValid
-      isInvalid=isInvalid
-
-      update=(action update value="target.value")
-      setDirty=setDirty
-    }}
-  {{else}}
-    {{component inputComponent
-      type=type
-      inputId=inputId
-      name=(or inputName name)
-      value=value
-      placeholder=placeholder
-      disabled=disabled
-      autofocus=autofocus
-      autocomplete=autocomplete
-
-      isValid=isValid
-      isInvalid=isInvalid
-
-      update=(action update value="target.value")
-      setDirty=setDirty
-    }}
-  {{/if}}
-</div>
-
-{{component hintComponent}}
-{{component errorComponent}}

package/addon/templates/components/validated-input/error.hbs

@@ -1 +0,0 @@
-{{yield}}{{#each errors as |e i|}}{{unless (eq i 0) ", "}}{{e}}{{/each}}

package/addon/templates/components/validated-input/hint.hbs

@@ -1 +0,0 @@
-{{yield}}{{hint}}

package/addon/templates/components/validated-input/label.hbs

@@ -1 +0,0 @@
-{{yield}}{{label}}{{if required " *"}}

package/addon/templates/components/validated-input/render.hbs

@@ -1,107 +0,0 @@
-{{#unless (eq type "checkbox")}}
-  {{component labelComponent}}
-{{/unless}}
-
-{{#if (eq type "select")}}
-  {{component selectComponent
-    disabled=disabled
-    name=(or inputName name)
-    promptIsSelectable=promptIsSelectable
-    optionLabelPath=optionLabelPath
-    optionValuePath=optionValuePath
-    optionTargetPath=optionTargetPath
-    includeBlank=includeBlank
-    multiple=multiple
-    value=value
-    options=options
-    inputId=inputId
-
-    isValid=isValid
-    isInvalid=isInvalid
-
-    update=update
-    setDirty=setDirty
-  }}
-{{else if (or (eq type "radioGroup") (eq type "radio-group"))}}
-  {{component radioGroupComponent
-    value=value
-    options=options
-    inputId=inputId
-    name=(or inputName name)
-    disabled=disabled
-
-    isValid=isValid
-    isInvalid=isInvalid
-
-    update=update
-    setDirty=setDirty
-  }}
-{{else if (or (eq type "checkboxGroup") (eq type "checkbox-group"))}}
-  {{component checkboxGroupComponent
-    value=value
-    options=options
-    inputId=inputId
-    name=(or inputName name)
-    disabled=disabled
-
-    isValid=isValid
-    isInvalid=isInvalid
-
-    update=update
-    setDirty=setDirty
-  }}
-{{else if (eq type "checkbox")}}
-  {{component checkboxComponent
-    value=value
-    options=options
-    inputId=inputId
-    name=(or inputName name)
-    disabled=disabled
-
-    isValid=isValid
-    isInvalid=isInvalid
-
-    update=update
-    setDirty=setDirty
-
-    labelComponent=labelComponent
-  }}
-{{else if (eq type "textarea")}}
-  {{component textareaComponent
-    inputId=inputId
-    name=(or inputName name)
-    value=value
-    placeholder=placeholder
-    disabled=disabled
-    autofocus=autofocus
-    autocomplete=autocomplete
-    rows=rows
-    cols=cols
-
-    isValid=isValid
-    isInvalid=isInvalid
-
-    update=(action update value="target.value")
-    setDirty=setDirty
-  }}
-{{else}}
-  {{component inputComponent
-    type=type
-    inputId=inputId
-    name=(or inputName name)
-    value=value
-    placeholder=placeholder
-    disabled=disabled
-    autofocus=autofocus
-    autocomplete=autocomplete
-
-    isValid=isValid
-    isInvalid=isInvalid
-
-    update=(action update value="target.value")
-    setDirty=setDirty
-  }}
-{{/if}}
-
-{{component hintComponent}}
-{{component errorComponent}}

package/addon/templates/components/validated-input/types/-themes/bootstrap/checkbox-group.hbs

@@ -1,14 +0,0 @@
-{{#each options as |option i|}}
-  <div class="custom-control custom-checkbox">
-    <input
-      type     = "checkbox"
-      class    = "custom-control-input {{if isValid "is-valid"}} {{if isInvalid "is-invalid"}}"
-      checked  = {{includes option.key value}}
-      name     = {{name}}
-      id       = "{{inputId}}-{{i}}"
-      disabled = {{disabled}}
-      {{on "input" (fn this.onUpdate option.key)}}
-    >
-    <label class="custom-control-label" for="{{inputId}}-{{i}}">{{option.label}}</label>
-  </div>
-{{/each}}

package/addon/templates/components/validated-input/types/-themes/bootstrap/checkbox.hbs

@@ -1,10 +0,0 @@
-<input
-  class    = "custom-control-input {{if isValid "is-valid"}} {{if isInvalid "is-invalid"}}"
-  type     = "checkbox"
-  name     = {{name}}
-  id       = {{inputId}}
-  disabled = {{disabled}}
-  checked  = {{value}}
-  onclick  = {{action (queue (action update value="target.checked") setDirty)}}
->
-{{component labelComponent class="custom-control-label"}}

package/addon/templates/components/validated-input/types/-themes/bootstrap/radio-group.hbs

@@ -1,15 +0,0 @@
-{{#each options as |option i|}}
-  <div class="custom-control custom-radio">
-    <input
-      type       = "radio"
-      class      = "custom-control-input {{if isValid "is-valid"}} {{if isInvalid "is-invalid"}}"
-      checked    = {{eq value option.key}}
-      value      = {{option.key}}
-      name       = {{name}}
-      id         = "{{inputId}}-{{i}}"
-      onclick    = {{action (queue (action update option.key) setDirty)}}
-      disabled   = {{disabled}}
-    >
-    <label class="custom-control-label" for="{{inputId}}-{{i}}">{{option.label}}</label>
-  </div>
-{{/each}}

package/addon/templates/components/validated-input/types/-themes/bootstrap/select.hbs

@@ -1,16 +0,0 @@
-{{one-way-select
-  value              = value
-  options            = options
-  optionLabelPath    = optionLabelPath
-  optionValuePath    = optionValuePath
-  optionTargetPath   = optionTargetPath
-  name               = name
-  id                 = inputId
-  class              = (concat "form-control" (if isValid " is-valid") (if isInvalid " is-invalid"))
-  update             = update
-  focusOut           = setDirty
-  includeBlank       = includeBlank
-  disabled           = disabled
-  multiple           = multiple
-  promptIsSelectable = (or promptIsSelectable false)
-}}

package/addon/templates/components/validated-input/types/-themes/uikit/checkbox-group.hbs

@@ -1,15 +0,0 @@
-{{#each options as |option i|}}
-  {{#unless (eq i 0)}}<br>{{/unless}}
-  <label class="uk-form-label {{if isValid "uk-text-success"}} {{if isInvalid "uk-text-danger"}}">
-    <input
-      type     = "checkbox"
-      class    = "uk-checkbox uk-margin-small-right"
-      checked  = {{includes option.key value}}
-      name     = {{name}}
-      id       = "{{inputId}}-{{i}}"
-      disabled = {{disabled}}
-      {{on "input" (fn this.onUpdate option.key)}}
-    >
-    {{option.label}}
-  </label>
-{{/each}}

package/addon/templates/components/validated-input/types/-themes/uikit/checkbox.hbs

@@ -1,11 +0,0 @@
-{{#component labelComponent class=(concat (if isValid "uk-text-success") " " (if isInvalid "uk-text-danger"))}}
-  <input
-    class    = "uk-checkbox uk-margin-small-right"
-    type     = "checkbox"
-    name     = {{name}}
-    id       = {{inputId}}
-    disabled = {{disabled}}
-    checked  = {{value}}
-    onclick  = {{action (queue (action update value="target.checked") setDirty)}}
-  >
-{{/component}}

package/addon/templates/components/validated-input/types/-themes/uikit/radio-group.hbs

@@ -1,17 +0,0 @@
-{{#each options as |option i|}}
-  {{#unless (eq i 0)}}<br>{{/unless}}
-  <label class="uk-form-label {{if isValid "uk-text-success"}} {{if isInvalid "uk-text-danger"}}">
-    <input
-      type       = "radio"
-      class      = "uk-radio uk-margin-small-right"
-      checked    = {{eq value option.key}}
-      value      = {{option.key}}
-      name       = {{name}}
-      id         = "{{inputId}}-{{i}}"
-      onclick    = {{action (queue (action update option.key) setDirty)}}
-      disabled   = {{disabled}}
-    >
-    {{option.label}}
-  </label>
-{{/each}}
-

package/addon/templates/components/validated-input/types/-themes/uikit/select.hbs

@@ -1,17 +0,0 @@
-{{one-way-select
-  value              = value
-  options            = options
-  optionLabelPath    = optionLabelPath
-  optionValuePath    = optionValuePath
-  optionTargetPath   = optionTargetPath
-  name               = name
-  id                 = inputId
-  class              = (concat "uk-select " (if isValid "uk-form-success") " " (if isInvalid "uk-form-danger"))
-  update             = update
-  focusOut           = setDirty
-  includeBlank       = includeBlank
-  disabled           = disabled
-  multiple           = multiple
-  promptIsSelectable = (or promptIsSelectable false)
-}}
-

package/addon/templates/components/validated-input/types/checkbox-group.hbs

@@ -1,14 +0,0 @@
-{{#each options as |option i|}}
-  <label>
-    <input
-      type     = "checkbox"
-      checked  = {{eq value option.key}}
-      value    = {{option.key}}
-      name     = {{name}}
-      id       = "{{inputId}}-{{i}}"
-      disabled = {{disabled}}
-      {{on "input" (fn this.onUpdate option.key)}}
-    >
-    {{option.label}}
-  </label>
-{{/each}}

package/addon/templates/components/validated-input/types/checkbox.hbs

@@ -1,9 +0,0 @@
-<input
-  type     = "checkbox"
-  name     = {{name}}
-  id       = {{inputId}}
-  disabled = {{disabled}}
-  checked  = {{value}}
-  onclick  = {{action (queue (action update value="target.checked") setDirty)}}
->
-{{component labelComponent}}

package/addon/templates/components/validated-input/types/radio-group.hbs

@@ -1,14 +0,0 @@
-{{#each options as |option i|}}
-  <label>
-    <input
-      type     = "radio"
-      checked  = {{eq value option.key}}
-      value    = {{option.key}}
-      name     = {{name}}
-      id       = "{{inputId}}-{{i}}"
-      onclick  = {{action (queue (action update option.key) setDirty)}}
-      disabled = {{disabled}}
-    >
-    {{option.label}}
-  </label>
-{{/each}}

package/addon/templates/components/validated-input/types/select.hbs

@@ -1,16 +0,0 @@
-{{one-way-select
-  value              = value
-  options            = options
-  optionLabelPath    = optionLabelPath
-  optionValuePath    = optionValuePath
-  optionTargetPath   = optionTargetPath
-  name               = name
-  id                 = inputId
-  update             = update
-  focusOut           = setDirty
-  includeBlank       = includeBlank
-  disabled           = disabled
-  multiple           = multiple
-  promptIsSelectable = (or promptIsSelectable false)
-}}
-