Skip to content

Commit be8dd0d

Browse files
committed
Enable ES6/ES2015 goodness
- Remove ES5 parser exception from .eslintrc - Configure Karma to use Babel to transpile ES6 sources to ES5, because PhantomJS does not support ES6 - Upgrade es5-shim to es6-shim
1 parent 450aa84 commit be8dd0d

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

.eslintrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"extends": "loopback",
3-
"parserOptions": {
4-
"ecmaVersion": 5
5-
},
63
"rules": {
74
"max-len": ["error", 100, 4, {
85
"ignoreComments": true,

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* loopback ~ public api
99
*/
1010

11-
var loopback = module.exports = require('./lib/loopback');
12-
var datasourceJuggler = require('loopback-datasource-juggler');
11+
const loopback = module.exports = require('./lib/loopback');
12+
const datasourceJuggler = require('loopback-datasource-juggler');
1313

1414
/**
1515
* Connectors

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
"ejs": "^2.3.1",
4747
"express": "^4.14.0",
4848
"inflection": "^1.6.0",
49+
"isemail": "^1.2.0",
4950
"loopback-connector-remote": "^3.0.0",
5051
"loopback-datasource-juggler": "^3.0.0",
51-
"isemail": "^1.2.0",
5252
"loopback-phase": "^1.2.0",
5353
"nodemailer": "^2.5.0",
5454
"nodemailer-stub-transport": "^1.0.0",
@@ -60,11 +60,12 @@
6060
"underscore.string": "^3.0.3"
6161
},
6262
"devDependencies": {
63+
"babel-preset-es2015": "^6.22.0",
64+
"babelify": "^7.3.0",
6365
"browserify": "^13.1.0",
6466
"chai": "^3.5.0",
6567
"cookie-parser": "^1.3.4",
6668
"dirty-chai": "^1.2.2",
67-
"es5-shim": "^4.1.0",
6869
"eslint-config-loopback": "^7.0.1",
6970
"express-session": "^1.14.0",
7071
"grunt": "^1.0.1",
@@ -78,6 +79,7 @@
7879
"karma": "^1.1.2",
7980
"karma-browserify": "^4.4.2",
8081
"karma-chrome-launcher": "^1.0.1",
82+
"karma-es6-shim": "^1.0.0",
8183
"karma-firefox-launcher": "^1.0.0",
8284
"karma-html2js-preprocessor": "^1.0.0",
8385
"karma-junit-reporter": "~1.0.0",

test/karma.conf.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ module.exports = function(config) {
1616
basePath: '../',
1717

1818
// testing framework to use (jasmine/mocha/qunit/...)
19-
frameworks: ['mocha', 'browserify'],
19+
frameworks: ['es6-shim', 'browserify', 'mocha'],
2020

2121
// list of files / patterns to load in the browser
2222
files: [
23-
'node_modules/es5-shim/es5-shim.js',
2423
'test/loopback.test.js',
2524
'test/model.test.js',
2625
// [rfeng] Browserified common/models/application.js
@@ -63,6 +62,7 @@ module.exports = function(config) {
6362
// Which plugins to enable
6463
plugins: [
6564
'karma-browserify',
65+
'karma-es6-shim',
6666
'karma-mocha',
6767
'karma-phantomjs-launcher',
6868
'karma-chrome-launcher',
@@ -104,7 +104,9 @@ module.exports = function(config) {
104104
'superagent',
105105
'supertest',
106106
],
107-
// transform: ['coffeeify'],
107+
transform: [
108+
['babelify', {presets: 'es2015'}],
109+
],
108110
debug: true,
109111
// noParse: ['jquery'],
110112
watch: true,

0 commit comments

Comments
 (0)