Skip to content

Commit 9126282

Browse files
ljharbljharb
committed
[Tests] [Dev Deps] Update to babel 7, use babel-eslint 
1 parent 2256635 commit 9126282

File tree

51 files changed

+145
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+145
-93
lines changed

‎.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"env": {
55
"node": true,
66
},
7+
"parser": "babel-eslint",
78
"rules": {
89
"id-length": 0,
910
"react/no-find-dom-node": 1,

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
package-lock=false
2+
update-notifier=false

‎.nycrc

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"packages/*/node_modules"
1616
],
1717
"require": [
18-
"babel-register"
1918
],
2019
"reporter": [
2120
"text",

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ install:
99
- 'npm run clean-local-npm'
1010
before_script:
1111
- './node_modules/.bin/lerna bootstrap'
12-
- './node_modules/.bin/lerna run build'
13-
- 'sh install-relevant-react.sh'
12+
- 'nvm exec node ./node_modules/.bin/lerna run build'
13+
- 'nvm exec node sh install-relevant-react.sh'
1414
- 'if [ -n "${KARMA-}" ]; then export CHROME_BIN=chromium-browser; export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; fi'
1515
script:
1616
- 'if [ -n "${LINT-}" ]; then npm run lint; elif [ -n "${KARMA-}" ]; then npm run test:karma -- --single-run; elif [ -n "${REACT-}" ]; then npm run travis; else false ; fi'

‎karma.conf.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
'use strict';
44

5-
require('babel-register');
5+
require('@babel/register');
66

77
var IgnorePlugin = require('webpack').IgnorePlugin;
8-
var is = require('./packages/enzyme-test-suite/test/_helpers/version').is;
8+
var is = require('./packages/enzyme-test-suite/build/_helpers/version').is;
99

1010
function getPlugins() {
1111
const adapter13 = new IgnorePlugin(/enzyme-adapter-react-13$/);
@@ -77,11 +77,11 @@ module.exports = function karma(config) {
7777
reporters: ['dots'],
7878

7979
files: [
80-
'packages/enzyme-test-suite/test/*.{jsx,js}',
80+
'packages/enzyme-test-suite/build/*.js',
8181
],
8282

8383
exclude: [
84-
'packages/enzyme-test-suite/test/_helpers/index.jsx',
84+
'packages/enzyme-test-suite/build/_helpers/index.js',
8585
],
8686

8787
browsers: [
@@ -90,7 +90,7 @@ module.exports = function karma(config) {
9090
],
9191

9292
preprocessors: {
93-
'packages/enzyme-test-suite/test/*.{jsx,js}': ['webpack', 'sourcemap'],
93+
'packages/enzyme-test-suite/build/*.js': ['webpack', 'sourcemap'],
9494
},
9595

9696
webpack: {

‎package.json

+10-11
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"pretest": "lerna run lint",
2323
"test": "npm run test:only",
2424
"pretest:only": "npm run build",
25-
"test:only": "mocha --recursive packages/enzyme-test-suite/test",
25+
"test:only": "mocha --recursive packages/enzyme-test-suite/build",
2626
"test:single": "mocha --watch",
2727
"test:watch": "npm run test:only -- --watch",
2828
"pretest:karma": "npm run build",
@@ -35,7 +35,7 @@
3535
"docs:build": "npm run docs:prepare && gitbook build",
3636
"docs:watch": "npm run docs:prepare && gitbook serve",
3737
"docs:publish": "npm run docs:clean && npm run docs:build && cd _book && git init && git commit --allow-empty -m 'update book' && git fetch [email protected]:enzymejs/enzyme.git gh-pages && git checkout -b gh-pages && git add . && git commit -am 'update book' && git push [email protected]:enzymejs/enzyme.git gh-pages --force",
38-
"travis": "nyc mocha --recursive packages/enzyme-test-suite/test",
38+
"travis": "nyc mocha --recursive packages/enzyme-test-suite/build",
3939
"since": "node since"
4040
},
4141
"repository": {
@@ -59,12 +59,14 @@
5959
"author": "Jordan Harband <[email protected]>",
6060
"license": "MIT",
6161
"devDependencies": {
62-
"babel-cli": "^6.26.0",
63-
"babel-core": "^6.26.3",
64-
"babel-loader": "^6.4.1",
65-
"babel-plugin-transform-replace-object-assign": "^1.0.0",
66-
"babel-preset-airbnb": "^2.6.0",
67-
"babel-register": "^6.26.0",
62+
"@babel/cli": "^7.0.0",
63+
"@babel/core": "^7.0.0",
64+
"@babel/node": "^7.0.0",
65+
"@babel/register": "^7.0.0",
66+
"babel-eslint": "^10.1.0",
67+
"babel-loader": "^8.1.0",
68+
"babel-plugin-transform-replace-object-assign": "^2.0.0",
69+
"babel-preset-airbnb": "^4.5.0",
6870
"chai": "^4.2.0",
6971
"eslint": "^6.8.0",
7072
"eslint-config-airbnb": "^18.1.0",
@@ -101,9 +103,6 @@
101103
"dependencies": {},
102104
"greenkeeper": {
103105
"ignore": [
104-
"babel-loader",
105-
"babel-plugin-transform-replace-object-assign",
106-
"babel-preset-airbnb",
107106
"mocha",
108107
"nyc",
109108
"semver",

‎packages/enzyme-adapter-react-13/.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"plugins": [
44
["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
55
],
6-
sourceMaps: "both",
6+
"sourceMaps": "both",
77
}

‎packages/enzyme-adapter-react-13/.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": "airbnb",
3+
"parser": "babel-eslint",
34
"root": true,
45
"rules": {
56
"max-classes-per-file": 0,

‎packages/enzyme-adapter-react-13/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prebuild": "npm run clean",
1212
"build": "babel --source-maps=both src --out-dir build",
1313
"watch": "npm run build -- -w",
14-
"prepublish": "npm run build && safe-publish-latest && (not-in-publish || cp ../../{LICENSE,README}.md ./)"
14+
"prepublish": "not-in-publish || (npm run build && safe-publish-latest && cp ../../{LICENSE,README}.md ./)"
1515
},
1616
"repository": {
1717
"type": "git",
@@ -48,9 +48,11 @@
4848
"react": "^0.13.0"
4949
},
5050
"devDependencies": {
51-
"babel-cli": "^6.26.0",
52-
"babel-plugin-transform-replace-object-assign": "^1.0.0",
53-
"babel-preset-airbnb": "^2.6.0",
51+
"@babel/cli": "^7.0.0",
52+
"@babel/core": "^7.0.0",
53+
"babel-eslint": "^10.1.0",
54+
"babel-plugin-transform-replace-object-assign": "^2.0.0",
55+
"babel-preset-airbnb": "^4.5.0",
5456
"enzyme": "^3.0.0",
5557
"eslint": "^6.8.0",
5658
"eslint-config-airbnb": "^18.1.0",

‎packages/enzyme-adapter-react-14/.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"plugins": [
44
["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
55
],
6-
sourceMaps: "both",
6+
"sourceMaps": "both",
77
}

‎packages/enzyme-adapter-react-14/.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": "airbnb",
3+
"parser": "babel-eslint",
34
"root": true,
45
"rules": {
56
"max-len": 0,

‎packages/enzyme-adapter-react-14/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prebuild": "npm run clean",
1212
"build": "babel --source-maps=both src --out-dir build",
1313
"watch": "npm run build -- -w",
14-
"prepublish": "npm run build && safe-publish-latest && (not-in-publish || cp ../../{LICENSE,README}.md ./)"
14+
"prepublish": "not-in-publish || (npm run build && safe-publish-latest && cp ../../{LICENSE,README}.md ./)"
1515
},
1616
"repository": {
1717
"type": "git",
@@ -51,9 +51,11 @@
5151
"react-dom": "^0.14.0"
5252
},
5353
"devDependencies": {
54-
"babel-cli": "^6.26.0",
55-
"babel-plugin-transform-replace-object-assign": "^1.0.0",
56-
"babel-preset-airbnb": "^2.6.0",
54+
"@babel/cli": "^7.0.0",
55+
"@babel/core": "^7.0.0",
56+
"babel-eslint": "^10.1.0",
57+
"babel-plugin-transform-replace-object-assign": "^2.0.0",
58+
"babel-preset-airbnb": "^4.5.0",
5759
"enzyme": "^3.0.0",
5860
"eslint": "^6.8.0",
5961
"eslint-config-airbnb": "^18.1.0",

‎packages/enzyme-adapter-react-15.4/.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"plugins": [
44
["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
55
],
6-
sourceMaps: "both",
6+
"sourceMaps": "both",
77
}

‎packages/enzyme-adapter-react-15.4/.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": "airbnb",
3+
"parser": "babel-eslint",
34
"root": true,
45
"rules": {
56
"max-len": 0,

‎packages/enzyme-adapter-react-15.4/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prebuild": "npm run clean",
1212
"build": "babel --source-maps=both src --out-dir build",
1313
"watch": "npm run build -- -w",
14-
"prepublish": "npm run build && safe-publish-latest && (not-in-publish || cp ../../{LICENSE,README}.md ./)"
14+
"prepublish": "not-in-publish || (npm run build && safe-publish-latest && cp ../../{LICENSE,README}.md ./)"
1515
},
1616
"repository": {
1717
"type": "git",
@@ -52,9 +52,11 @@
5252
"react-addons-test-utils": "15.0.0-0 - 15.4.x"
5353
},
5454
"devDependencies": {
55-
"babel-cli": "^6.26.0",
56-
"babel-plugin-transform-replace-object-assign": "^1.0.0",
57-
"babel-preset-airbnb": "^2.6.0",
55+
"@babel/cli": "^7.0.0",
56+
"@babel/core": "^7.0.0",
57+
"babel-eslint": "^10.1.0",
58+
"babel-plugin-transform-replace-object-assign": "^2.0.0",
59+
"babel-preset-airbnb": "^4.5.0",
5860
"enzyme": "^3.0.0",
5961
"eslint": "^6.8.0",
6062
"eslint-config-airbnb": "^18.1.0",

‎packages/enzyme-adapter-react-15/.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"plugins": [
44
["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
55
],
6-
sourceMaps: "both",
6+
"sourceMaps": "both",
77
}

‎packages/enzyme-adapter-react-15/.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": "airbnb",
3+
"parser": "babel-eslint",
34
"root": true,
45
"rules": {
56
"max-len": 0,

‎packages/enzyme-adapter-react-15/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prebuild": "npm run clean",
1212
"build": "babel --source-maps=both src --out-dir build",
1313
"watch": "npm run build -- -w",
14-
"prepublish": "npm run build && safe-publish-latest && (not-in-publish || cp ../../{LICENSE,README}.md ./)"
14+
"prepublish": "not-in-publish || (npm run build && safe-publish-latest && cp ../../{LICENSE,README}.md ./)"
1515
},
1616
"repository": {
1717
"type": "git",
@@ -51,9 +51,11 @@
5151
"react-test-renderer": "^15.5.0"
5252
},
5353
"devDependencies": {
54-
"babel-cli": "^6.26.0",
55-
"babel-plugin-transform-replace-object-assign": "^1.0.0",
56-
"babel-preset-airbnb": "^2.6.0",
54+
"@babel/cli": "^7.0.0",
55+
"@babel/core": "^7.0.0",
56+
"babel-eslint": "^10.1.0",
57+
"babel-plugin-transform-replace-object-assign": "^2.0.0",
58+
"babel-preset-airbnb": "^4.5.0",
5759
"enzyme": "^3.0.0",
5860
"eslint": "^6.8.0",
5961
"eslint-config-airbnb": "^18.1.0",

‎packages/enzyme-adapter-react-16.1/.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"plugins": [
44
["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
55
],
6-
sourceMaps: "both",
6+
"sourceMaps": "both",
77
}

‎packages/enzyme-adapter-react-16.1/.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": "airbnb",
3+
"parser": "babel-eslint",
34
"root": true,
45
"rules": {
56
"max-classes-per-file": 0,

‎packages/enzyme-adapter-react-16.1/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prebuild": "npm run clean",
1212
"build": "babel --source-maps=both src --out-dir build",
1313
"watch": "npm run build -- -w",
14-
"prepublish": "npm run build && safe-publish-latest && (not-in-publish || cp ../../{LICENSE,README}.md ./)"
14+
"prepublish": "not-in-publish || (npm run build && safe-publish-latest && cp ../../{LICENSE,README}.md ./)"
1515
},
1616
"repository": {
1717
"type": "git",
@@ -51,9 +51,11 @@
5151
"react-dom": "~16.0.0-0 || ~16.1"
5252
},
5353
"devDependencies": {
54-
"babel-cli": "^6.26.0",
55-
"babel-plugin-transform-replace-object-assign": "^1.0.0",
56-
"babel-preset-airbnb": "^2.6.0",
54+
"@babel/cli": "^7.0.0",
55+
"@babel/core": "^7.0.0",
56+
"babel-eslint": "^10.1.0",
57+
"babel-plugin-transform-replace-object-assign": "^2.0.0",
58+
"babel-preset-airbnb": "^4.5.0",
5759
"enzyme": "^3.0.0",
5860
"eslint": "^6.8.0",
5961
"eslint-config-airbnb": "^18.1.0",

‎packages/enzyme-adapter-react-16.2/.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"plugins": [
44
["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
55
],
6-
sourceMaps: "both",
6+
"sourceMaps": "both",
77
}

‎packages/enzyme-adapter-react-16.2/.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": "airbnb",
3+
"parser": "babel-eslint",
34
"root": true,
45
"rules": {
56
"max-classes-per-file": 0,

‎packages/enzyme-adapter-react-16.2/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prebuild": "npm run clean",
1212
"build": "babel --source-maps=both src --out-dir build",
1313
"watch": "npm run build -- -w",
14-
"prepublish": "npm run build && safe-publish-latest && (not-in-publish || cp ../../{LICENSE,README}.md ./)"
14+
"prepublish": "not-in-publish || (npm run build && safe-publish-latest && cp ../../{LICENSE,README}.md ./)"
1515
},
1616
"repository": {
1717
"type": "git",
@@ -52,9 +52,11 @@
5252
"react-dom": "~16.2"
5353
},
5454
"devDependencies": {
55-
"babel-cli": "^6.26.0",
56-
"babel-plugin-transform-replace-object-assign": "^1.0.0",
57-
"babel-preset-airbnb": "^2.6.0",
55+
"@babel/cli": "^7.0.0",
56+
"@babel/core": "^7.0.0",
57+
"babel-eslint": "^10.1.0",
58+
"babel-plugin-transform-replace-object-assign": "^2.0.0",
59+
"babel-preset-airbnb": "^4.5.0",
5860
"enzyme": "^3.0.0",
5961
"eslint": "^6.8.0",
6062
"eslint-config-airbnb": "^18.1.0",

‎packages/enzyme-adapter-react-16.3/.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"plugins": [
44
["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
55
],
6-
sourceMaps: "both",
6+
"sourceMaps": "both",
77
}

‎packages/enzyme-adapter-react-16.3/.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": "airbnb",
3+
"parser": "babel-eslint",
34
"root": true,
45
"rules": {
56
"max-len": 0,

‎packages/enzyme-adapter-react-16.3/package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prebuild": "npm run clean",
1212
"build": "babel --source-maps=both src --out-dir build",
1313
"watch": "npm run build -- -w",
14-
"prepublish": "npm run build && safe-publish-latest && (not-in-publish || cp ../../{LICENSE,README}.md ./)"
14+
"prepublish": "not-in-publish || (npm run build && safe-publish-latest && cp ../../{LICENSE,README}.md ./)"
1515
},
1616
"repository": {
1717
"type": "git",
@@ -52,9 +52,11 @@
5252
"react-dom": "~16.3.0-0"
5353
},
5454
"devDependencies": {
55-
"babel-cli": "^6.26.0",
56-
"babel-plugin-transform-replace-object-assign": "^1.0.0",
57-
"babel-preset-airbnb": "^2.6.0",
55+
"@babel/cli": "^7.0.0",
56+
"@babel/core": "^7.0.0",
57+
"babel-eslint": "^10.1.0",
58+
"babel-plugin-transform-replace-object-assign": "^2.0.0",
59+
"babel-preset-airbnb": "^4.5.0",
5860
"enzyme": "^3.0.0",
5961
"eslint": "^6.8.0",
6062
"eslint-config-airbnb": "^18.1.0",

‎packages/enzyme-adapter-react-16/.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"plugins": [
44
["transform-replace-object-assign", { "moduleSpecifier": "object.assign" }],
55
],
6-
sourceMaps: "both",
6+
"sourceMaps": "both",
77
}

‎packages/enzyme-adapter-react-16/.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": "airbnb",
3+
"parser": "babel-eslint",
34
"root": true,
45
"rules": {
56
"max-classes-per-file": 0,

0 commit comments

Comments
 (0)