Bring all dependencies inline with each other and stabilize versions

niranjan94 · abhinavk96 · commit cd1a3db6ef3b · 2019-05-24T12:15:56.000+08:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,16 +1,18 @@
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
   parserOptions: {
-    sourceType: "module",
-    allowImportExportEverywhere: false
+    ecmaVersion: 2017,
+    sourceType: 'module'
   },
+  plugins: [
+    'ember'
+  ],
   extends: [
     'eslint:recommended',
     'plugin:ember-suave/recommended'
   ],
   env: {
-    'browser': true
+    browser: true
   },
   rules: {
     'arrow-spacing': 'error',
@@ -74,5 +76,37 @@ module.exports = {
     Uint8Array : true,
     require    : true,
     Promise    : true
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        '.eslintrc.js',
+        '.template-lintrc.js',
+        'ember-cli-build.js',
+        'testem.js',
+        'blueprints/*/index.js',
+        'config/**/*.js',
+        'lib/*/index.js',
+        'server/**/*.js'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+
+        // this can be removed once the following is fixed
+        // https://github.com/mysticatea/eslint-plugin-node/issues/77
+        'node/no-unpublished-require': 'off',
+        'node/no-extraneous-require': 'off'
+      })
+    }
+  ]
 };
diff --git a/app/components/paypal-button.js b/app/components/paypal-button.js
@@ -1,4 +1,4 @@
-import paypal from 'npm:paypal-checkout';
+import paypal from 'paypal-checkout';
 import Component from '@ember/component';
 import { inject as service } from '@ember/service';
 
diff --git a/app/services/loader.js b/app/services/loader.js
@@ -3,8 +3,8 @@ import { getOwner } from '@ember/application';
 import $ from 'jquery';
 import { getErrorMessage } from 'open-event-frontend/utils/errors';
 import { buildUrl } from 'open-event-frontend/utils/url';
-import httpStatus from 'npm:http-status';
-import objectToFormData from 'npm:object-to-formdata';
+import httpStatus from 'http-status';
+import objectToFormData from 'object-to-formdata';
 import fetch from 'fetch';
 import { clone, assign, merge } from 'lodash';
 const bodyAllowedIn = ['PATCH', 'POST', 'PUT'];
diff --git a/app/services/sanitizer.js b/app/services/sanitizer.js
@@ -1,5 +1,5 @@
 import Service from '@ember/service';
-import sanitizeHtml from 'npm:sanitize-html';
+import sanitizeHtml from 'sanitize-html';
 
 export default Service.extend({
 
diff --git a/app/templates/components/widgets/forms/date-picker.hbs b/app/templates/components/widgets/forms/date-picker.hbs
@@ -1,4 +1,4 @@
 {{#if icon}}
   <i class="calendar icon"></i>
 {{/if}}
-{{input type='text' value=value placeholder=placeholder name=name focus-out='onChange'}}
+{{input type='text' value=value placeholder=placeholder name=name focus-out=(action 'onChange')}}
diff --git a/app/utils/colors.js b/app/utils/colors.js
@@ -1,4 +1,4 @@
-import palette from 'npm:google-material-color';
+import palette from 'google-material-color';
 import { random } from 'lodash';
 
 export const getColor = (shades = ['600', '700', '800', '900']) => {
diff --git a/app/utils/url.js b/app/utils/url.js
@@ -1,5 +1,5 @@
-import UrlParser from 'npm:url-parse';
-import queryString from 'npm:query-string';
+import UrlParser from 'url-parse';
+import queryString from 'query-string';
 import { merge, mapValues, isArray } from 'lodash';
 
 /**
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -2,7 +2,7 @@
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 const MergeTrees = require('broccoli-merge-trees');
 const Funnel = require('broccoli-funnel');
-const { browsers } = require('./config/targets');
+const targets = require('./config/targets');
 
 let env = process.env.EMBER_ENV || 'development';
 
@@ -13,13 +13,20 @@ module.exports = function(defaults) {
     },
     storeConfigInMeta : false,
     autoprefixer      : {
-      browsers,
-      cascade: false
+      browsers : targets.browsers,
+      cascade  : false
     },
     minifyHTML: {
       enabled   : false,
       htmlFiles : ['index.html', '404.html']
     },
+    babel: {
+      plugins: [
+        '@babel/plugin-proposal-object-rest-spread'
+      ],
+      targets,
+      sourceMaps: 'inline'
+    },
     fingerprint: {
       enabled          : env === 'production',
       generateAssetMap : true,
diff --git a/package.json b/package.json
@@ -19,103 +19,113 @@
     "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'bower_components', 'junction') } catch (e) { }\""
   },
   "devDependencies": {
+    "@babel/core": "^7.4.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
+    "@babel/plugin-transform-block-scoping": "^7.4.4",
     "@ember/jquery": "^0.6.0",
-    "async": "^2.6.1",
+    "@ember/optional-features": "^0.7.0",
+    "@types/ember": "^3.1.0",
+    "@types/ember-data": "^3.1.7",
+    "@types/rsvp": "^4.0.2",
+    "async": "^2.6.2",
     "babel-eslint": "^8.2.3",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-persistent-filter": "^2.0.0",
     "ember-ajax": "5.0.0",
-    "ember-browserify": "^1.1.13",
-    "ember-cached-shoe": "^0.2.0",
-    "ember-cli": "~3.10.0",
-    "ember-cli-app-version": "^3.0.0",
+    "ember-auto-import": "^1.3.0",
+    "ember-cached-shoe": "^0.2.1",
+    "ember-cli": "~3.9.0",
+    "ember-cli-app-version": "^3.2.0",
     "ember-cli-autoprefixer": "0.8.1",
-    "ember-cli-babel": "^7.1.3",
-    "ember-cli-clipboard": "^0.11.0",
+    "ember-cli-babel": "^7.7.3",
+    "ember-cli-cjs-transform": "^1.3.1",
+    "ember-cli-clipboard": "^0.11.1",
     "ember-cli-code-coverage": "^1.0.0-beta.0",
-    "ember-cli-content-security-policy": "^1.0.0",
-    "ember-cli-dependency-checker": "^3.0.0",
+    "ember-cli-content-security-policy": "^1.1.1",
+    "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-deploy": "^1.0.0",
     "ember-cli-deploy-build": "^1.0.0",
     "ember-cli-deploy-git": "^1.2.0",
     "ember-cli-deploy-html-manifest": "0.0.6",
     "ember-cli-deploy-revision-data": "^1.0.0",
-    "ember-cli-deprecation-workflow": "^1.0.0",
+    "ember-cli-deprecation-workflow": "^1.0.1",
     "ember-cli-document-title": "^0.4.0",
-    "ember-cli-dotenv": "^2.0.0",
+    "ember-cli-dotenv": "^2.2.2",
     "ember-cli-eslint": "^5.1.0",
-    "ember-cli-fastboot": "^2.0.0",
+    "ember-cli-fastboot": "^2.0.4",
     "ember-cli-geo": "^4.0.0",
     "ember-cli-head": "^0.4.1",
     "ember-cli-html-minifier": "^1.0.0",
-    "ember-cli-htmlbars": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^2.0.0",
+    "ember-cli-htmlbars": "^3.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-cli-ifa": "^0.7.0",
     "ember-cli-inject-live-reload": "^1.7.0",
-    "ember-cli-mirage": "^0.4.7",
+    "ember-cli-mirage": "^0.4.15",
     "ember-cli-moment-shim": "^3.7.1",
     "ember-cli-nouislider": "^1.1.0",
-    "ember-cli-pace": "^0.1.0",
+    "ember-cli-pace": "devotox/ember-cli-pace#master",
     "ember-cli-qunit": "^4.1.1",
-    "ember-cli-sass": "^7.1.0",
-    "ember-cli-scss-lint": "^2.2.0",
-    "ember-cli-sentry": "^4.0.0",
+    "ember-cli-sass": "^10.0.0",
+    "ember-cli-scss-lint": "^2.4.1",
+    "ember-cli-sentry": "^4.1.0",
     "ember-cli-shims": "^1.2.0",
     "ember-cli-string-helpers": "^2.0.0",
     "ember-cli-stripe": "^1.0.4",
     "ember-cli-template-lint": "^0.7.6",
     "ember-cli-uglify": "^3.0.0",
-    "ember-composable-helpers": "^2.0.0",
+    "ember-composable-helpers": "^2.3.1",
     "ember-config-service": "^1.0.0",
     "ember-cookies": "^0.4.0",
-    "ember-data": "~3.3.1",
+    "ember-data": "~3.9.3",
     "ember-data-has-many-query": "^0.3.0",
-    "ember-drag-drop": "^0.6.0",
+    "ember-drag-drop": "^0.6.3",
     "ember-exam": "^2.0.2",
     "ember-export-application-global": "^2.0.0",
-    "ember-fetch": "^6.4.0",
+    "ember-fetch": "6.5.1",
     "ember-fullcalendar": "^1.7.0",
     "ember-g-map": "0.0.25",
     "ember-href-to": "3.1.0",
-    "ember-infinity": "^1.3.3",
+    "ember-infinity": "^1.4.5",
     "ember-l10n": "^2.0.4",
     "ember-link-action": "0.1.3",
     "ember-load-initializers": "^2.0.0",
-    "ember-lodash": "^4.17.5",
-    "ember-math-helpers": "^2.8.1",
+    "ember-lodash": "^4.19.4",
+    "ember-math-helpers": "^2.11.1",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-metrics": "^0.13.0",
-    "ember-models-table": "^2.5.0",
-    "ember-moment": "^7.7.0",
-    "ember-notify": "^5.2.1",
+    "ember-models-table": "^2.10.1",
+    "ember-moment": "^7.8.1",
+    "ember-notify": "^5.3.0",
     "ember-print-this": "^1.0.0",
     "ember-resolver": "^5.0.0",
-    "ember-route-action-helper": "^2.0.5",
-    "ember-router-scroll": "1.0.1",
-    "ember-scroll-to": "^0.6.4",
-    "ember-simple-auth": "^1.5.1",
+    "ember-route-action-helper": "^2.0.7",
+    "ember-router-scroll": "1.1.0",
+    "ember-scroll-to": "^0.6.5",
+    "ember-simple-auth": "^1.8.2",
     "ember-simple-auth-token": "^3.0.0",
-    "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/release/shas/50db6dc8001c127e5aeb2d6ddbacf9f9205d1d7b.tgz",
-    "ember-string-helpers": "^1.0.2",
-    "ember-truth-helpers": "^2.0.0",
+    "ember-source": "~3.9.0",
+    "ember-truth-helpers": "^2.1.0",
     "ember-uuid": "^1.0.1",
+    "eslint-plugin-ember": "^6.4.1",
     "eslint-plugin-ember-suave": "^1.0.0",
+    "eslint-plugin-node": "^8.0.1",
     "gettext.js": "git://github.com/Cropster/gettext.js.git#master",
     "google-material-color": "^1.3.1",
-    "http-status": "^1.2.0",
-    "jquery": "^3.3.1",
+    "http-status": "^1.3.2",
+    "jquery": "^3.4.1",
     "loader.js": "^4.7.0",
-    "object-to-formdata": "^1.4.3",
-    "query-string": "^6.3.0",
-    "qunit-dom": "^0.8.0",
-    "sanitize-html": "^1.19.1",
+    "object-to-formdata": "^1.6.4",
+    "query-string": "^6.5.0",
+    "qunit-dom": "^0.8.5",
+    "sanitize-html": "^1.20.1",
+    "sass": "^1.20.1",
     "semantic-ui-ember": "^3.0.3",
     "torii": "^0.10.1",
-    "url-parse": "^1.4.1",
-    "xgettext-template": "^3.4.0"
+    "url-parse": "^1.4.7",
+    "xgettext-template": "^3.4.2"
   },
   "engines": {
-    "node": "^4.5 || 6.* || >= 7.*",
+    "node": "6.* || 8.* || >= 10.*",
     "yarn": ">= 1.0.0"
   },
   "private": true,
@@ -130,11 +140,13 @@
     "@bower_components/semantic-ui-calendar": "mdehoog/semantic-ui-calendar#^0.0.8",
     "@bower_components/tinyColorPicker": "PitPik/tinyColorPicker#^1.1.1",
     "@bower_components/wysihtml": "Voog/wysihtml#^0.5.5",
-    "paypal-checkout": "^4.0.223",
-    "string_decoder": "^1.1.1"
+    "paypal-checkout": "^4.0.268",
+    "string_decoder": "^1.2.0"
   },
   "resolutions": {
-    "ember-cli-babel": "^6.14.1"
+    "@babel/core": "^7.4.4",
+    "caniuse-lite": "^1.0.30000967",
+    "browserslist": "^4.5.6"
   },
   "ember-addon": {
     "paths": [
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import paypal from 'npm:paypal-checkout';`
	`1`	`+import paypal from 'paypal-checkout';`
`2`	`2`	`import Component from '@ember/component';`
`3`	`3`	`import { inject as service } from '@ember/service';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import palette from 'npm:google-material-color';`
	`1`	`+import palette from 'google-material-color';`
`2`	`2`	`import { random } from 'lodash';`
`3`	`3`
`4`	`4`	`export const getColor = (shades = ['600', '700', '800', '900']) => {`