Merge pull request #77 from alexdiliberto/patch-1

alexdiliberto · web-flow · commit e7de75f22ac7 · 2017-08-18T09:13:41.000-04:00
Update ember-themed-syntax, fix computed decorator, remove bower, cli update, ci headless chrome
diff --git a/.bowerrc b/.bowerrc
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -6,8 +6,7 @@ module.exports = {
     sourceType: 'module'
   },
   extends: [
-    'eslint:recommended',
-    'plugin:ember-suave/recommended'
+    'eslint:recommended'
   ],
   env: {
     browser: true,
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,10 @@ node_js:
   - "4"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   yarn: true
@@ -28,12 +32,8 @@ matrix:
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add bower phantomjs-prebuilt
-  - bower --version
-  - phantomjs --version
 
 install:
-  - bower install # TODO: Remove addon's dependency on `bower`
   - yarn install --no-lockfile --non-interactive
 
 script:
diff --git a/addon/components/bulma-button.js b/addon/components/bulma-button.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import layout from '../templates/components/bulma-button';
-import { alias, bool } from 'ember-computed-decorators';
+import { alias, bool } from 'ember-decorators/object/computed';
 import { _colorBindings } from '../constants';
 
 const {
diff --git a/addon/components/bulma-hero-content.js b/addon/components/bulma-hero-content.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import layout from '../templates/components/bulma-hero-content';
-import { alias } from 'ember-computed-decorators';
+import { alias } from 'ember-decorators/object/computed';
 import { _responsiveHelpers } from '../constants';
 
 const {
diff --git a/addon/components/bulma-hero.js b/addon/components/bulma-hero.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import layout from '../templates/components/bulma-hero';
 import { _colorBindings, _responsiveHelpers } from '../constants';
-import { alias } from 'ember-computed-decorators';
+import { alias } from 'ember-decorators/object/computed';
 
 const {
   Component
diff --git a/addon/components/bulma-message.js b/addon/components/bulma-message.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import layout from '../templates/components/bulma-message';
-import { alias } from 'ember-computed-decorators';
+import { alias } from 'ember-decorators/object/computed';
 import { _colorBindings, _responsiveHelpers } from '../constants';
 
 const {
diff --git a/addon/components/bulma-notification.js b/addon/components/bulma-notification.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import layout from '../templates/components/bulma-notification';
-import computed from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
 import { _colorBindings, _responsiveHelpers } from '../constants';
 
 const {
diff --git a/addon/components/bulma-select.js b/addon/components/bulma-select.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import layout from '../templates/components/bulma-select';
-import computed from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
 import { deprecations } from '../utils';
 
 const {
diff --git a/addon/components/bulma-tabs.js b/addon/components/bulma-tabs.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import layout from '../templates/components/bulma-tabs';
-import computed from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
 import { _responsiveHelpers } from '../constants';
 
 const {
diff --git a/addon/components/bulma-tag.js b/addon/components/bulma-tag.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import layout from '../templates/components/bulma-tag';
-import computed from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
 import { _colorBindings, _responsiveHelpers } from '../constants';
 
 const {
diff --git a/blueprints/ember-bulma/index.js b/blueprints/ember-bulma/index.js
@@ -1,6 +1,6 @@
 /* eslint-env node */
 module.exports = {
-  description: 'Installs Bower and NPM dependencies',
+  description: 'Installs NPM dependencies',
 
   normalizeEntityName() {
     // this prevents an error when the entityName is
@@ -9,13 +9,10 @@ module.exports = {
   },
 
   afterInstall() {
-    // NOTE: Currently adding `eslint-plugin-ember-suave` to the consuming app/addon to bypass the following error. This shouldn't be a necessary step:
-    // Error: Failed to load plugin ember-suave: Cannot find module 'eslint-plugin-ember-suave'
     return this.addPackagesToProject(
       [
         { name: 'bulma', target: '^0.5.0' },
-        { name: 'ember-cli-sass', target: '~6.1.2' },
-        { name: 'eslint-plugin-ember-suave', target: '~1.0.0' }
+        { name: 'ember-cli-sass', target: '^6.1.3' }
       ]
     );
   }
diff --git a/bower.json b/bower.json
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -11,8 +11,6 @@ module.exports = function(defaults) {
     }
   });
 
-  app.import('bower_components/highlightjs/highlight.pack.min.js');
-
   /*
     This build file specifies the options for the dummy test app of this
     addon, located in `/tests/dummy`
diff --git a/package.json b/package.json
@@ -47,10 +47,11 @@
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "broccoli-asset-rev": "^2.4.5",
     "bulma": "^0.5.0",
+    "code-highlight-linenums": "^0.2.1",
     "commitizen": "^2.9.6",
     "cz-customizable": "^5.0.0",
     "ember-ajax": "^3.0.0",
-    "ember-cli": "~2.14.1",
+    "ember-cli": "~2.14.2",
     "ember-cli-content-security-policy": "^0.6.0",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-eslint": "^3.0.0",
@@ -62,13 +63,14 @@
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-composable-helpers": "~2.0.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
+    "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.0.0",
     "ember-source": "~2.14.1",
-    "ember-themed-syntax": "0.0.7",
-    "eslint-plugin-ember-suave": "^1.0.0",
+    "ember-themed-syntax": "^0.1.1",
+    "highlightjs": "^9.10.0",
+    "hljs-themes": "^1.0.0",
     "husky": "^0.14.3",
     "loader.js": "^4.2.3",
     "semantic-release": "^6.3.6"
diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js
@@ -1,8 +1,5 @@
 module.exports = {
   env: {
     embertest: true
-  },
-  rules: {
-    'ember-suave/no-direct-property-access': 'off'
   }
 };
diff --git a/tests/dummy/app/controllers/application.js b/tests/dummy/app/controllers/application.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import computed from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
 
 const {
   Controller,
diff --git a/tests/dummy/app/controllers/uicomponents/panel.js b/tests/dummy/app/controllers/uicomponents/panel.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import computed from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
 import { fromPOJA } from './../../utils';
 
 const { set } = Ember;
diff --git a/tests/dummy/app/controllers/uicomponents/tabs.js b/tests/dummy/app/controllers/uicomponents/tabs.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
-import computed, { alias } from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
+import { alias } from 'ember-decorators/object/computed';
 
 export default Ember.Controller.extend({
   /*
diff --git a/tests/dummy/app/controllers/uielements/form-controls.js b/tests/dummy/app/controllers/uielements/form-controls.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
-import computed, { lte } from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
+import { lte } from 'ember-decorators/object/computed';
 
 const {
   Controller,
diff --git a/tests/dummy/app/controllers/uielements/messages.js b/tests/dummy/app/controllers/uielements/messages.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import computed from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
 
 export default Ember.Controller.extend({
   @computed()
diff --git a/tests/dummy/app/controllers/uielements/notifications.js b/tests/dummy/app/controllers/uielements/notifications.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import computed from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
 
 const { run } = Ember;
 const { later } = run;
diff --git a/tests/dummy/app/controllers/uielements/tags.js b/tests/dummy/app/controllers/uielements/tags.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import computed from 'ember-computed-decorators';
+import { computed } from 'ember-decorators/object';
 
 export default Ember.Controller.extend({
   @computed()
diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -12,6 +12,7 @@
     <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
     <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+
     {{content-for "head-footer"}}
   </head>
   <body>
diff --git a/tests/dummy/app/routes/application.js b/tests/dummy/app/routes/application.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import { alias } from 'ember-computed-decorators';
+import { alias } from 'ember-decorators/object/computed';
 
 const {
   Route
diff --git a/yarn.lock b/yarn.lock
