Merge pull request #141 from PoslinskiNet/ember-3.5

PoslinskiNet · web-flow · commit 5b51d88e4afd · 2018-12-29T22:53:44.000+01:00
Ember 3.6 upgrade
diff --git a/.eslintignore b/.eslintignore
@@ -8,9 +8,13 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
+!.*
 
 # ember-try
 /.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -22,6 +22,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,22 +1,30 @@
-/bower_components
+# 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
-/dist
-/tests
-/tmp
-**/.gitkeep
-.bowerrc
-.editorconfig
-.ember-cli
-.eslintrc.js
-.gitignore
-.watchmanconfig
-.travis.yml
-bower.json
-ember-cli-build.js
-testem.js
-yarn.lock
+/CONTRIBUTING.md
+/ember-cli-build.js
+/testem.js
+/tests/
+/yarn.lock
+.gitkeep
 
 # ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: 'recommended'
+};
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,13 @@ env:
   global:
     # See https://git.io/vdao3 for details.
     - JOBS=1
-  
+
+branches:
+  only:
+    - master
+    # npm version tags
+    - /^v\d+\.\d+\.\d+/
+
 jobs:
   fail_fast: true
   allow_failures:
@@ -31,18 +37,19 @@ jobs:
     - stage: "Tests"
       name: "Tests"
       script:
+        # - npm run lint:hbs
         - npm run lint:js
         - npm 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-lts-2.12
-    - env: EMBER_TRY_SCENARIO=ember-lts-2.16
+      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
 
 before_install:
   - npm config set spin false
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,26 @@
+# How To Contribute
+
+## Installation
+
+* `git clone git@github.com:PoslinskiNet/ember-introjs.git`
+* `cd ember-introjs`
+* `npm install`
+
+## Linting
+
+* `npm run lint:hbs`
+* `npm run lint:js`
+* `npm run lint:js -- --fix`
+
+## Running tests
+
+* `ember test` – Runs the test suite on the current Ember version
+* `ember test --server` – Runs the test suite in "watch mode"
+* `ember try:each` – Runs the test suite against multiple Ember versions
+
+## Running the dummy application
+
+* `ember serve`
+* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Installation
 ### 1st option (recommended)
 #### Use `intro-js/step` component as a wrapper
 
-```hbs
+```handlebars
 {{#intro-js/step step=1 intro="Step Component"}}
   <h1>Hello!</h1>
 {{/intro-js/step}}
@@ -197,19 +197,6 @@ To use them, first import them in your `tests/test-helper.js` file:
 import './helpers/ember-introjs';
 ```
 
-### Running tests
-
-* `ember test` – Runs the test suite on the current Ember version
-* `ember test --server` – Runs the test suite in "watch mode"
-* `ember try:each` – Runs the test suite against multiple Ember versions
-
-### Running the dummy application
-
-* `ember serve`
-* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
-
-For more information on using ember-cli, visit [http://www.ember-cli.com/](http://www.ember-cli.com/).
-
 ## LICENSE
 
 See the LICENSE file included in this repository.
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -10,26 +10,26 @@ module.exports = function() {
   ]).then((urls) => {
     return {
       scenarios: [
-        {
-          name: 'ember-lts-2.12',
-          npm: {
-            devDependencies: {
-              'ember-source': '~2.12.0'
-            }
-          }
-        },
         {
           name: 'ember-lts-2.16',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
+          },
           npm: {
             devDependencies: {
+              '@ember/jquery': '^0.5.1',
               'ember-source': '~2.16.0'
             }
           }
         },
         {
           name: 'ember-lts-2.18',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
+          },
           npm: {
             devDependencies: {
+              '@ember/jquery': '^0.5.1',
               'ember-source': '~2.18.0'
             }
           }
@@ -59,9 +59,16 @@ module.exports = function() {
           }
         },
         {
-          name: 'ember-default',
+          name: 'ember-default-with-jquery',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({
+              'jquery-integration': true
+            })
+          },
           npm: {
-            devDependencies: {}
+            devDependencies: {
+              '@ember/jquery': '^0.5.1'
+            }
           }
         }
       ]
diff --git a/index.js b/index.js
@@ -6,7 +6,7 @@ const Funnel = require('broccoli-funnel');
 const mergeTrees = require('broccoli-merge-trees');
 
 module.exports = {
-  name: 'ember-introjs',
+  name: require('./package').name,
 
   included(app) {
     this._super.included(app);
@@ -31,5 +31,5 @@ module.exports = {
     });
 
     return tree ? new mergeTrees([tree, introJsTree]) : introJsTree;
-  },
-};
+  }
+}
diff --git a/jsconfig.json b/jsconfig.json
@@ -0,0 +1 @@
+{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/tests/dummy/config/optional-features.json b/tests/dummy/config/optional-features.json

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ module.exports = {`
`22`	`22`	`// node files`
`23`	`23`	`{`
`24`	`24`	`files: [`
	`25`	`+ '.eslintrc.js',`
	`26`	`+ '.template-lintrc.js',`
`25`	`27`	`'ember-cli-build.js',`
`26`	`28`	`'index.js',`
`27`	`29`	`'testem.js',`
Original file line number	Diff line number	Diff line change
`@@ -10,26 +10,26 @@ module.exports = function() {`
`10`	`10`	`]).then((urls) => {`
`11`	`11`	`return {`
`12`	`12`	`scenarios: [`
`13`		`- {`
`14`		`- name: 'ember-lts-2.12',`
`15`		`- npm: {`
`16`		`- devDependencies: {`
`17`		`- 'ember-source': '~2.12.0'`
`18`		`- }`
`19`		`- }`
`20`		`- },`
`21`	`13`	`{`
`22`	`14`	`name: 'ember-lts-2.16',`
	`15`	`+ env: {`
	`16`	`+ EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })`
	`17`	`+ },`
`23`	`18`	`npm: {`
`24`	`19`	`devDependencies: {`
	`20`	`+ '@ember/jquery': '^0.5.1',`
`25`	`21`	`'ember-source': '~2.16.0'`
`26`	`22`	`}`
`27`	`23`	`}`
`28`	`24`	`},`
`29`	`25`	`{`
`30`	`26`	`name: 'ember-lts-2.18',`
	`27`	`+ env: {`
	`28`	`+ EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })`
	`29`	`+ },`
`31`	`30`	`npm: {`
`32`	`31`	`devDependencies: {`
	`32`	`+ '@ember/jquery': '^0.5.1',`
`33`	`33`	`'ember-source': '~2.18.0'`
`34`	`34`	`}`
`35`	`35`	`}`
`@@ -59,9 +59,16 @@ module.exports = function() {`
`59`	`59`	`}`
`60`	`60`	`},`
`61`	`61`	`{`
`62`		`- name: 'ember-default',`
	`62`	`+ name: 'ember-default-with-jquery',`
	`63`	`+ env: {`
	`64`	`+ EMBER_OPTIONAL_FEATURES: JSON.stringify({`
	`65`	`+ 'jquery-integration': true`
	`66`	`+ })`
	`67`	`+ },`
`63`	`68`	`npm: {`
`64`		`- devDependencies: {}`
	`69`	`+ devDependencies: {`
	`70`	`+ '@ember/jquery': '^0.5.1'`
	`71`	`+ }`
`65`	`72`	`}`
`66`	`73`	`}`
`67`	`74`	`]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]}`