Skip to content

Commit

Permalink
Update Babel deps (#577)
Browse files Browse the repository at this point in the history
  • Loading branch information
staylor committed Jan 23, 2019
1 parent 3d06cb3 commit 48fac54
Show file tree
Hide file tree
Showing 36 changed files with 41,247 additions and 7,697 deletions.
10,239 changes: 4,916 additions & 5,323 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
},
"devDependencies": {
"lerna": "^2.0.0",
"eslint-config-kyt": "file:packages/eslint-config-kyt"
"eslint-config-kyt": "file:packages/eslint-config-kyt",
"eslint-plugin-kyt": "file:packages/eslint-plugin-kyt"
},
"dependencies": {}
}
7 changes: 4 additions & 3 deletions packages/babel-preset-kyt-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,17 @@ _(see [documentation](https://babeljs.io/docs/plugins/#plugin-preset-options) fo
- `client`
```
modules: false,
useBuiltIns: true,
useBuiltIns: 'entry',
forceAllTransforms: true,
targets: {
uglify: true,
browsers: ['>1%', 'last 4 versions', 'not ie < 11'],
},
```
- `server`
```
modules: false,
useBuiltIns: true,
useBuiltIns: 'entry',
forceAllTransforms: true,
targets: {
node: 'current'
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,23 @@

exports[`babel-preset-kyt-core should load default presets and plugins 1`] = `
Object {
"env": Object {
"test": Object {
"plugins": Array [
Array [
"commonjs",
Object {
"loose": true,
},
],
],
},
},
"plugins": Array [
"import",
],
"presets": Array [
Array [
"env",
Object {
"forceAllTransforms": true,
"modules": false,
"targets": Object {
"browsers": Array [
">1%",
"last 4 versions",
"not ie < 11",
],
"uglify": true,
},
"useBuiltIns": true,
"useBuiltIns": "entry",
},
],
],
Expand Down
21 changes: 10 additions & 11 deletions packages/babel-preset-kyt-core/lib/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
/* eslint-disable global-require */

jest.setMock('babel-preset-env', 'env');
jest.setMock('babel-plugin-transform-runtime', 'runtime');
jest.setMock('babel-plugin-transform-es2015-modules-commonjs', 'commonjs');
jest.setMock('babel-plugin-syntax-dynamic-import', 'import');
jest.setMock('@babel/preset-env', 'env');
jest.setMock('@babel/plugin-transform-runtime', 'runtime');
jest.setMock('@babel/plugin-syntax-dynamic-import', 'import');
jest.setMock('babel-plugin-dynamic-import-node', 'import-node');

describe('babel-preset-kyt-core', () => {
it('should load default presets and plugins', () => {
const presetKytCore = require('../index.js');
const presetKytCore = require('..');
expect(presetKytCore()).toMatchSnapshot();
});

it('should use default server preset-env configuration when KYT_ENV_TYPE=server', () => {
process.env.KYT_ENV_TYPE = 'server';
const presetKytCore = require('../index.js');
const presetKytCore = require('..');
const config = presetKytCore();
expect(config.presets[0][1].targets.node).toEqual('current');
});

it('should override default preset-env configuration with `envOptions` when KYT_ENV_TYPE=client', () => {
process.env.KYT_ENV_TYPE = 'client';
const presetKytCore = require('../index.js');
const presetKytCore = require('..');
const config = presetKytCore(
{},
{
Expand All @@ -33,26 +32,26 @@ describe('babel-preset-kyt-core', () => {

it('should override default preset-env configuration with `envOptions` when KYT_ENV_TYPE=server', () => {
process.env.KYT_ENV_TYPE = 'server';
const presetKytCore = require('../index.js');
const presetKytCore = require('..');
const config = presetKytCore({}, { envOptions: { server: { targets: { node: false } } } });
expect(config.presets[0][1].targets.node).toEqual(false);
});

it('should support an `includeRuntime` option', () => {
const presetKytCore = require('../index.js');
const presetKytCore = require('..');
const config = presetKytCore({}, { includeRuntime: true });
expect(config.plugins[0]).toEqual('runtime');
});

it('should include a dynamic import plugin', () => {
const presetKytCore = require('../index.js');
const presetKytCore = require('..');
const config = presetKytCore();
expect(config.plugins[0]).toEqual('import');
});

it('should include a import node plugin when KYT_ENV_TYPE=test', () => {
process.env.KYT_ENV_TYPE = 'test';
const presetKytCore = require('../index.js');
const presetKytCore = require('..');
const config = presetKytCore();
expect(config.plugins[1]).toEqual('import-node');
});
Expand Down
20 changes: 7 additions & 13 deletions packages/babel-preset-kyt-core/lib/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/* eslint-disable vars-on-top */

var babelPresetEnv = require('babel-preset-env');
var babelTransformRuntime = require('babel-plugin-transform-runtime');
var babelSyntaxDynamicImport = require('babel-plugin-syntax-dynamic-import');
var babelTransformModules = require('babel-plugin-transform-es2015-modules-commonjs');
var babelPresetEnv = require('@babel/preset-env');
var babelTransformRuntime = require('@babel/plugin-transform-runtime');
var babelSyntaxDynamicImport = require('@babel/plugin-syntax-dynamic-import');
var babelDynamicImportNode = require('babel-plugin-dynamic-import-node');
var merge = require('lodash.merge');

Expand All @@ -14,16 +13,17 @@ module.exports = function getPresetCore(context, opts) {

var clientEnvOptions = {
modules: false,
useBuiltIns: true,
useBuiltIns: 'entry',
forceAllTransforms: true,
targets: {
uglify: true,
browsers: ['>1%', 'last 4 versions', 'not ie < 11'],
},
};

var serverEnvOptions = {
modules: false,
useBuiltIns: true,
useBuiltIns: 'entry',
forceAllTransforms: true,
targets: {
node: 'current',
},
Expand Down Expand Up @@ -63,11 +63,5 @@ module.exports = function getPresetCore(context, opts) {
opts.includeRuntime === true && babelTransformRuntime,
process.env.KYT_ENV_TYPE === 'test' ? babelDynamicImportNode : babelSyntaxDynamicImport,
].filter(Boolean),

env: {
test: {
plugins: [[babelTransformModules, { loose: true }]],
},
},
};
};
Loading

0 comments on commit 48fac54

Please sign in to comment.