From 3b1cb209806f52a89f0308f4d28b4b34abd05d32 Mon Sep 17 00:00:00 2001 From: snewcomer Date: Sat, 25 Apr 2020 17:12:28 -0700 Subject: [PATCH 1/2] Bump e-c 3.3.0 --- package.json | 2 +- yarn.lock | 56 +++++++++++----------------------------------------- 2 files changed, 13 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 8752213..66ac6e4 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "contributors": "npx contributor-faces -e \"(*-bot|*\\[bot\\]|*-tomster|homu|bors)\"" }, "dependencies": { - "ember-changeset": "^3.2.0", + "ember-changeset": "^3.3.0", "ember-cli-babel": "^7.8.0", "ember-cli-htmlbars": "^4.0.5", "ember-get-config": "^0.2.4", diff --git a/yarn.lock b/yarn.lock index 709f017..ebd9726 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1960,7 +1960,7 @@ babel-plugin-dynamic-import-node@^2.3.0: dependencies: object.assign "^4.1.0" -babel-plugin-ember-data-packages-polyfill@^0.1.1, babel-plugin-ember-data-packages-polyfill@^0.1.2: +babel-plugin-ember-data-packages-polyfill@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/babel-plugin-ember-data-packages-polyfill/-/babel-plugin-ember-data-packages-polyfill-0.1.2.tgz#21154c095ddc703722b1fb8bb06c126c0b6d77dc" integrity sha512-kTHnOwoOXfPXi00Z8yAgyD64+jdSXk3pknnS7NlqnCKAU6YDkXZ4Y7irl66kaZjZn0FBBt0P4YOZFZk85jYOww== @@ -4261,53 +4261,21 @@ ember-auto-import@^1.5.2, ember-auto-import@^1.5.3: walk-sync "^0.3.3" webpack "~4.28" -ember-changeset@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ember-changeset/-/ember-changeset-3.2.0.tgz#9f889e9fd8d1f5e80b8fbeec09f0623ad3d7836a" - integrity sha512-aJVsLRVyV/uKuSnKyZteqxvkAUDiGmKet6q/iD2eb36H9t4iwqZbq4XzDve6gtddz0sfK9VL61HFMVCqbHjYlw== +ember-changeset@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/ember-changeset/-/ember-changeset-3.3.0.tgz#a36dc1ad0ce8c0b81041b73a2ecd80f7785bbc72" + integrity sha512-G25GEiss+hCQeQ/KJTy+sUPY7gkvPBUhqL1Z1ZUKURQ+LNHDycgM7+3QrbeboB/iU539hXd23Mp0O2ZUXQfi/g== dependencies: "@glimmer/tracking" "^1.0.0" ember-auto-import "^1.5.2" - ember-cli-babel "7.17.2" - validated-changeset "~0.3.0" + ember-cli-babel "^7.19.0" + validated-changeset "~0.4.0" ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac" integrity sha512-Zr4my8Xn+CzO0gIuFNXji0eTRml5AxZUTDQz/wsNJ5AJAtyFWCY4QtKdoELNNbiCVGt1lq5yLiwTm4scGKu6xA== -ember-cli-babel@7.17.2: - version "7.17.2" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.17.2.tgz#2c7717c6864425be3cd11913c722115fbf1448d2" - integrity sha512-64jRwtRVtEp4ghhew/sHeMsPyUOg3t1TB2dary5mCbKkRasb3L7FwF7xnuzPihaz+AW/v2LqYLALXGCml5XNLA== - dependencies: - "@babel/core" "^7.8.4" - "@babel/helper-compilation-targets" "^7.8.4" - "@babel/plugin-proposal-class-properties" "^7.8.3" - "@babel/plugin-proposal-decorators" "^7.8.3" - "@babel/plugin-transform-modules-amd" "^7.8.3" - "@babel/plugin-transform-runtime" "^7.8.3" - "@babel/plugin-transform-typescript" "^7.8.3" - "@babel/polyfill" "^7.8.3" - "@babel/preset-env" "^7.8.4" - "@babel/runtime" "^7.8.4" - amd-name-resolver "^1.2.1" - babel-plugin-debug-macros "^0.3.0" - babel-plugin-ember-data-packages-polyfill "^0.1.1" - babel-plugin-ember-modules-api-polyfill "^2.12.0" - babel-plugin-module-resolver "^3.1.1" - broccoli-babel-transpiler "^7.4.0" - broccoli-debug "^0.6.4" - broccoli-funnel "^2.0.1" - broccoli-source "^1.1.0" - clone "^2.1.2" - ember-cli-babel-plugin-helpers "^1.1.0" - ember-cli-version-checker "^4.1.0" - ensure-posix-path "^1.0.2" - fixturify-project "^1.10.0" - rimraf "^3.0.1" - semver "^5.5.0" - ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.9.2: version "6.18.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957" @@ -4359,7 +4327,7 @@ ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.7.3: rimraf "^3.0.1" semver "^5.5.0" -ember-cli-babel@^7.8.0: +ember-cli-babel@^7.19.0, ember-cli-babel@^7.8.0: version "7.19.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.19.0.tgz#e6eddea18a867231fcf90a80689e92b98be9a63b" integrity sha512-HiWKuoyy35vGEr+iCw6gUnQ3pS5qslyTlKEDW8cVoMbvZNGYBgRxHed5nklVUh+BS74AwR9lsp25BTAagYAP9Q== @@ -10297,10 +10265,10 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -validated-changeset@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/validated-changeset/-/validated-changeset-0.3.0.tgz#bd8f744c65c8661fd1e1436edc809c2c68113094" - integrity sha512-JWtSN4gktah+tgUPk2G8CixVDjtkb24UHtDocesoeXPWVH7KOuxV/E7GzwcIt1gvTqDBjvVxjrT9nKJHS/Lt0Q== +validated-changeset@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/validated-changeset/-/validated-changeset-0.4.0.tgz#7f2b374f1fc445bc5890d36707449bb8d995457c" + integrity sha512-LnFTwC9ogwpzzeCJXovsubp/sETIoAJ6t4l8YY/BMNfBtfUacio1WTdYTB51k7tMOlumJouEP+WhWDHPB3q1lQ== vary@~1.1.2: version "1.1.2" From 42b5b4a58635c7d9aaa96354dcdc21ef74460c7e Mon Sep 17 00:00:00 2001 From: snewcomer Date: Sat, 25 Apr 2020 18:31:20 -0700 Subject: [PATCH 2/2] Anoter bump to v-c --- package.json | 2 +- tests/dummy/app/components/foo-bar.js | 18 ++++++++++-------- tests/unit/helpers/changeset-test.js | 6 +++--- yarn.lock | 18 +++++++++--------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 66ac6e4..06676fd 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "contributors": "npx contributor-faces -e \"(*-bot|*\\[bot\\]|*-tomster|homu|bors)\"" }, "dependencies": { - "ember-changeset": "^3.3.0", + "ember-changeset": "^3.3.1", "ember-cli-babel": "^7.8.0", "ember-cli-htmlbars": "^4.0.5", "ember-get-config": "^0.2.4", diff --git a/tests/dummy/app/components/foo-bar.js b/tests/dummy/app/components/foo-bar.js index f555a03..3cc7131 100644 --- a/tests/dummy/app/components/foo-bar.js +++ b/tests/dummy/app/components/foo-bar.js @@ -10,14 +10,16 @@ const rulez = { validatePresence(true), validateLength({ min: 2 }) ], - 'state.ny': [ - validatePresence(true), - validateLength({ min: 2 }) - ], - 'state.wi': [ - validatePresence(true), - validateLength({ min: 2 }) - ] + state: { + ny: [ + validatePresence(true), + validateLength({ min: 2 }) + ], + wi: [ + validatePresence(true), + validateLength({ min: 2 }) + ] + } }; const schema = { diff --git a/tests/unit/helpers/changeset-test.js b/tests/unit/helpers/changeset-test.js index 055373c..9052898 100644 --- a/tests/unit/helpers/changeset-test.js +++ b/tests/unit/helpers/changeset-test.js @@ -42,7 +42,7 @@ module('Unit | Helper | changeset', function() { assert.ok(changesetInstance.get('isInvalid'), 'should be invalid with blank first name'); changesetInstance.set('lastName', ''); - assert.deepEqual(changesetInstance.get('error').lastName.validation, ["[CUSTOM] Last name can't be blank"]); + assert.deepEqual(changesetInstance.get('error').lastName.validation, "[CUSTOM] Last name can't be blank"); assert.ok(changesetInstance.get('isInvalid'), 'should be invalid with blank last name'); changesetInstance.set('firstName', 'Jim'); @@ -67,7 +67,7 @@ module('Unit | Helper | changeset', function() { changesetInstance.set('email', 'foo@bar.com'); await settled(); - let expectedError = { value: 'foo@bar.com', validation: ['is already taken'] }; + let expectedError = { value: 'foo@bar.com', validation: 'is already taken' }; assert.deepEqual(JSON.parse(JSON.stringify(changesetInstance.get('error').email)), expectedError, 'email should error'); changesetInstance.set('username', 'jimbob'); @@ -112,7 +112,7 @@ module('Unit | Helper | changeset', function() { let changesetInstance = await changeset([user, userValidations]); changesetInstance.validate().then(() => { - assert.deepEqual(changesetInstance.get('error').firstName.validation, ["[CUSTOM] First name can't be blank"]); + assert.deepEqual(changesetInstance.get('error').firstName.validation, "[CUSTOM] First name can't be blank"); assert.ok(changesetInstance.get('isInvalid'), 'should be invalid with wrong length first name'); changesetInstance.set('firstName', 'Jim'); diff --git a/yarn.lock b/yarn.lock index ebd9726..266a2ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4261,15 +4261,15 @@ ember-auto-import@^1.5.2, ember-auto-import@^1.5.3: walk-sync "^0.3.3" webpack "~4.28" -ember-changeset@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/ember-changeset/-/ember-changeset-3.3.0.tgz#a36dc1ad0ce8c0b81041b73a2ecd80f7785bbc72" - integrity sha512-G25GEiss+hCQeQ/KJTy+sUPY7gkvPBUhqL1Z1ZUKURQ+LNHDycgM7+3QrbeboB/iU539hXd23Mp0O2ZUXQfi/g== +ember-changeset@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/ember-changeset/-/ember-changeset-3.3.1.tgz#8e035d74d806110602016481788c1e2634a03303" + integrity sha512-AvTAhlec6Cz0eKfKPxAQm33nhp1zQ04p9OiyVL4IRbvBetQ/7Jq+7r4otXO+jecgCxPygzYIy8nAvCjJ3t30GA== dependencies: "@glimmer/tracking" "^1.0.0" ember-auto-import "^1.5.2" ember-cli-babel "^7.19.0" - validated-changeset "~0.4.0" + validated-changeset "~0.4.1" ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0: version "1.1.0" @@ -10265,10 +10265,10 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -validated-changeset@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/validated-changeset/-/validated-changeset-0.4.0.tgz#7f2b374f1fc445bc5890d36707449bb8d995457c" - integrity sha512-LnFTwC9ogwpzzeCJXovsubp/sETIoAJ6t4l8YY/BMNfBtfUacio1WTdYTB51k7tMOlumJouEP+WhWDHPB3q1lQ== +validated-changeset@~0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/validated-changeset/-/validated-changeset-0.4.1.tgz#74208c439cb03b7ba69af6819c722768678fffeb" + integrity sha512-Q7pvZaWPdqn0Zo/Xpddp9zQ2abqXJLEyyiJbym+O2H2pH5KPOBTB/5UXBvkaQ7zvK6exWBjZnNzzoo1dBWeoAQ== vary@~1.1.2: version "1.1.2"