Merge pull request #250 from internet4000/ember-auto-import

Use ember-auto-import
internet4000 · Aug 6, 2018 · 3eaaf00 · 3eaaf00
2 parents f1aaebd + ba0ffec
commit 3eaaf00
Show file tree

Hide file tree

Showing 13 changed files with 730 additions and 500 deletions.
diff --git a/app/app.js b/app/app.js
@@ -5,8 +5,8 @@ import config from './config/environment';
 import RSVP from 'rsvp';
 import LinkComponent from '@ember/routing/link-component';
 import {debug} from '@ember/debug'
-import 'npm:lazysizes/plugins/attrchange/ls.attrchange';
-import 'npm:lazysizes';
+import 'lazysizes/plugins/attrchange/ls.attrchange';
+import 'lazysizes';
 
 const App = Application.extend({
 	rootElement: '#Radio4000',

diff --git a/app/components/account-provider-link/component.js b/app/components/account-provider-link/component.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import firebase from 'npm:firebase';
+import firebase from 'firebase';
 
 const {Component, get} = Ember;
 

diff --git a/app/components/channel-header/component.js b/app/components/channel-header/component.js
@@ -1,7 +1,7 @@
 /* eslint ember/use-brace-expansion:0 */
 import Ember from 'ember';
-import addMonths from 'npm:date-fns/add_months';
-import isAfter from 'npm:date-fns/is_after';
+import addMonths from 'date-fns/add_months';
+import isAfter from 'date-fns/is_after';
 
 const {
 	Component,

diff --git a/app/components/x-playback/component.js b/app/components/x-playback/component.js
@@ -4,7 +4,7 @@ import Ember from 'ember';
 // 1- comment out the following `import`
 // 2- comment in the `script` tag in the `template.hbs`
 // cheers
-import 'npm:radio4000-player';
+import 'radio4000-player';
 
 const {Component, get, inject, computed} = Ember;
 

diff --git a/app/helpers/time-ago.js b/app/helpers/time-ago.js
@@ -1,7 +1,7 @@
 import Ember from 'ember';
-import addHours from 'npm:date-fns/add_hours';
-import differenceInHours from 'npm:date-fns/difference_in_hours';
-import distanceInWordsToNow from 'npm:date-fns/distance_in_words_to_now';
+import addHours from 'date-fns/add_hours';
+import differenceInHours from 'date-fns/difference_in_hours';
+import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
 
 // Accepts a Date object or Number timestamp
 // Returns a string like "x days ago" or "x months ago"
@@ -16,4 +16,3 @@ export function timeAgo([date]) {
 }
 
 export default Ember.Helper.helper(timeAgo);
-
diff --git a/app/index.html b/app/index.html
@@ -14,22 +14,14 @@
 	{{content-for "head"}}
 	<link rel="preload" as="font" href="https://res.cloudinary.com/radio4000/raw/upload/v1492541388/maisonneueweb-book_ee98sm.woff2" type="font/woff2" crossorigin />
 	<link rel="preload" as="font" href="https://res.cloudinary.com/radio4000/raw/upload/v1492541388/maisonneueweb-bold_rvmbzr.woff2" type="font/woff2" crossorigin />
-	<!-- <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css"> -->
-	<!-- <link integrity="" rel="stylesheet" href="{{rootURL}}assets/radio4000.css"> -->
-	{{content-for "concat-css"}}
+	<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+	<link integrity="" rel="stylesheet" href="{{rootURL}}assets/radio4000.css">
 	{{content-for "head-footer"}}
 </head>
 <body>
 	{{content-for "body"}}
 
 	<div id="Radio4000" class="Radio4000"></div>
-	<noscript>Sorry, to use Radio4000 you need to enable JavaScript in your browser.</noscript>
-
-	<!-- <script src="{{rootURL}}assets/vendor.js"></script> -->
-	<!-- <script src="{{rootURL}}assets/radio4000.js"></script> -->
-	{{content-for "concat-js"}}
-
-	{{content-for "body-footer"}}
 
 	<div class="DummyApp DummyApp--hidden">
 		<!-- a dummy app that appears independently from Ember and is removed by ember asap -->
@@ -102,5 +94,11 @@
 		</div>
 	</div>
 
+	<noscript>Sorry, to use Radio4000 you need to enable JavaScript in your browser.</noscript>
+	<script src="{{rootURL}}assets/vendor.js"></script>
+	<script src="{{rootURL}}assets/radio4000.js" async></script>
+
+	{{content-for "body-footer"}}
+
 </body>
 </html>
diff --git a/app/models/track.js b/app/models/track.js
@@ -5,7 +5,7 @@ import {task} from 'ember-concurrency';
 import {validator, buildValidations} from 'ember-cp-validations';
 import youtubeUrlToId from 'radio4000/utils/youtube-url-to-id';
 import {fetchTrackAvailability} from 'radio4000/utils/youtube-api';
-import format from 'npm:date-fns/format';
+import format from 'date-fns/format';
 
 const {Model, attr, belongsTo} = DS;
 const {get, set, computed} = Ember;

diff --git a/app/services/ui-states.js b/app/services/ui-states.js
@@ -1,6 +1,6 @@
 /* global document */
 import Ember from 'ember';
-import Cookies from 'npm:js-cookie';
+import Cookies from 'js-cookie';
 
 const {Service, computed, get, set, on} = Ember;
 

diff --git a/app/settings/account/controller.js b/app/settings/account/controller.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import firebase from 'npm:firebase';
+import firebase from 'firebase';
 
 const {Controller, inject, get, set, computed, debug} = Ember;
 

diff --git a/app/utils/youtube-url-to-id.js b/app/utils/youtube-url-to-id.js
@@ -1,4 +1,4 @@
-import youtubeRegex from 'npm:youtube-regex';
+import youtubeRegex from 'youtube-regex';
 
 export default function youtubeUrlToId(url) {
 	const results = youtubeRegex().exec(url);

diff --git a/app/validators/youtube-url.js b/app/validators/youtube-url.js
@@ -1,5 +1,5 @@
 import BaseValidator from 'ember-cp-validations/validators/base';
-import youtubeRegex from 'npm:youtube-regex';
+import youtubeRegex from 'youtube-regex';
 
 const YoutubeUrl = BaseValidator.extend({
 	validate(value) {

diff --git a/package.json b/package.json
@@ -12,8 +12,8 @@
   "devDependencies": {
     "autoprefixer": "^7.1.6",
     "broccoli-asset-rev": "^2.7.0",
+    "ember-auto-import": "^1.2.6",
     "ember-awesome-macros": "^1.0.0",
-    "ember-browserify": "^1.1.11",
     "ember-cli": "~2.18.2",
     "ember-cli-app-version": "^3.1.0",
     "ember-cli-babel": "^6.9.0",
@@ -53,7 +53,6 @@
   },
   "dependencies": {
     "date-fns": "^1.29.0",
-    "ember-cli-concat": "^1.3.0",
     "ember-cli-stripe": "^1.0.4",
     "ember-fetch": "^3.4.5",
     "ember-href-to": "^1.15.1",