Merge pull request #346 from typed-ember/refresh-dependencies

Refresh dependencies with ember-cli-update

Author: dfreeman

.eslintrc.js

@@ -20,6 +20,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',
         'register-ts-node.js',

.gitignore

@@ -1,22 +1,22 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist
-/tmp
-/js
+/dist/
+/tmp/
+/js/
 
 # dependencies
-/node_modules
-/bower_components
+/bower_components/
+/node_modules/
 
 # misc
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage/
 /libpeerconnection.log
-npm-debug.log*
-yarn-error.log
-testem.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
 
 # ember-try
 .node_modules.ember-try/

.npmignore

@@ -1,26 +1,35 @@
-/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
-/test-fixtures
-/ts
-/js/tests
+/ember-cli-build.js
+/testem.js
+/tests/
+/yarn.lock
+.gitkeep
+
+# TS sources and compiled tests
+/ts/
+/js/tests/
+/test-fixtures/
 
-**/.gitkeep
-.bowerrc
-.editorconfig
-.ember-cli
-.gitignore
-.eslintrc.js
-.watchmanconfig
-.travis.yml
-bower.json
-ember-cli-build.js
-testem.js
 
 # ember-try
-.node_modules.ember-try/
-node-tests/
-bower.json.ember-try
-package.json.ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.travis.yml

@@ -15,27 +15,33 @@ env:
   global:
     # See https://git.io/vdao3 for details.
     - JOBS=1
-  matrix:
-    - EMBER_TRY_SCENARIO=defaults
-    - EMBER_TRY_SCENARIO=typescript-release
-    - EMBER_TRY_SCENARIO=typescript-beta
-    - EMBER_TRY_SCENARIO=ember-cli-release
-    - EMBER_TRY_SCENARIO=ember-cli-beta
-
-matrix:
-  fast_finish: true
+
+jobs:
+  fail_fast: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=typescript-beta
     - env: EMBER_TRY_SCENARIO=ember-cli-beta
 
+  include:
+    - stage: "Tests"
+      name: "Tests"
+      script:
+        - test $MD_ONLY && echo "Skipped!" || yarn lint:js
+        - test $MD_ONLY && echo "Skipped!" || yarn ci:prepare
+        - test $MD_ONLY && echo "Skipped!" || yarn ci:test
+    - stage: "Versioned Tests"
+      env: EMBER_TRY_SCENARIO=typescript-release
+    - env: EMBER_TRY_SCENARIO=typescript-beta
+    - env: EMBER_TRY_SCENARIO=ember-cli-release
+    - env: EMBER_TRY_SCENARIO=ember-cli-beta
+
 before_install:
   - bash ./is_md_only.sh && MD_ONLY=true && echo "Only .md files have changed!" || test true
 
 install:
   - test $MD_ONLY && echo "Skipped!" || yarn install
 
 script:
-  - test $MD_ONLY && echo "Skipped!" || yarn lint:js
   # Typecheck and compile the addon, then nuke the TS source so we're testing the code we would publish
   - test $MD_ONLY && echo "Skipped!" || yarn ci:prepare
   # Usually, it's ok to finish the test scenario without reverting

package.json

@@ -6,18 +6,18 @@
     "ember-addon",
     "typescript"
   ],
+  "repository": "https://github.com/typed-ember/ember-cli-typescript.git",
   "license": "MIT",
   "author": "Chris Krycho <[email protected]> (http://www.chriskrycho.com)",
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
   "contributors": [
     "Marius Seritan",
     "David Gardiner",
     "Philip Bjorge"
   ],
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
-  },
-  "repository": "https://github.com/typed-ember/ember-cli-typescript.git",
   "bugs": {
     "url": "https://github.com/typed-ember/ember-cli-typescript"
   },
@@ -27,10 +27,10 @@
     "lint:js": "eslint --ext js,ts .",
     "start": "ember serve",
     "test": "ember test",
+    "test:all": "ember try:each",
     "ci:prepare": "yarn prepublishOnly && rimraf ts",
     "ci:test": "ember test && mocha --recursive js/tests",
     "test:node": "mocha -r register-ts-node 'ts/tests/**/*.{ts,js}'",
-    "test:all": "ember try:each",
     "prepublishOnly": "yarn tsc --project ts --noEmit false",
     "postpublish": "rimraf js"
   },
@@ -52,45 +52,45 @@
     "walk-sync": "^0.3.2"
   },
   "devDependencies": {
+    "@ember/optional-features": "^0.6.3",
     "@types/ember": "2.8.13",
     "@types/ember-qunit": "^3.0.1",
     "@types/node": "^9.6.5",
     "@types/qunit": "^2.0.31",
-    "broccoli-asset-rev": "^2.6.0",
+    "broccoli-asset-rev": "^2.7.0",
     "co": "^4.6.0",
-    "ember-cli": "~3.1.4",
+    "ember-cli": "~3.5.0",
     "ember-cli-app-version": "^3.1.3",
-    "ember-cli-babel": "^6.6.0",
+    "ember-cli-babel": "^6.16.0",
     "ember-cli-blueprint-test-helpers": "^0.18.3",
-    "ember-cli-dependency-checker": "^2.0.0",
-    "ember-cli-eslint": "^4.2.1",
-    "ember-cli-htmlbars": "^2.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
-    "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.3.0",
+    "ember-cli-dependency-checker": "^3.0.0",
+    "ember-cli-eslint": "^4.2.3",
+    "ember-cli-htmlbars": "^3.0.0",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
+    "ember-cli-inject-live-reload": "^1.8.2",
     "ember-cli-release": "^0.2.9",
-    "ember-cli-shims": "^1.2.0",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^2.0.0",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-uglify": "^2.1.0",
     "ember-cli-update": "^0.14.0",
-    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^1.0.0",
+    "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-resolver": "^4.5.0",
-    "ember-source": "~3.1.0",
-    "ember-source-channel-url": "^1.0.1",
-    "ember-try": "^0.2.23",
+    "ember-qunit": "^3.4.1",
+    "ember-resolver": "^5.0.1",
+    "ember-source": "~3.5.0",
+    "ember-try": "^1.0.0",
     "eslint": "^4.17.0",
-    "eslint-plugin-ember": "^5.0.3",
-    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-ember": "^5.2.0",
+    "eslint-plugin-node": "^7.0.1",
     "esprima": "^4.0.0",
     "in-repo-a": "link:tests/dummy/lib/in-repo-a",
     "in-repo-b": "link:tests/dummy/lib/in-repo-b",
     "in-repo-c": "link:tests/dummy/lib/in-repo-c",
-    "loader.js": "^4.2.3",
+    "loader.js": "^4.7.0",
     "mktemp": "^0.4.0",
     "mocha": "^5.0.0",
+    "qunit-dom": "^0.8.0",
     "rimraf": "^2.6.2",
     "testdouble": "^3.5.0",
     "ts-node": "^7.0.1",

tests/dummy/config/optional-features.json

@@ -0,0 +1,3 @@
+{
+  "jquery-integration": false
+}

tests/dummy/lib/in-repo-a/package.json

@@ -4,10 +4,12 @@
   "keywords": [
     "ember-addon"
   ],
-  "dependencies": {
-    "ember-cli-babel": "link:../../../../node_modules/ember-cli-babel"
-  },
   "devDependencies": {
     "ember-cli-typescript": "*"
+  },
+  "ember-addon": {
+    "paths": [
+      "../../../../node_modules/ember-cli-babel"
+    ]
   }
 }

tests/dummy/lib/in-repo-b/package.json

@@ -4,10 +4,12 @@
   "keywords": [
     "ember-addon"
   ],
-  "dependencies": {
-    "ember-cli-babel": "link:../../../../node_modules/ember-cli-babel"
-  },
   "devDependencies": {
     "ember-cli-typescript": "*"
+  },
+  "ember-addon": {
+    "paths": [
+      "../../../../node_modules/ember-cli-babel"
+    ]
   }
 }

tests/dummy/lib/in-repo-c/package.json

@@ -4,10 +4,12 @@
   "keywords": [
     "ember-addon"
   ],
-  "dependencies": {
-    "ember-cli-babel": "link:../../../../node_modules/ember-cli-babel"
-  },
   "devDependencies": {
     "ember-cli-typescript": "*"
+  },
+  "ember-addon": {
+    "paths": [
+      "../../../../node_modules/ember-cli-babel"
+    ]
   }
 }

ts/blueprints/ember-cli-typescript/index.js

@@ -138,7 +138,7 @@ module.exports = {
       );
     }
 
-    if (this._has('ember-cli-qunit')) {
+    if (this._has('ember-cli-qunit') || this._has('ember-qunit')) {
       packages = packages.concat([
         { name: '@types/ember-qunit', target: 'latest' },
         { name: '@types/qunit', target: 'latest' },

ts/tests/blueprints/ember-cli-typescript-test.js

@@ -55,7 +55,7 @@ describe('Acceptance: ember-cli-typescript generator', function() {
         expect(pkgJson.scripts.postpublish).to.be.undefined;
         expect(pkgJson.devDependencies).to.include.all.keys('ember-data');
         expect(pkgJson.devDependencies).to.include.all.keys('@types/ember-data');
-        expect(pkgJson.devDependencies).to.include.all.keys('ember-cli-qunit');
+        expect(pkgJson.devDependencies).to.include.all.keys('ember-qunit');
         expect(pkgJson.devDependencies).to.include.all.keys('@types/ember-qunit', '@types/qunit');
         expect(pkgJson.devDependencies).to.not.have.any.keys('@types/ember-mocha', '@types/mocha');
 
@@ -101,7 +101,7 @@ describe('Acceptance: ember-cli-typescript generator', function() {
         expect(pkgJson.scripts.postpublish).to.equal('ember ts:clean');
         expect(pkgJson.devDependencies).to.not.have.any.keys('ember-data');
         expect(pkgJson.devDependencies).to.not.have.any.keys('@types/ember-data');
-        expect(pkgJson.devDependencies).to.include.all.keys('ember-cli-qunit');
+        expect(pkgJson.devDependencies).to.include.all.keys('ember-qunit');
         expect(pkgJson.devDependencies).to.include.all.keys('@types/ember-qunit', '@types/qunit');
         expect(pkgJson.devDependencies).to.not.have.any.keys('@types/ember-mocha', '@types/mocha');
 
@@ -166,7 +166,7 @@ describe('Acceptance: ember-cli-typescript generator', function() {
           expect(pkgJson.scripts.postpublish).to.be.undefined;
           expect(pkgJson.devDependencies).to.include.all.keys('ember-data');
           expect(pkgJson.devDependencies).to.include.all.keys('@types/ember-data');
-          expect(pkgJson.devDependencies).to.include.all.keys('ember-cli-qunit');
+          expect(pkgJson.devDependencies).to.include.all.keys('ember-qunit');
           expect(pkgJson.devDependencies).to.include.all.keys('@types/ember-qunit', '@types/qunit');
           expect(pkgJson.devDependencies).to.not.have.any.keys(
             '@types/ember-mocha',
@@ -215,7 +215,7 @@ describe('Acceptance: ember-cli-typescript generator', function() {
           expect(pkgJson.scripts.postpublish).to.equal('ember ts:clean');
           expect(pkgJson.devDependencies).to.not.have.any.keys('ember-data');
           expect(pkgJson.devDependencies).to.not.have.any.keys('@types/ember-data');
-          expect(pkgJson.devDependencies).to.include.all.keys('ember-cli-qunit');
+          expect(pkgJson.devDependencies).to.include.all.keys('ember-qunit');
           expect(pkgJson.devDependencies).to.include.all.keys('@types/ember-qunit', '@types/qunit');
           expect(pkgJson.devDependencies).to.not.have.any.keys(
             '@types/ember-mocha',
@@ -372,7 +372,7 @@ describe('Acceptance: ember-cli-typescript generator', function() {
       .emberNew()
       .then(() => helpers.modifyPackages([
         { name: 'ember-cli-mocha', dev: true },
-        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-qunit', delete: true }
       ]))
       .then(() => helpers.emberGenerate(args))
       .then(() => {
@@ -392,7 +392,7 @@ describe('Acceptance: ember-cli-typescript generator', function() {
       .emberNew({ target: 'addon' })
       .then(() => helpers.modifyPackages([
         { name: 'ember-cli-mocha', dev: true },
-        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-qunit', delete: true }
       ]))
       .then(() => helpers.emberGenerate(args))
       .then(() => {