diff --git a/packages/babel/index.js b/packages/babel/index.js index 1eb67a51..998c2407 100644 --- a/packages/babel/index.js +++ b/packages/babel/index.js @@ -1,10 +1,10 @@ 'use strict'; -const transform = require('babel-core').transform; +const transform = require('@babel/core').transform; const readPkg = require('read-pkg-up'); const flatten = require('flatten'); -const BABEL_REGEX = /(^babel-)(preset|plugin)-(.*)/i; +const BABEL_REGEX = /(^@babel\/)(preset|plugin)-(.*)/i; function getBabels() { const pkg = readPkg.sync().pkg; @@ -26,7 +26,7 @@ module.exports = function (task) { cache.forEach(dep => { const segs = BABEL_REGEX.exec(dep); const type = `${segs[2]}s`; - const name = segs[3]; + const name = `@babel/${segs[2]}-${segs[3]}`; opts[type] = opts[type] || []; diff --git a/packages/babel/package.json b/packages/babel/package.json index 3537c538..cdc732c2 100644 --- a/packages/babel/package.json +++ b/packages/babel/package.json @@ -1,6 +1,6 @@ { "name": "@taskr/babel", - "version": "1.1.0", + "version": "1.1.0-next.1", "description": "Babel plugin for Taskr", "repository": "lukeed/taskr", "main": "index.js", @@ -24,13 +24,13 @@ } ], "dependencies": { - "babel-core": "^6.3.0", + "@babel/core": "^7.0.0-beta.42", "flatten": "^1.0.2", "read-pkg-up": "^2.0.0" }, "devDependencies": { + "@babel/preset-es2015": "^7.0.0-beta.42", "@taskr/clear": "^1.1.0", - "babel-preset-es2015": "^6.3.0", "taskr": "^1.1.0" }, "engines": { diff --git a/packages/babel/test/index.js b/packages/babel/test/index.js index e8c8629e..c5513b57 100644 --- a/packages/babel/test/index.js +++ b/packages/babel/test/index.js @@ -22,10 +22,11 @@ test('@taskr/babel', t => { * a(f) { t.ok('babel' in taskr.plugins, 'add the `babel` plugin'); - yield f.source(src).babel({presets: ['es2015']}).target(tmp); + yield f.source(src).babel({presets: ['@babel/preset-es2015']}).target(tmp); const arr = yield f.$.expand(`${tmp}/*`); const str = yield f.$.read(`${tmp}/a.js`, 'utf8'); + t.ok(str.length, 'via `presets`: write new file'); t.equal(arr.length, 1, 'via `presets`: exclude sourcemaps by default'); t.true(str.includes(want), 'via `presets`: transpile to es5 code'); @@ -38,12 +39,13 @@ test('@taskr/babel', t => { const arr = yield f.$.expand(`${tmp}/*`); const str = yield f.$.read(`${tmp}/a.js`, 'utf8'); t.equal(arr.length, 1, 'via `preload`: exclude sourcemaps by default'); + t.true(str.includes(want), 'via `preload`: transpile to es5 code'); yield f.clear(tmp); }, * c(f) { - yield f.source(`${dir}/*.js`).babel({presets: ['es2015'], sourceMaps: true}).target(tmp); + yield f.source(`${dir}/*.js`).babel({presets: ['@babel/preset-es2015'], sourceMaps: true}).target(tmp); const arr = yield f.$.expand(`${tmp}/*`); const str = yield f.$.read(`${tmp}/a.js`, 'utf8'); @@ -54,7 +56,7 @@ test('@taskr/babel', t => { yield f.clear(tmp); }, * d(f) { - yield f.source(`${dir}/*.js`).babel({presets: ['es2015'], sourceMaps: 'inline'}).target(tmp); + yield f.source(`${dir}/*.js`).babel({presets: ['@babel/preset-es2015'], sourceMaps: 'inline'}).target(tmp); const arr = yield f.$.expand(`${tmp}/*`); const str = yield f.$.read(`${tmp}/a.js`, 'utf8'); @@ -65,7 +67,7 @@ test('@taskr/babel', t => { yield f.clear(tmp); }, * e(f) { - yield f.source(`${dir}/*.js`).babel({presets: ['es2015'], sourceMaps: 'both'}).target(tmp); + yield f.source(`${dir}/*.js`).babel({presets: ['@babel/preset-es2015'], sourceMaps: 'both'}).target(tmp); const arr = yield f.$.expand(`${tmp}/*`); const str = yield f.$.read(`${tmp}/a.js`, 'utf8'); @@ -78,7 +80,7 @@ test('@taskr/babel', t => { * f(f) { yield f.source(`${dir}/*.js`).babel({ preload: true, - presets: [['es2015', {modules: 'systemjs'}]] + presets: [['@babel/preset-es2015', {modules: 'systemjs'}]] }).target(tmp); const str = yield f.$.read(`${tmp}/a.js`, 'utf8');