Skip to content

Commit 52ffb7a

Browse files
author
Lenny Burdette
committed
chore: update from babel5 to babel6
Upgrading to babel6 allows us to use the babel-plugin-debug-macros plugin in a future change. Prep work for ember-cli#114
1 parent 094e20b commit 52ffb7a

File tree

4 files changed

+209
-41
lines changed

4 files changed

+209
-41
lines changed

build.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
var babel = require('babel-core');
44
var transform = babel.transform;
55
var fs = require('fs');
6-
var stripHeimdall = require('babel5-plugin-strip-heimdall');
76
var mkdirp = require('mkdirp').sync;
87

98
mkdirp('./dist/loader');
109
var source = fs.readFileSync('./lib/loader/loader.js', 'utf8');
1110
var instrumented = transform(source, {
12-
whitelist: ['es6.destructuring']
11+
plugins: ['transform-es2015-destructuring']
1312
}).code;
1413

1514
var stripped = transform(source, {
16-
plugins: [stripHeimdall],
17-
whitelist: ['es6.destructuring']
15+
plugins: [
16+
'transform-es2015-destructuring',
17+
'babel6-plugin-strip-heimdall'
18+
],
1819
}).code;
1920

2021
fs.writeFileSync('./dist/loader/loader.instrument.js', instrumented);

lib/loader/loader.js

+10-22
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,16 @@ var loader, define, requireModule, require, requirejs;
44
'use strict';
55

66
var heimdall = global.heimdall;
7-
var {
8-
define: __define,
9-
require: __require,
10-
exports: __exports,
11-
findModule: __findModule,
12-
resolve: __resolve,
13-
reify,
14-
findDeps,
15-
modules,
16-
resolveRelative,
17-
pendingQueueLength
18-
} = heimdall.registerMonitor('loaderjs',
19-
'define',
20-
'require',
21-
'reify',
22-
'findDeps',
23-
'modules',
24-
'exports',
25-
'resolve',
26-
'resolveRelative',
27-
'findModule',
28-
'pendingQueueLength');
7+
var __define = heimdall.registerMonitor('loaderjs', 'define');
8+
var __exports = heimdall.registerMonitor('loaderjs', 'exports');
9+
var __findModule = heimdall.registerMonitor('loaderjs', 'findModule');
10+
var __require = heimdall.registerMonitor('loaderjs', 'require');
11+
var __resolve = heimdall.registerMonitor('loaderjs', 'resolve');
12+
var findDeps = heimdall.registerMonitor('loaderjs', 'findDeps');
13+
var modules = heimdall.registerMonitor('loaderjs', 'modules');
14+
var pendingQueueLength = heimdall.registerMonitor('loaderjs', 'pendingQueueLength');
15+
var reify = heimdall.registerMonitor('loaderjs', 'reify');
16+
var resolveRelative = heimdall.registerMonitor('loaderjs', 'resolveRelative');
2917

3018
function dict() {
3119
var obj = Object.create(null);

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
"dependencies": {},
1010
"devDependencies": {
1111
"ara": "0.0.3",
12-
"babel-core": "^5.0.0",
13-
"babel5-plugin-strip-heimdall": "^5.0.2",
12+
"babel-core": "^6.25.0",
13+
"babel-plugin-transform-es2015-destructuring": "^6.23.0",
14+
"babel6-plugin-strip-heimdall": "^6.0.1",
1415
"heimdalljs": "^0.3.2",
1516
"jscs": "^2.11.0",
1617
"jshint": "^2.9.2",

0 commit comments

Comments
 (0)