From c5c24f5e85d720d1dd1871a61d996d7be5a299be Mon Sep 17 00:00:00 2001 From: Dan Nelson Date: Mon, 5 Nov 2018 10:16:15 -0700 Subject: [PATCH] #22 Improving ember-cli-2.18.2 upgrade. --- .circleci/config.yml | 28 ++++++++++++++++++++++++---- README.md | 42 +++++++++++++++--------------------------- bower.json | 2 +- package.json | 2 +- 4 files changed, 41 insertions(+), 33 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 18d2478..1a373bc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,7 +104,7 @@ jobs: - run: name: Ember Try command: ./node_modules/.bin/ember try:one ember-canary --skip-cleanup - test_lts_2_4: + test_lts_2_16: docker: - image: circleci/node:6.14.4-browsers steps: @@ -119,7 +119,23 @@ jobs: - v1-deps- - run: name: Ember Try - command: ./node_modules/.bin/ember try:one ember-lts-2.4 --skip-cleanup + command: ./node_modules/.bin/ember try:one ember-lts-2.16 --skip-cleanup + test_lts_2_12: + docker: + - image: circleci/node:6.14.4-browsers + steps: + - checkout + - restore_cache: + keys: + - bower-cache-{{ .Branch }}-{{ checksum "bower.json" }} + - restore_cache: + keys: + - v1-deps-{{ .Branch }}-{{ checksum "yarn.lock" }} + - v1-deps-{{ .Branch }}- + - v1-deps- + - run: + name: Ember Try + command: ./node_modules/.bin/ember try:one ember-lts-2.12 --skip-cleanup test_lts_2_8: docker: - image: circleci/node:6.14.4-browsers @@ -136,7 +152,7 @@ jobs: - run: name: Ember Try command: ./node_modules/.bin/ember try:one ember-lts-2.8 --skip-cleanup - test_lts_2_12: + test_lts_2_4: docker: - image: circleci/node:6.14.4-browsers steps: @@ -151,7 +167,7 @@ jobs: - v1-deps- - run: name: Ember Try - command: ./node_modules/.bin/ember try:one ember-lts-2.12 --skip-cleanup + command: ./node_modules/.bin/ember try:one ember-lts-2.4 --skip-cleanup workflows: version: 2 ember_try: @@ -174,6 +190,10 @@ workflows: requires: - bower_and_cache - yarn_and_cache + - test_lts_2_16: + requires: + - bower_and_cache + - yarn_and_cache - test_lts_2_12: requires: - bower_and_cache diff --git a/README.md b/README.md index 363b8f2..b85c237 100644 --- a/README.md +++ b/README.md @@ -144,12 +144,6 @@ Check out these extra mixins at git clone git@github.com:cybertoothca/ember-cli-textarea-autosize.git ``` -### With NPM - -``` -npm install -``` - ### With Yarn ``` @@ -177,31 +171,25 @@ For more information on using ember-cli, visit [http://ember-cli.com/](http://em ## Linking -1. From the command line at the root of __this__ project run the -`npm link` command to _link_ this addon within your local -node repository. -1. From the _other_ Ember project that you wish to test this addon -in, execute the following command: -`npm link ember-cli-textarea-autosize`. -1. Now in that same _other_ Ember project, you should go into the -`package.json` and add the ember addon with the version _*_. It will -look something like this: `"ember-cli-textarea-autosize": "*"`. Now -when/if you execute `npm install` on this _other_ project it -will know to look for the linked addon rather than fetch it from -the central repository. -1. Lastly, in the _other_ Ember project run the blueprint for the - `ember-cli-textarea-autosize` addon by executing: `ember g ember-cli-textarea-autosize`. This -will install the appropriate Ember Addons and Bower dependencies. +Use yarn. + +```bash +# from this addon project +$ yarn link +# from the other project that depends on this addon +$ yarn link ember-cli-textarea-autosize +``` ## Unlinking -1. Remove the addon from your local node repository with the following -command (that can be run anywhere): -`npm uninstall -g ember-cli-textarea-autosize` -1. Remove the reference to the `ember-cli-textarea-autosize` -in your _other_ project's `package.json`. -1. Run an `npm prune` and `bower prune` from the root of your _other_ project's command line. +Again, use yarn. +```bash +# from the other project that linked to this addon +$ yarn unlink ember-cli-textarea-autosize +# from this addon project +$ yarn unlink +``` # Deploying The Dummy Application diff --git a/bower.json b/bower.json index 6689e9a..13f028e 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ember-cli-textarea-autosize", - "dependencies": { + "devDependencies": { "bootstrap-sass": "^3.3.7", "font-awesome": "^4.7.0" } diff --git a/package.json b/package.json index 9fdf286..8c75637 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli-textarea-autosize", - "version": "1.1.0", + "version": "1.2.0-rc.0", "description": "An Ember addon that provides a textarea component that adjusts its height according to the supplied text. Included are also several mixins that can be used to ensure `autofocus` works properly, focused text inputs have their text selected, and ctrl+enter will submit the nearest form.", "keywords": [ "ember-addon",