From f48a4374d6c929987e7f4092365c8d0e45bbaa8d Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Mon, 5 Oct 2020 22:25:33 -0400 Subject: [PATCH] fix: Update Ember codemod v3.20.2...v3.21.2 BREAKING CHANGE: Drop support for Ember < 3.16 --- .travis.yml | 11 +++-- README.md | 2 +- config/ember-try.js | 8 ---- package.json | 12 ++--- tests/dummy/app/index/template.hbs | 56 ++++++++++++------------ tests/dummy/app/templates/author.hbs | 2 +- tests/dummy/app/templates/feed.hbs | 2 +- tests/dummy/app/templates/post.hbs | 2 +- tests/dummy/config/ember-cli-update.json | 2 +- 9 files changed, 44 insertions(+), 53 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39c14822..261e3b9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: node_js node_js: # we recommend testing addons with the same minimum supported node version as Ember CLI # so that your addon works for all apps - - "10" + - '10' dist: xenial @@ -33,14 +33,14 @@ jobs: include: # runs linting and tests with current locked deps - - stage: "Tests" - name: "Tests" + - stage: 'Tests' + name: 'Tests' script: - yarn lint - yarn test:ember - - stage: "Additional Tests" - name: "Floating Dependencies" + - stage: 'Additional Tests' + name: 'Floating Dependencies' install: - yarn install --no-lockfile --non-interactive script: @@ -48,7 +48,6 @@ jobs: # we recommend new addons test the current and previous LTS # as well as latest stable release (bonus points to beta/canary) - - env: EMBER_TRY_SCENARIO=ember-lts-3.12 - env: EMBER_TRY_SCENARIO=ember-lts-3.16 - env: EMBER_TRY_SCENARIO=ember-lts-3.20 - env: EMBER_TRY_SCENARIO=ember-release diff --git a/README.md b/README.md index 240b1e9b..46de9af1 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ ember install ember-page-title ### Compatibility -- Ember.js v3.12 or above +- Ember.js v3.16 or above - Ember CLI v2.13 or above - Node.js v10 or above diff --git a/config/ember-try.js b/config/ember-try.js index 92643fa6..df80e465 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -6,14 +6,6 @@ module.exports = async function () { return { useYarn: true, scenarios: [ - { - name: 'ember-lts-3.12', - npm: { - devDependencies: { - 'ember-source': '~3.12.0', - }, - }, - }, { name: 'ember-lts-3.16', npm: { diff --git a/package.json b/package.json index 11291075..07efa363 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "release": "standard-version" }, "dependencies": { - "ember-cli-babel": "^7.22.0", + "ember-cli-babel": "^7.22.1", "ember-copy": "^1.0.0" }, "devDependencies": { @@ -40,24 +40,24 @@ "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.6.0", "ember-autoresize": "^1.3.1", - "ember-cli": "~3.20.0", + "ember-cli": "~3.21.2", "ember-cli-code-coverage": "^1.0.0", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-fastboot": "^2.2.3", "ember-cli-fastboot-testing": "^0.4.0", "ember-cli-github-pages": "^0.2.0", - "ember-cli-htmlbars": "^5.3.0", + "ember-cli-htmlbars": "^5.3.1", "ember-cli-inject-live-reload": "^2.0.2", "ember-cli-sass": "^10.0.1", - "ember-cli-uglify": "^3.0.0", + "ember-cli-terser": "^4.0.0", "ember-cli-update": "^0.54.0", "ember-disable-prototype-extensions": "^1.1.3", "ember-inline-svg": "^1.0.0", "ember-load-initializers": "^2.1.1", "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", - "ember-resolver": "^8.0.0", - "ember-source": "~3.20.2", + "ember-resolver": "^8.0.2", + "ember-source": "~3.21.1", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^2.12.0", "ember-try": "^1.4.0", diff --git a/tests/dummy/app/index/template.hbs b/tests/dummy/app/index/template.hbs index 93259281..ee7faaf9 100644 --- a/tests/dummy/app/index/template.hbs +++ b/tests/dummy/app/index/template.hbs @@ -52,7 +52,7 @@
- + {{page-title token.value @@ -101,7 +101,7 @@ }} - @@ -121,16 +121,16 @@

- This sets the title for your application. When your application loads, you should see the title “{{this.model.title + This sets the title for your application. When your application loads, you should see the title “{{@model.title }}” appear in the window. Try changing the value below to change the title of this page.

- +
- {{highlight '{{page-title "' this.model.title '"}}'}} + {{highlight '{{page-title "' @model.title '"}}'}} @@ -143,15 +143,15 @@ - + - {{highlight '{{page-title "' this.model.title '"}}'}} + {{highlight '{{page-title "' @model.title '"}}'}} {{highlight '{{page-title "Posts"}}'}} - + {{highlight '{{page-title post.title}}'}} @@ -175,11 +175,11 @@ - + {{highlight '{{page-title "' - this.model.title + @model.title '" separator=" > "}}' }} @@ -187,7 +187,7 @@ {{highlight '{{page-title "Posts"}}'}} - + {{highlight '{{page-title post.title}}'}} @@ -205,11 +205,11 @@ - + {{highlight '{{page-title "' - this.model.title + @model.title '" separator=": "}}' }} @@ -217,7 +217,7 @@ {{highlight '{{page-title "Posts" separator=" > "}}'}} - + {{highlight '{{page-title post.title}}'}} @@ -245,15 +245,15 @@ - + - {{highlight '{{page-title "' this.model.title '" prepend=true}}'}} + {{highlight '{{page-title "' @model.title '" prepend=true}}'}} {{highlight '{{page-title "Posts"}}'}} - + {{highlight '{{page-title post.title}}'}} @@ -271,15 +271,15 @@ - + - {{highlight '{{page-title "' this.model.title '"}}'}} + {{highlight '{{page-title "' @model.title '"}}'}} {{highlight '{{page-title "Posts" prepend=true}}'}} - + {{highlight '{{page-title post.title}}'}} @@ -307,17 +307,17 @@ - + - {{highlight '{{page-title "' this.model.title '"}}'}} + {{highlight '{{page-title "' @model.title '"}}'}} {{highlight '{{page-title "Posts" replace=true}}'}} - + - {{highlight '{{page-title this.model.post.title}}'}} + {{highlight '{{page-title @model.post.title}}'}} @@ -333,16 +333,16 @@ - + - {{highlight '{{page-title "' this.model.title '"}}'}} + {{highlight '{{page-title "' @model.title '"}}'}} - + {{highlight '{{page-title "Posts"}}'}} - {{highlight '{{page-title this.model.post.title}}'}} + {{highlight '{{page-title @model.post.title}}'}} diff --git a/tests/dummy/app/templates/author.hbs b/tests/dummy/app/templates/author.hbs index f932fdf0..e19f5044 100644 --- a/tests/dummy/app/templates/author.hbs +++ b/tests/dummy/app/templates/author.hbs @@ -1,2 +1,2 @@ {{page-title 'Authors' prepend=false separator=' < '}} -{{page-title this.model.name}} \ No newline at end of file +{{page-title @model.name}} \ No newline at end of file diff --git a/tests/dummy/app/templates/feed.hbs b/tests/dummy/app/templates/feed.hbs index 66594593..703b5dbc 100644 --- a/tests/dummy/app/templates/feed.hbs +++ b/tests/dummy/app/templates/feed.hbs @@ -1,4 +1,4 @@ -{{page-title this.model.name ' (' this.model.handle ')' replace=true}} +{{page-title @model.name ' (' @model.handle ')' replace=true}} @tomster diff --git a/tests/dummy/app/templates/post.hbs b/tests/dummy/app/templates/post.hbs index d13104a8..f57ba49c 100644 --- a/tests/dummy/app/templates/post.hbs +++ b/tests/dummy/app/templates/post.hbs @@ -1,2 +1,2 @@ {{page-title 'Posts'}} -{{page-title this.model.title}} \ No newline at end of file +{{page-title @model.title}} \ No newline at end of file diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json index 726f31be..070386df 100644 --- a/tests/dummy/config/ember-cli-update.json +++ b/tests/dummy/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "ember-cli", - "version": "3.20.2", + "version": "3.21.2", "blueprints": [ { "name": "addon",