Run ember-cli-update

ember-bootstrap · Nov 4, 2018 · c2199a9 · c2199a9
1 parent a9ac54c
commit c2199a9
Show file tree

Hide file tree

Showing 23 changed files with 1,033 additions and 429 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -11,9 +11,12 @@
 
 # misc
 /coverage/
+!.*
 
 # ember-try
 /.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
 
 /docs/
 /fastboot-tests/fixtures/
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -21,6 +21,8 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
+        '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
         'testem.js',

diff --git a/.npmignore b/.npmignore
@@ -1,30 +1,40 @@
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+
+# misc
+/.bowerrc
+/.editorconfig
+/.ember-cli
+/.eslintignore
+/.eslintrc.js
+/.gitignore
+/.template-lintrc.js
+/.travis.yml
+/.watchmanconfig
+/bower.json
+/config/ember-try.js
+/ember-cli-build.js
+testem.*
+/tests/
+/yarn.lock
+.gitkeep
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
+
 /.publish
 /.github
 /.idea
-/config/ember-try.js
 /config/release.js
-/dist
-/tests
-/tmp
 /fastboot-tests
-/docs
-**/.gitkeep
-.editorconfig
-.ember-cli
-.eslintrc.js
-.gitignore
-.watchmanconfig
-.travis.yml
-.template-lintrc.js
-ember-cli-build.js
-testem.*
 yuidoc.json
 gulpfile.js
 .codeclimate.yml
 /node-tests
-/DEBUG
-
-# ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
+/DEBUG
diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -1,9 +1,12 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = {
   extends: 'recommended',
   rules: {
-    'no-html-comments': false
-  }
+    'no-html-comments': false,
+    'attribute-indentation': false
+  },
+  ignore: [
+    'fastboot-tests/fixtures/**/*'
+  ]
 };
diff --git a/.travis.yml b/.travis.yml
@@ -26,59 +26,65 @@ env:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
-  matrix:
-    - EMBER_TRY_SCENARIO=ember-2.3
-    - EMBER_TRY_SCENARIO=ember-lts-2.8
-    - EMBER_TRY_SCENARIO=ember-lts-2.12
-    - EMBER_TRY_SCENARIO=ember-lts-2.16
-    - EMBER_TRY_SCENARIO=ember-lts-2.18
-    - EMBER_TRY_SCENARIO=ember-release
-    - EMBER_TRY_SCENARIO=ember-beta
-    - EMBER_TRY_SCENARIO=ember-canary
-    - EMBER_TRY_SCENARIO=ember-lts-2.8 BOOTSTRAPVERSION=3
-    - EMBER_TRY_SCENARIO=ember-lts-2.12 BOOTSTRAPVERSION=3
-    - EMBER_TRY_SCENARIO=ember-lts-2.16 BOOTSTRAPVERSION=3
-    - EMBER_TRY_SCENARIO=ember-lts-2.18 BOOTSTRAPVERSION=3
-    - EMBER_TRY_SCENARIO=ember-release BOOTSTRAPVERSION=3
-    - EMBER_TRY_SCENARIO=ember-beta BOOTSTRAPVERSION=3
-    - EMBER_TRY_SCENARIO=fastboot-addon-tests
-    - EMBER_TRY_SCENARIO=node-tests
-    - EMBER_TRY_SCENARIO=ember-default BEFORE_SCRIPT="ember sauce:connect" AFTER_SCRIPT="ember sauce:disconnect" TEST_COMMAND="ember test --config-file testem.sauce.js --test-port 7000"
-
-matrix:
-  fast_finish: true
+jobs:
+  fail_fast: true
   allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-canary
+  - env: EMBER_TRY_SCENARIO=ember-canary
+
+  include:
+  # runs linting and tests with current locked deps
+
+  - stage: "Tests"
+    name: "Tests"
+    install:
+    - yarn install --non-interactive
+    script:
+    - yarn lint:hbs
+    - yarn lint:js
+    - yarn test
+
+  - name: "Floating Dependencies"
+    script:
+    - yarn test
+
+  # we recommend new addons test the current and previous LTS
+  # as well as latest stable release (bonus points to beta/canary)
+  - stage: "Additional Tests"
+    env: EMBER_TRY_SCENARIO=ember-2.3
+  - env: EMBER_TRY_SCENARIO=ember-lts-2.8
+  - env: EMBER_TRY_SCENARIO=ember-lts-2.12
+  - env: EMBER_TRY_SCENARIO=ember-lts-2.16
+  - env: EMBER_TRY_SCENARIO=ember-lts-2.18
+  - env: EMBER_TRY_SCENARIO=ember-release
+  - env: EMBER_TRY_SCENARIO=ember-beta
+  - env: EMBER_TRY_SCENARIO=ember-canary
+  - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
+  - env: EMBER_TRY_SCENARIO=ember-lts-2.8 BOOTSTRAPVERSION=3
+  - env: EMBER_TRY_SCENARIO=ember-lts-2.12 BOOTSTRAPVERSION=3
+  - env: EMBER_TRY_SCENARIO=ember-lts-2.16 BOOTSTRAPVERSION=3
+  - env: EMBER_TRY_SCENARIO=ember-lts-2.18 BOOTSTRAPVERSION=3
+  - env: EMBER_TRY_SCENARIO=ember-release BOOTSTRAPVERSION=3
+  - env: EMBER_TRY_SCENARIO=ember-beta BOOTSTRAPVERSION=3
+  - env: EMBER_TRY_SCENARIO=fastboot-addon-tests
+  - env: EMBER_TRY_SCENARIO=node-tests
+  - env: EMBER_TRY_SCENARIO=ember-default BEFORE_SCRIPT="ember sauce:connect" AFTER_SCRIPT="ember sauce:disconnect" TEST_COMMAND="ember test --config-file testem.sauce.js --test-port 7000"
 
 branches:
   only:
     - master
 
 before_install:
-  - if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
-  - npm config set spin false
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
-  - npm --version
-  - yarn --version
-  - google-chrome-stable --version
-  - yarn global add greenkeeper-lockfile@1
 
 install:
-  - yarn install
+  - yarn install --no-lockfile --non-interactive
 
 script:
-  - npm run lint:js
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup --- $TEST_COMMAND
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --- $TEST_COMMAND
 
 before_script:
-  - greenkeeper-lockfile-update
   - $BEFORE_SCRIPT
 
 after_script:
   - $AFTER_SCRIPT
-  - greenkeeper-lockfile-upload
-
-addons:
-    code_climate:
-        repo_token: de4cedac171d091882efe2719ae10fbdb5e5054077123f8455b251719973a606
diff --git a/addon/templates/components/bs3/bs-accordion/title.hbs b/addon/templates/components/bs3/bs-accordion/title.hbs
@@ -1,5 +1,5 @@
 <h4 class="panel-title">
-  <a href="#" class="{{if disabled "disabled"}}">
+  <a href="#" class={{if disabled "disabled"}}>
     {{yield}}
   </a>
 </h4>
diff --git a/addon/templates/components/bs3/bs-form/element/label.hbs b/addon/templates/components/bs3/bs-form/element/label.hbs
@@ -4,5 +4,5 @@
     {{label}}
   </label>
 {{else}}
-  <label class="control-label {{if invisibleLabel "sr-only"}} {{labelClass}}" for="{{formElementId}}">{{label}}</label>
+  <label class="control-label {{if invisibleLabel "sr-only"}} {{labelClass}}" for={{formElementId}}>{{label}}</label>
 {{/if}}
diff --git a/addon/templates/components/bs3/bs-form/element/layout/horizontal.hbs b/addon/templates/components/bs3/bs-form/element/layout/horizontal.hbs
@@ -1,6 +1,6 @@
 {{#if hasLabel}}
   {{component labelComponent labelClass=horizontalLabelGridClass}}
-  <div class="{{horizontalInputGridClass}}">
+  <div class={{horizontalInputGridClass}}>
     {{yield}}
     {{component feedbackIconComponent}}
     {{component errorsComponent}}

diff --git a/addon/templates/components/bs3/bs-navbar.hbs b/addon/templates/components/bs3/bs-navbar.hbs
@@ -6,7 +6,7 @@
       nav=(component navComponent linkToComponent=(component linkToComponent onCollapse=(action "collapse")))
       collapse=(action "collapse")
       expand=(action "expand")
-      toggleNavbar=(action 'toggleNavbar')
+      toggleNavbar=(action "toggleNavbar")
     )
   }}
 </div>
diff --git a/addon/templates/components/bs4/bs-form/element/layout/horizontal.hbs b/addon/templates/components/bs4/bs-form/element/layout/horizontal.hbs
@@ -1,6 +1,6 @@
 {{#if hasLabel}}
   {{component labelComponent labelClass=horizontalLabelGridClass}}
-  <div class="{{horizontalInputGridClass}}">
+  <div class={{horizontalInputGridClass}}>
     {{yield}}
     {{component errorsComponent}}
     {{component helpTextComponent}}

diff --git a/addon/templates/components/bs4/bs-navbar.hbs b/addon/templates/components/bs4/bs-navbar.hbs
@@ -1,24 +1,24 @@
 {{#if fluid}}
   {{yield
     (hash
-      toggle=(component toggleComponent onClick=(action 'toggleNavbar') collapsed=_collapsed)
+      toggle=(component toggleComponent onClick=(action "toggleNavbar") collapsed=_collapsed)
       content=(component contentComponent collapsed=_collapsed onHidden=onCollapsed onShown=onExpanded)
       nav=(component navComponent linkToComponent=(component linkToComponent onCollapse=(action "collapse")))
       collapse=(action "collapse")
       expand=(action "expand")
-      toggleNavbar=(action 'toggleNavbar')
+      toggleNavbar=(action "toggleNavbar")
     )
   }}
 {{else}}
   <div class="container">
     {{yield
       (hash
-        toggle=(component toggleComponent onClick=(action 'toggleNavbar') collapsed=_collapsed)
+        toggle=(component toggleComponent onClick=(action "toggleNavbar") collapsed=_collapsed)
         content=(component contentComponent collapsed=_collapsed onHidden=onCollapsed onShown=onExpanded)
         nav=(component navComponent linkToComponent=(component linkToComponent onCollapse=(action "collapse")))
         collapse=(action "collapse")
         expand=(action "expand")
-        toggleNavbar=(action 'toggleNavbar')
+        toggleNavbar=(action "toggleNavbar")
       )
     }}
   </div>

diff --git a/addon/templates/components/common/bs-button.hbs b/addon/templates/components/common/bs-button.hbs
@@ -1,4 +1,4 @@
-{{#if icon}}<i class="{{icon}}"></i> {{/if}}{{text}}{{yield
+{{#if icon}}<i class={{icon}}></i> {{/if}}{{text}}{{yield
   (hash
     isFulfilled=isFulfilled
     isPending=isPending

diff --git a/addon/templates/components/common/bs-carousel.hbs b/addon/templates/components/common/bs-carousel.hbs
@@ -1,7 +1,7 @@
 {{#if showIndicators}}
   <ol class="carousel-indicators">
     {{#each indicators as |indicator _index|}}
-      <li class="{{if (bs-eq currentIndex _index) "active"}}" onclick={{action "toSlide" _index}} role="button"></li>
+      <li class={{if (bs-eq currentIndex _index) "active"}} onclick={{action "toSlide" _index}} role="button"></li>
     {{/each}}
   </ol>
 {{/if}}
@@ -17,12 +17,12 @@
 </div>
 
 {{#if showControls}}
-  <a class="{{prevControlClassName}}" href="#{{elementId}}" {{action "toPrevSlide"}} role="button">
-    <span aria-hidden="true" class="{{prevControlIcon}}"></span>
+  <a class={{prevControlClassName}} href="#{{elementId}}" {{action "toPrevSlide"}} role="button">
+    <span aria-hidden="true" class={{prevControlIcon}}></span>
     <span class="sr-only">{{prevControlLabel}}</span>
   </a>
-  <a class="{{nextControlClassName}}" href="#{{elementId}}" {{action "toNextSlide"}} role="button">
-    <span aria-hidden="true" class="{{nextControlIcon}}"></span>
+  <a class={{nextControlClassName}} href="#{{elementId}}" {{action "toNextSlide"}} role="button">
+    <span aria-hidden="true" class={{nextControlIcon}}></span>
     <span class="sr-only">{{nextControlLabel}}</span>
   </a>
 {{/if}}
diff --git a/addon/templates/components/common/bs-form/element/errors.hbs b/addon/templates/components/common/bs-form/element/errors.hbs
@@ -2,7 +2,7 @@
   {{#if showMultipleErrors}}
     <div class="pre-scrollable">
       {{#each messages as |message|}}
-        <div class="{{feedbackClass}}">{{message}}</div>
+        <div class={{feedbackClass}}>{{message}}</div>
       {{/each}}
     </div>
   {{else}}

diff --git a/addon/templates/components/common/bs-modal-simple.hbs b/addon/templates/components/common/bs-modal-simple.hbs
@@ -34,7 +34,7 @@
 
     <div>
       {{#if showBackdrop}}
-        <div class="modal-backdrop {{if fade "fade"}} {{if showModal showClass}}" id="{{backdropId}}"></div>
+        <div class="modal-backdrop {{if fade "fade"}} {{if showModal showClass}}" id={{backdropId}}></div>
       {{/if}}
     </div>
   {{/maybe-in-element}}

diff --git a/addon/templates/components/common/bs-modal.hbs b/addon/templates/components/common/bs-modal.hbs
@@ -27,7 +27,7 @@
 
     <div>
       {{#if showBackdrop}}
-        <div class="modal-backdrop {{if fade "fade"}} {{if showModal showClass}}" id="{{backdropId}}"></div>
+        <div class="modal-backdrop {{if fade "fade"}} {{if showModal showClass}}" id={{backdropId}} ></div>
       {{/if}}
     </div>
   {{/maybe-in-element}}