Bower => NPM (TryGhost#972)

no issue

- Convert validator to an npm dependency
  - clean up validator imports
  - fix validator function imports
  - remove unused validator extensions
- Convert devicejs to an npm dependency
- Convert remaining used bower deps to npm deps
- 🔥 Remove bower & unused bower dependencies
- remove globals imports in favor of direct module imports where possible

.eslintrc.js

@@ -10,8 +10,5 @@ module.exports = {
     rules: {
         // disable linting of `this.get` until there's a reliable autofix
         'ghost/ember/use-ember-get-and-set': 'off'
-    },
-    globals: {
-        validator: false
     }
 };

.travis.yml

@@ -30,9 +30,7 @@ before_install:
   - export PATH=$HOME/.yarn/bin:$PATH
 
 install:
-  - yarn global add bower
   - yarn
-  - bower install
 
 before_script:
   - export DISPLAY=:99; sh -e /etc/init.d/xvfb start; sleep 3;

Gruntfile.js

@@ -9,15 +9,10 @@ module.exports = function (grunt) {
     grunt.initConfig({
         clean: {
             built: {
-                src: [
-                    'dist/**'
-                ]
+                src: ['dist/**']
             },
             dependencies: {
-                src: [
-                    'bower_components/**',
-                    'node_modules/**'
-                ]
+                src: ['node_modules/**']
             },
             tmp: {
                 src: ['tmp/**']
@@ -36,10 +31,6 @@ module.exports = function (grunt) {
                 command: 'yarn install'
             },
 
-            'bower-install': {
-                command: 'bower install'
-            },
-
             ember: {
                 command: function (mode) {
                     let liveReloadBaseUrl = grunt.option('live-reload-base-url') || '/ghost/';
@@ -74,6 +65,6 @@ module.exports = function (grunt) {
     });
 
     grunt.registerTask('init', 'Install the client dependencies',
-        ['shell:npm-install', 'shell:bower-install']
+        ['shell:npm-install']
     );
 };

app/components/gh-navitem-url-input.js

@@ -1,4 +1,5 @@
 import TextField from '@ember/component/text-field';
+import validator from 'npm:validator';
 import {InvokeActionMixin} from 'ember-invoke-action';
 import {computed} from '@ember/object';
 import {run} from '@ember/runloop';

app/components/gh-profile-image.js

@@ -1,6 +1,8 @@
 import $ from 'jquery';
 import Component from '@ember/component';
+import md5 from 'npm:blueimp-md5';
 import request from 'ember-ajax/request';
+import validator from 'npm:validator';
 import {htmlSafe} from '@ember/string';
 import {inject as service} from '@ember/service';
 import {task, timeout} from 'ember-concurrency';
@@ -120,9 +122,9 @@ export default Component.extend({
 
         let email = this.get('email');
 
-        if (validator.isEmail(email)) {
+        if (validator.isEmail(email || '')) {
             let size = this.get('size');
-            let gravatarUrl = `//www.gravatar.com/avatar/${window.md5(email)}?s=${size}&d=404`;
+            let gravatarUrl = `//www.gravatar.com/avatar/${md5(email)}?s=${size}&d=404`;
 
             try {
                 // HEAD request is needed otherwise jquery attempts to process

app/controllers/settings/general.js

@@ -2,6 +2,7 @@
 import $ from 'jquery';
 import Controller from '@ember/controller';
 import randomPassword from 'ghost-admin/utils/random-password';
+import validator from 'npm:validator';
 import {
     IMAGE_EXTENSIONS,
     IMAGE_MIME_TYPES

app/controllers/setup/three.js

@@ -2,6 +2,7 @@
 import Controller, {inject as controller} from '@ember/controller';
 import DS from 'ember-data';
 import RSVP from 'rsvp';
+import validator from 'npm:validator';
 import {alias} from '@ember/object/computed';
 import {computed} from '@ember/object';
 import {A as emberA} from '@ember/array';
@@ -43,14 +44,14 @@ export default Controller.extend({
         let ownerEmail = this.get('ownerEmail');
 
         return this.get('usersArray').filter(function (user) {
-            return validator.isEmail(user) && user !== ownerEmail;
+            return validator.isEmail(user || '') && user !== ownerEmail;
         });
     }),
 
     invalidUsersArray: computed('usersArray', 'ownerEmail', function () {
         let ownerEmail = this.get('ownerEmail');
 
-        return this.get('usersArray').reject(user => validator.isEmail(user) || user === ownerEmail);
+        return this.get('usersArray').reject(user => validator.isEmail(user || '') || user === ownerEmail);
     }),
 
     validationResult: computed('invalidUsersArray', function () {

app/controllers/team/user.js

@@ -2,6 +2,7 @@ import Controller from '@ember/controller';
 import Ember from 'ember';
 import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import isNumber from 'ghost-admin/utils/isNumber';
+import validator from 'npm:validator';
 import windowProxy from 'ghost-admin/utils/window-proxy';
 import {alias, and, not, or, readOnly} from '@ember/object/computed';
 import {computed} from '@ember/object';

app/mixins/text-input.js

@@ -1,5 +1,5 @@
-/* global device */
 import Mixin from '@ember/object/mixin';
+import device from 'npm:current-device';
 import {computed} from '@ember/object';
 
 const keyCodes = {

app/mixins/validation-engine.js

@@ -14,14 +14,10 @@ import SlackIntegrationValidator from 'ghost-admin/validators/slack-integration'
 import SubscriberValidator from 'ghost-admin/validators/subscriber';
 import TagSettingsValidator from 'ghost-admin/validators/tag-settings';
 import UserValidator from 'ghost-admin/validators/user';
-import ValidatorExtensions from 'ghost-admin/utils/validator-extensions';
 import {A as emberA, isArray as isEmberArray} from '@ember/array';
 
 const {Errors} = DS;
 
-// our extensions to the validator library
-ValidatorExtensions.init();
-
 /**
 * The class that gets this mixin will receive these properties and functions.
 * It will be able to validate any properties on itself (or the model it passes to validate())

app/styles/app-dark.css

@@ -1,8 +1,3 @@
-/* Stop: Normalize.
-/* ---------------------------------------------------------- */
-@import "../../bower_components/normalize.css/normalize.css";
-
-
 /* Patterns: Groups of Styles
 /* ---------------------------------------------------------- */
 @import "patterns/global.css";

app/styles/app.css

@@ -1,8 +1,3 @@
-/* Stop: Normalize.
-/* ---------------------------------------------------------- */
-@import "../../bower_components/normalize.css/normalize.css";
-
-
 /* Patterns: Groups of Styles
 /* ---------------------------------------------------------- */
 @import "patterns/global.css";

app/utils/random-password.js

@@ -1,4 +1,4 @@
-/* global generatePassword */
+import generatePassword from 'npm:password-generator';
 
 export default function () {
     let word = generatePassword(6);

app/validators/invite-user.js

@@ -1,12 +1,14 @@
 import BaseValidator from './base';
+import validator from 'npm:validator';
+import {isBlank} from '@ember/utils';
 
 export default BaseValidator.create({
     properties: ['email'],
 
     email(model) {
         let email = model.get('email');
 
-        if (validator.empty(email)) {
+        if (isBlank(email)) {
             model.get('errors').add('email', 'Please enter an email.');
             this.invalidate();
         } else if (!validator.isEmail(email)) {

app/validators/nav-item.js

@@ -1,4 +1,6 @@
 import BaseValidator from './base';
+import validator from 'npm:validator';
+import {isBlank} from '@ember/utils';
 
 export default BaseValidator.create({
     properties: ['label', 'url'],
@@ -7,7 +9,7 @@ export default BaseValidator.create({
         let label = model.get('label');
         let hasValidated = model.get('hasValidated');
 
-        if (validator.empty(label)) {
+        if (isBlank(label)) {
             model.get('errors').add('label', 'You must specify a label');
             this.invalidate();
         }
@@ -23,7 +25,7 @@ export default BaseValidator.create({
         /* eslint-enable camelcase */
         let urlRegex = new RegExp(/^(\/|#|[a-zA-Z0-9-]+:)/);
 
-        if (validator.empty(url)) {
+        if (isBlank(url)) {
             model.get('errors').add('url', 'You must specify a URL or relative path');
             this.invalidate();
         } else if (url.match(/\s/) || (!validator.isURL(url, validatorOptions) && !url.match(urlRegex))) {

app/validators/new-user.js

@@ -1,4 +1,6 @@
 import PasswordValidator from 'ghost-admin/validators/password';
+import validator from 'npm:validator';
+import {isBlank} from '@ember/utils';
 
 export default PasswordValidator.extend({
     init() {
@@ -9,7 +11,7 @@ export default PasswordValidator.extend({
     name(model) {
         let name = model.get('name');
 
-        if (!validator.isLength(name, 1)) {
+        if (!validator.isLength(name || '', 1)) {
             model.get('errors').add('name', 'Please enter a name.');
             this.invalidate();
         }
@@ -18,7 +20,7 @@ export default PasswordValidator.extend({
     email(model) {
         let email = model.get('email');
 
-        if (validator.empty(email)) {
+        if (isBlank(email)) {
             model.get('errors').add('email', 'Please enter an email.');
             this.invalidate();
         } else if (!validator.isEmail(email)) {

app/validators/password.js

@@ -1,4 +1,5 @@
 import BaseValidator from './base';
+import validator from 'npm:validator';
 
 const BAD_PASSWORDS = [
     '1234567890',
@@ -63,7 +64,7 @@ export default BaseValidator.extend({
         blogTitle = blogTitle ? blogTitle.trim().toLowerCase() : blogTitle;
 
         // password must be longer than 10 characters
-        if (!validator.isLength(password, 10)) {
+        if (!validator.isLength(password || '', 10)) {
             model.get('errors').add(errorTarget, 'Password must be at least 10 characters long');
             return this.invalidate();
         }

app/validators/post.js

@@ -1,6 +1,7 @@
 import BaseValidator from './base';
 import moment from 'moment';
-import {isEmpty, isPresent} from '@ember/utils';
+import validator from 'npm:validator';
+import {isBlank, isEmpty, isPresent} from '@ember/utils';
 
 export default BaseValidator.create({
     properties: [
@@ -21,12 +22,12 @@ export default BaseValidator.create({
     title(model) {
         let title = model.get('title');
 
-        if (validator.empty(title)) {
+        if (isBlank(title)) {
             model.get('errors').add('title', 'You must specify a title for the post.');
             this.invalidate();
         }
 
-        if (!validator.isLength(title, 0, 255)) {
+        if (!validator.isLength(title || '', 0, 255)) {
             model.get('errors').add('title', 'Title cannot be longer than 255 characters.');
             this.invalidate();
         }
@@ -35,7 +36,7 @@ export default BaseValidator.create({
     customExcerpt(model) {
         let customExcerpt = model.get('customExcerpt');
 
-        if (!validator.isLength(customExcerpt, 0, 300)) {
+        if (!validator.isLength(customExcerpt || '', 0, 300)) {
             model.get('errors').add('customExcerpt', 'Excerpt cannot be longer than 300 characters.');
             this.invalidate();
         }
@@ -53,7 +54,7 @@ export default BaseValidator.create({
     codeinjectionHead(model) {
         let codeinjectionHead = model.get('codeinjectionHead');
 
-        if (!validator.isLength(codeinjectionHead, 0, 65535)) {
+        if (!validator.isLength(codeinjectionHead || '', 0, 65535)) {
             model.get('errors').add('codeinjectionHead', 'Header code cannot be longer than 65535 characters.');
             this.invalidate();
         }
@@ -62,7 +63,7 @@ export default BaseValidator.create({
     metaTitle(model) {
         let metaTitle = model.get('metaTitle');
 
-        if (!validator.isLength(metaTitle, 0, 300)) {
+        if (!validator.isLength(metaTitle || '', 0, 300)) {
             model.get('errors').add('metaTitle', 'Meta Title cannot be longer than 300 characters.');
             this.invalidate();
         }
@@ -71,7 +72,7 @@ export default BaseValidator.create({
     metaDescription(model) {
         let metaDescription = model.get('metaDescription');
 
-        if (!validator.isLength(metaDescription, 0, 500)) {
+        if (!validator.isLength(metaDescription || '', 0, 500)) {
             model.get('errors').add('metaDescription', 'Meta Description cannot be longer than 500 characters.');
             this.invalidate();
         }
@@ -80,7 +81,7 @@ export default BaseValidator.create({
     ogTitle(model) {
         let ogTitle = model.get('ogTitle');
 
-        if (!validator.isLength(ogTitle, 0, 300)) {
+        if (!validator.isLength(ogTitle || '', 0, 300)) {
             model.get('errors').add('ogTitle', 'Facebook Title cannot be longer than 300 characters.');
             this.invalidate();
         }
@@ -89,7 +90,7 @@ export default BaseValidator.create({
     ogDescription(model) {
         let ogDescription = model.get('ogDescription');
 
-        if (!validator.isLength(ogDescription, 0, 500)) {
+        if (!validator.isLength(ogDescription || '', 0, 500)) {
             model.get('errors').add('ogDescription', 'Facebook Description cannot be longer than 500 characters.');
             this.invalidate();
         }
@@ -98,7 +99,7 @@ export default BaseValidator.create({
     twitterTitle(model) {
         let twitterTitle = model.get('twitterTitle');
 
-        if (!validator.isLength(twitterTitle, 0, 300)) {
+        if (!validator.isLength(twitterTitle || '', 0, 300)) {
             model.get('errors').add('twitterTitle', 'Twitter Title cannot be longer than 300 characters.');
             this.invalidate();
         }
@@ -107,7 +108,7 @@ export default BaseValidator.create({
     twitterDescription(model) {
         let twitterDescription = model.get('twitterDescription');
 
-        if (!validator.isLength(twitterDescription, 0, 500)) {
+        if (!validator.isLength(twitterDescription || '', 0, 500)) {
             model.get('errors').add('twitterDescription', 'Twitter Description cannot be longer than 500 characters.');
             this.invalidate();
         }
@@ -149,7 +150,7 @@ export default BaseValidator.create({
         }
 
         // we have a time string but no date string
-        if (validator.empty(publishedAtBlogDate) && !validator.empty(publishedAtBlogTime)) {
+        if (isBlank(publishedAtBlogDate) && !isBlank(publishedAtBlogTime)) {
             model.get('errors').add('publishedAtBlogDate', 'Can\'t be blank');
             return this.invalidate();
         }

app/validators/reset.js

@@ -1,4 +1,6 @@
 import PasswordValidator from 'ghost-admin/validators/password';
+import validator from 'npm:validator';
+import {isBlank} from '@ember/utils';
 
 export default PasswordValidator.create({
     properties: ['newPassword'],
@@ -7,10 +9,10 @@ export default PasswordValidator.create({
         let p1 = model.get('newPassword');
         let p2 = model.get('ne2Password');
 
-        if (validator.empty(p1)) {
+        if (isBlank(p1)) {
             model.get('errors').add('newPassword', 'Please enter a password.');
             this.invalidate();
-        } else if (!validator.equals(p1, p2)) {
+        } else if (!validator.equals(p1, p2 || '')) {
             model.get('errors').add('ne2Password', 'The two new passwords don\'t match.');
             this.invalidate();
         }