Update devDependencies to babel 6 and jest 12 (#81)

Author: danez

.babelrc

@@ -1,3 +1,11 @@
 {
-  "optional": ["runtime"]
+  "presets": [
+    "es2015",
+    "stage-1"
+  ],
+  "plugins": [
+    "syntax-flow",
+    "transform-flow-strip-types",
+    "transform-runtime"
+  ]
 }

bin/__tests__/react-docgen-test.js

@@ -8,18 +8,19 @@
  *
  */
 
-/*global jasmine, jest, describe, pit, expect, afterEach*/
+/*global jasmine, jest, describe, it, expect, afterEach*/
 
-// Increase default timeout (5000ms) for Travis
-jasmine.getEnv().defaultTimeoutInterval = 10000;
+const TEST_TIMEOUT = 120000;
 
-jest.autoMockOff();
+jasmine.DEFAULT_TIMEOUT_INTERVAL = TEST_TIMEOUT;
+
+jest.disableAutomock();
 
 var fs = require('fs');
 var path = require('path');
 var rimraf = require('rimraf');
 var temp = require('temp');
-var spawn = require('cross-spawn-async');
+var spawn = require('cross-spawn');
 
 function run(args, stdin) {
   return new Promise(resolve => {
@@ -32,6 +33,7 @@ function run(args, stdin) {
     docgen.stdout.on('data', data => stdout += data);
     docgen.stderr.on('data', data => stderr += data);
     docgen.on('close', () => resolve([stdout, stderr]));
+    docgen.on('error', (e) => { throw e; });
     if (stdin) {
       docgen.stdin.write(stdin);
     }
@@ -88,37 +90,37 @@ describe('react-docgen CLI', () => {
       rimraf.sync(tempDir);
     }
     tempDir = null;
-    tempComponents.length = 0;
-    tempNoComponents.length = 0;
+    tempComponents = [];
+    tempNoComponents = [];
   });
 
-  pit('reads from stdin', () => {
+  it('reads from stdin', () => {
     return run([], component).then(([stdout, stderr]) => {
       expect(stdout.length > 0).toBe(true);
       expect(stderr.length).toBe(0);
     });
-  });
+  }, TEST_TIMEOUT);
 
-  pit('reads files provided as command line arguments', () => {
+  it('reads files provided as command line arguments', () => {
     createTempfiles();
     return run(tempComponents.concat(tempNoComponents)).then(
       ([stdout, stderr]) => {
         expect(stdout).toContain('Component');
         expect(stderr).toContain('NoComponent');
       }
     );
-  });
+  }, TEST_TIMEOUT);
 
-  pit('reads directories provided as command line arguments', () => {
-    tempDir = createTempfiles();
+  it('reads directories provided as command line arguments', () => {
+    createTempfiles();
     return run([tempDir]).then(([stdout, stderr]) => {
       expect(stdout).toContain('Component');
       expect(stderr).toContain('NoComponent');
     });
-  });
+  }, TEST_TIMEOUT);
 
-  pit('considers js and jsx by default', () => {
-    tempDir = createTempfiles();
+  it('considers js and jsx by default', () => {
+    createTempfiles();
     createTempfiles('jsx');
     createTempfiles('foo');
     return run([tempDir]).then(([stdout, stderr]) => {
@@ -130,9 +132,9 @@ describe('react-docgen CLI', () => {
       expect(stderr).toContain('NoComponent.jsx');
       expect(stderr).not.toContain('NoComponent.foo');
     });
-  });
+  }, TEST_TIMEOUT);
 
-  pit('considers files with the specified extension', () => {
+  it('considers files with the specified extension', () => {
     createTempfiles('foo');
     createTempfiles('bar');
 
@@ -144,24 +146,23 @@ describe('react-docgen CLI', () => {
       expect(stderr).toContain('NoComponent.bar');
     };
 
-
     return Promise.all([
       run(['--extension=foo', '--extension=bar', tempDir]).then(verify),
       run(['-x', 'foo', '-x', 'bar', tempDir]).then(verify),
     ]);
-  });
+  }, TEST_TIMEOUT);
 
-  pit('ignores files in node_modules and __tests__ by default', () => {
+  it('ignores files in node_modules and __tests__ by default', () => {
     createTempfiles(null, 'node_modules');
     createTempfiles(null, '__tests__');
 
     return run([tempDir]).then(([stdout, stderr]) => {
       expect(stdout).toBe('');
       expect(stderr).toBe('');
     });
-  });
+  }, TEST_TIMEOUT);
 
-  pit('ignores specified folders', () => {
+  it('ignores specified folders', () => {
     createTempfiles(null, 'foo');
 
     var verify = ([stdout, stderr]) => {
@@ -173,23 +174,23 @@ describe('react-docgen CLI', () => {
         run(['--ignore=foo', tempDir]).then(verify),
         run(['-i', 'foo', tempDir]).then(verify),
     ]);
-  });
+  }, TEST_TIMEOUT);
 
-  pit('writes to stdout', () => {
+  it('writes to stdout', () => {
     return run([], component).then(([stdout, stderr]) => {
       expect(stdout.length > 0).toBe(true);
       expect(stderr.length).toBe(0);
     });
-  });
+  }, TEST_TIMEOUT);
 
-  pit('writes to stderr', () => {
+  it('writes to stderr', () => {
     return run([], '{}').then(([stdout, stderr]) => {
       expect(stderr.length > 0).toBe(true);
       expect(stdout.length).toBe(0);
     });
-  });
+  }, TEST_TIMEOUT);
 
-  pit('writes to a file if provided', function() {
+  it('writes to a file if provided', () => {
     var outFile = temp.openSync();
     createTempfiles();
 
@@ -202,10 +203,10 @@ describe('react-docgen CLI', () => {
       run(['--out=' + outFile.path, tempDir]).then(verify),
       run(['-o', outFile.path, tempDir]).then(verify),
     ]);
-  });
+  }, TEST_TIMEOUT);
 
   describe('--resolver', () => {
-    pit('accepts the names of built in resolvers', () => {
+    it('accepts the names of built in resolvers', () => {
       return Promise.all([
         // No option passed: same as --resolver=findExportedComponentDefinition
         run([
@@ -229,9 +230,9 @@ describe('react-docgen CLI', () => {
           expect(stdout).toContain('ComponentB');
         }),
       ]);
-    });
+    }, TEST_TIMEOUT);
 
-    pit('accepts a path to a resolver function', () => {
+    it('accepts a path to a resolver function', () => {
       return Promise.all([
         run([
           '--resolver='+path.join(__dirname, './example/customResolver.js'),
@@ -241,7 +242,7 @@ describe('react-docgen CLI', () => {
           expect(stdout).toContain('Custom');
         }),
       ]);
-    });
+    }, TEST_TIMEOUT);
   });
 
 });

bin/react-docgen.js

@@ -57,7 +57,7 @@ var argv = require('nomnom')
 var async = require('async');
 var dir = require('node-dir');
 var fs = require('fs');
-var parser = require('../dist/main.js');
+var parser = require('../dist/main');
 var path = require('path');
 
 var output = argv.out;
@@ -69,10 +69,10 @@ var resolver;
 if (argv.resolver) {
   switch(argv.resolver) {
     case 'findAllComponentDefinitions':
-      resolver = require('../dist/resolver/findAllComponentDefinitions');
+      resolver = require('../dist/resolver/findAllComponentDefinitions').default;
       break;
     case 'findExportedComponentDefinition':
-      resolver = require('../dist/resolver/findExportedComponentDefinition');
+      resolver = require('../dist/resolver/findExportedComponentDefinition').default;
       break;
     default: // treat value as module path
       resolver = require(path.resolve(process.cwd(), argv.resolver));

package.json

@@ -14,7 +14,7 @@
   "scripts": {
     "lint": "eslint src/",
     "watch": "babel src/ --out-dir dist/ --watch",
-    "build": "rm -rf dist/ && babel src/ --out-dir dist/ --ignore __tests__,__mocks__",
+    "build": "rimraf dist/ && babel src/ --out-dir dist/ --ignore __tests__,__mocks__",
     "prepublish": "npm run build",
     "preversion": "npm run lint",
     "test": "jest"
@@ -27,26 +27,29 @@
   "license": "BSD-3-Clause",
   "dependencies": {
     "async": "^1.4.2",
-    "babel-runtime": "~5.8.25",
+    "babel-runtime": "^6.9.2",
     "babylon": "~5.8.3",
     "doctrine": "^1.2.0",
     "node-dir": "^0.1.10",
     "nomnom": "^1.8.1",
-    "recast": "^0.10.41"
+    "recast": "^0.11.5"
   },
   "devDependencies": {
-    "babel": "^5.6.23",
+    "babel-cli": "^6.9.0",
     "babel-eslint": "^6.0.4",
-    "babel-jest": "^5.3.0",
-    "cross-spawn-async": "^2.1.9",
+    "babel-jest": "^12.1.0",
+    "babel-plugin-syntax-flow": "^6.8.0",
+    "babel-plugin-transform-flow-strip-types": "^6.8.0",
+    "babel-plugin-transform-runtime": "^6.9.0",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-stage-1": "^6.5.0",
+    "cross-spawn": "^4.0.0",
     "eslint": "^2.10.2",
-    "jest-cli": "^0.8.0",
+    "jest-cli": "^12.1.1",
     "rimraf": "^2.3.2",
     "temp": "^0.8.1"
   },
   "jest": {
-    "preprocessCachingDisabled": true,
-    "scriptPreprocessor": "node_modules/babel-jest",
     "setupTestFrameworkScriptFile": "tests/setupTestFramework.js",
     "testPathDirs": [
       "bin",

src/__tests__/main-test.js

@@ -10,7 +10,7 @@
 
 /*global jest, describe, beforeEach, it, expect*/
 
-jest.autoMockOff();
+jest.disableAutomock();
 
 describe('main', () => {
   var docgen, ERROR_MISSING_DEFINITION;
@@ -222,7 +222,7 @@ describe('main', () => {
         export default NotAComponent;
       `;
 
-      expect(() => docgen.parse(source)).toThrow(ERROR_MISSING_DEFINITION);
+      expect(() => docgen.parse(source)).toThrowError(ERROR_MISSING_DEFINITION);
     });
   });
 });

src/__tests__/parse-test.js

@@ -10,7 +10,7 @@
 
 /*global jest, describe, beforeEach, it, expect*/
 
-jest.autoMockOff();
+jest.disableAutomock();
 
 describe('parse', () => {
   var utils;
@@ -28,20 +28,20 @@ describe('parse', () => {
 
   it('allows custom component definition resolvers', () => {
     var path = pathFromSource('({foo: "bar"})');
-    var resolver = jest.genMockFunction().mockReturnValue(path);
-    var handler = jest.genMockFunction();
+    var resolver = jest.fn(() => path);
+    var handler = jest.fn();
     parse('//empty', resolver, [handler]);
 
     expect(resolver).toBeCalled();
     expect(handler.mock.calls[0][1]).toBe(path);
   });
 
   it('errors if component definition is not found', () => {
-    var resolver = jest.genMockFunction();
-    expect(() => parse('//empty', resolver)).toThrow(ERROR_MISSING_DEFINITION);
+    var resolver = jest.fn();
+    expect(() => parse('//empty', resolver)).toThrowError(ERROR_MISSING_DEFINITION);
     expect(resolver).toBeCalled();
 
-    expect(() => parse('//empty', resolver)).toThrow(ERROR_MISSING_DEFINITION);
+    expect(() => parse('//empty', resolver)).toThrowError(ERROR_MISSING_DEFINITION);
     expect(resolver).toBeCalled();
   });
 

src/handlers/__tests__/componentDocblockHandler-test.js

@@ -10,7 +10,7 @@
 
 /*global jest, describe, beforeEach, it, expect*/
 
-jest.autoMockOff();
+jest.disableAutomock();
 jest.mock('../../Documentation');
 
 describe('componentDocblockHandler', () => {
@@ -29,7 +29,7 @@ describe('componentDocblockHandler', () => {
   beforeEach(() => {
     ({parse} = require('../../../tests/utils'));
     documentation = new (require('../../Documentation'));
-    componentDocblockHandler = require('../componentDocblockHandler');
+    componentDocblockHandler = require('../componentDocblockHandler').default;
   });
 
   function test(definitionSrc, parse) { // eslint-disable-line no-shadow

src/handlers/__tests__/componentMethodsHandler-test.js

@@ -10,7 +10,7 @@
 
 /*global jest, describe, beforeEach, it, expect*/
 
-jest.autoMockOff();
+jest.disableAutomock();
 jest.mock('../../Documentation');
 
 describe('componentMethodsHandler', () => {
@@ -21,7 +21,7 @@ describe('componentMethodsHandler', () => {
   beforeEach(() => {
     ({parse} = require('../../../tests/utils'));
     documentation = new (require('../../Documentation'));
-    componentMethodsHandler = require('../componentMethodsHandler');
+    componentMethodsHandler = require('../componentMethodsHandler').default;
   });
 
   function test(definition) {

src/handlers/__tests__/componentMethodsJsDocHandler-test.js

@@ -10,15 +10,15 @@
 
 /*global jest, describe, beforeEach, it, expect*/
 
-jest.autoMockOff();
+jest.disableAutomock();
 
 describe('componentMethodsHandler', () => {
   let documentation;
   let componentMethodsJsDocHandler;
 
   beforeEach(() => {
     documentation = new (require('../../Documentation'));
-    componentMethodsJsDocHandler = require('../componentMethodsJsDocHandler');
+    componentMethodsJsDocHandler = require('../componentMethodsJsDocHandler').default;
   });
 
   it('stays the same when no docblock is present', () => {

src/handlers/__tests__/defaultPropsHandler-test.js

@@ -10,7 +10,7 @@
 
 /*global jest, describe, beforeEach, it, expect*/
 
-jest.autoMockOff();
+jest.disableAutomock();
 jest.mock('../../Documentation');
 
 describe('defaultPropsHandler', () => {
@@ -21,7 +21,7 @@ describe('defaultPropsHandler', () => {
   beforeEach(() => {
     ({parse} = require('../../../tests/utils'));
     documentation = new (require('../../Documentation'));
-    defaultPropsHandler = require('../defaultPropsHandler');
+    defaultPropsHandler = require('../defaultPropsHandler').default;
   });
 
   function test(definition) {