Skip to content

Update to Babel 7.x #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukeed merged 3 commits into from
Jul 11, 2019
Merged

Update to Babel 7.x #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df204d7
Update to Babel 7.x
benedyktdryl Nov 30, 2017
026b616
upgrade babel deps to beta-42
lukeed Mar 24, 2018
405c83a
set version: 1.1.0-next.1
lukeed Mar 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/babel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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] || [];

Expand Down
6 changes: 3 additions & 3 deletions packages/babel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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": {
Expand Down
12 changes: 7 additions & 5 deletions packages/babel/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand Down