chore: upgrade and add resolution for embroider (#737)

adfinis · Feb 3, 2022 · 95f4099 · 95f4099
1 parent 765f5f4
commit 95f4099
Show file tree

Hide file tree

Showing 9 changed files with 932 additions and 519 deletions.
diff --git a/addon/components/validated-input/types/-themes/bootstrap/checkbox-group.hbs b/addon/components/validated-input/types/-themes/bootstrap/checkbox-group.hbs
@@ -3,8 +3,8 @@
     <input
       type="checkbox"
       class="custom-control-input
-        {{if @isValid "is-valid"}}
-        {{if @isInvalid "is-invalid"}}"
+        {{if @isValid 'is-valid'}}
+        {{if @isInvalid 'is-invalid'}}"
       checked={{includes option.key @value}}
       name={{@name}}
       id="{{@inputId}}-{{i}}"

diff --git a/addon/components/validated-input/types/-themes/bootstrap/checkbox.hbs b/addon/components/validated-input/types/-themes/bootstrap/checkbox.hbs
@@ -1,8 +1,8 @@
 <div class="custom-control custom-checkbox">
   <input
     class="custom-control-input
-      {{if @isValid "is-valid"}}
-      {{if @isInvalid "is-invalid"}}"
+      {{if @isValid 'is-valid'}}
+      {{if @isInvalid 'is-invalid'}}"
     type="checkbox"
     name={{@name}}
     id={{@inputId}}

diff --git a/addon/components/validated-input/types/-themes/bootstrap/radio-group.hbs b/addon/components/validated-input/types/-themes/bootstrap/radio-group.hbs
@@ -3,8 +3,8 @@
     <input
       type="radio"
       class="custom-control-input
-        {{if @isValid "is-valid"}}
-        {{if @isInvalid "is-invalid"}}"
+        {{if @isValid 'is-valid'}}
+        {{if @isInvalid 'is-invalid'}}"
       checked={{eq @value option.key}}
       value={{option.key}}
       name={{@name}}

diff --git a/addon/components/validated-input/types/-themes/uikit/checkbox-group.hbs b/addon/components/validated-input/types/-themes/uikit/checkbox-group.hbs
@@ -2,8 +2,8 @@
   {{#if (not-eq i 0)}}<br />{{/if}}
   <label
     class="uk-form-label
-      {{if @isValid "uk-text-success"}}
-      {{if @isInvalid "uk-text-danger"}}"
+      {{if @isValid 'uk-text-success'}}
+      {{if @isInvalid 'uk-text-danger'}}"
   >
     <input
       type="checkbox"

diff --git a/addon/components/validated-input/types/-themes/uikit/checkbox.hbs b/addon/components/validated-input/types/-themes/uikit/checkbox.hbs
@@ -1,6 +1,6 @@
 {{#let (component @labelComponent) as |Label|}}
   <Label
-    class="{{if @isValid "uk-text-success"}} {{if @isInvalid "uk-text-danger"}}"
+    class="{{if @isValid 'uk-text-success'}} {{if @isInvalid 'uk-text-danger'}}"
   >
     <input
       class="uk-checkbox uk-margin-small-right"

diff --git a/addon/components/validated-input/types/-themes/uikit/radio-group.hbs b/addon/components/validated-input/types/-themes/uikit/radio-group.hbs
@@ -2,8 +2,8 @@
   {{#if (not-eq i 0)}}<br />{{/if}}
   <label
     class="uk-form-label
-      {{if @isValid "uk-text-success"}}
-      {{if @isInvalid "uk-text-danger"}}"
+      {{if @isValid 'uk-text-success'}}
+      {{if @isInvalid 'uk-text-danger'}}"
   >
     <input
       type="radio"

diff --git a/package.json b/package.json
@@ -33,20 +33,20 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "ember-auto-import": "^2.2.0",
+    "ember-auto-import": "^2.4.0",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-htmlbars": "^5.7.1",
     "ember-truth-helpers": "^3.0.0"
   },
   "devDependencies": {
     "@adfinis-sygroup/eslint-config": "1.5.0",
-    "@adfinis-sygroup/semantic-release-config": "3.2.1",
-    "@babel/core": "7.16.7",
+    "@adfinis-sygroup/semantic-release-config": "3.4.0",
+    "@babel/core": "7.16.12",
     "@babel/helper-create-regexp-features-plugin": "^7.16.7",
-    "@babel/helper-environment-visitor": "^7.16.5",
+    "@babel/helper-environment-visitor": "^7.16.7",
     "@babel/plugin-proposal-decorators": "^7.16.7",
     "@babel/plugin-transform-modules-amd": "^7.16.7",
-    "@babel/preset-env": "^7.16.7",
+    "@babel/preset-env": "^7.16.11",
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.6.0",
     "@embroider/test-setup": "0.45.0",
@@ -56,8 +56,8 @@
     "@glimmer/tracking": "1.0.4",
     "babel-eslint": "10.1.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-changeset": "3.15.0",
-    "ember-changeset-validations": "3.16.0",
+    "ember-changeset": "4.0.0-beta.2",
+    "ember-changeset-validations": "4.0.0-beta.2",
     "ember-cli": "3.28.1",
     "ember-cli-addon-docs": "4.2.1",
     "ember-cli-dependency-checker": "3.2.0",
@@ -75,7 +75,7 @@
     "ember-disable-prototype-extensions": "1.1.3",
     "ember-load-initializers": "2.1.2",
     "ember-maybe-import-regenerator": "1.0.0",
-    "ember-power-select": "4.1.6",
+    "ember-power-select": "5.0.3",
     "ember-qunit": "5.1.5",
     "ember-resolver": "8.0.3",
     "ember-source": "3.28.1",
@@ -86,21 +86,24 @@
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-ember": "10.5.8",
-    "eslint-plugin-import": "2.25.3",
+    "eslint-plugin-import": "2.25.4",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-prettier": "4.0.0",
     "eslint-plugin-qunit": "6.2.0",
     "husky": "7.0.4",
     "lint-staged": "11.2.0",
     "loader.js": "4.7.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.4.1",
+    "prettier": "2.5.1",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.58.0"
+    "webpack": "5.67.0"
   },
   "resolutions": {
-    "graceful-fs": ">=4.2.0"
+    "graceful-fs": ">=4.2.0",
+    "@embroider/macros": "^1.0.0",
+    "@embroider/core": "^1.0.0",
+    "@embroider/util": "^1.0.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

diff --git a/tests/dummy/app/components/favorite-colors.hbs b/tests/dummy/app/components/favorite-colors.hbs
@@ -1,7 +1,7 @@
 {{! BEGIN-SNIPPET favorite-colors.hbs }}
 <@labelComponent />
 
-<div class="{{if @isValid "is-valid"}} {{if @isInvalid "is-invalid"}}">
+<div class="{{if @isValid 'is-valid'}} {{if @isInvalid 'is-invalid'}}">
   {{#if @value}}
     {{@value.name}}
     <button