ci: log package versions + fix for logger [ci clean]

huafu · huafu · commit 4fa2750aa81e · 2018-08-21T22:00:31.000+02:00
diff --git a/e2e/__cases__/hoisting/hello.spec.ts b/e2e/__cases__/hoisting/hello.spec.ts
@@ -2,6 +2,7 @@ import hello from './hello';
 
 afterAll(() => {
   // this should go after
+  const zz = 20;
   jest.unmock('./hello');
 })
 
diff --git a/e2e/__helpers__/test-case/runtime.ts b/e2e/__helpers__/test-case/runtime.ts
@@ -20,7 +20,7 @@ import {
   outputJsonSync,
 } from 'fs-extra'
 import merge from 'lodash.merge'
-import { sync as spawnSync } from 'cross-spawn'
+import { spawnSync } from 'child_process'
 
 const TEMPLATE_EXCLUDED_ITEMS = ['node_modules', 'package-lock.json']
 
@@ -96,6 +96,11 @@ export function run(name: string, options: RunTestOptions = {}): RunResult {
     )))
   }
 
+  // run in band
+  if (!cmdArgs.includes('--runInBand')) {
+    cmdArgs.push('--runInBand')
+  }
+
   const cmd = cmdArgs.shift() as string
 
   // Add both process.env which is the standard and custom env variables
diff --git a/e2e/__templates__/with-babel-6/package-lock.json b/e2e/__templates__/with-babel-6/package-lock.json
diff --git a/e2e/__templates__/with-babel-6/package.json b/e2e/__templates__/with-babel-6/package.json
@@ -5,7 +5,6 @@
   "devDependencies": {
     "@types/jest": "^23.3.1",
     "babel-core": "^6.26.3",
-    "closest-file-data": "^0.1.4",
     "jest": "^23.4.2",
     "typescript": "^3.0.1"
   }
diff --git a/e2e/__templates__/with-babel-7/package-lock.json b/e2e/__templates__/with-babel-7/package-lock.json
diff --git a/e2e/__templates__/with-babel-7/package.json b/e2e/__templates__/with-babel-7/package.json
@@ -6,7 +6,6 @@
     "@babel/core": "^7.0.0-beta.56",
     "@types/jest": "^23.3.1",
     "babel-core": "^7.0.0-bridge.0",
-    "closest-file-data": "^0.1.4",
     "jest": "^23.4.2",
     "typescript": "^3.0.1"
   }
diff --git a/e2e/__tests__/__snapshots__/hoisting.test.ts.snap b/e2e/__tests__/__snapshots__/hoisting.test.ts.snap
diff --git a/e2e/__tests__/__snapshots__/simple.test.ts.snap b/e2e/__tests__/__snapshots__/simple.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Simple test should pass using template "default" 1`] = `
-  √ jest
+  √ jest --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
@@ -19,7 +19,7 @@ exports[`Simple test should pass using template "default" 1`] = `
 `;
 
 exports[`Simple test should pass using template "with-babel-6" 1`] = `
-  √ jest
+  √ jest --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
@@ -37,7 +37,7 @@ exports[`Simple test should pass using template "with-babel-6" 1`] = `
 `;
 
 exports[`Simple test should pass using template "with-babel-7" 1`] = `
-  √ jest
+  √ jest --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
@@ -55,7 +55,7 @@ exports[`Simple test should pass using template "with-babel-7" 1`] = `
 `;
 
 exports[`Simple test should pass using template "with-jest-22" 1`] = `
-  √ jest
+  √ jest --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
@@ -73,7 +73,7 @@ exports[`Simple test should pass using template "with-jest-22" 1`] = `
 `;
 
 exports[`Simple test should pass using template "with-typescript-2-7" 1`] = `
-  √ jest
+  √ jest --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
diff --git a/e2e/__tests__/__snapshots__/source-map.test.ts.snap b/e2e/__tests__/__snapshots__/source-map.test.ts.snap
@@ -35,7 +35,7 @@ exports[`using template "default" should have the source mpas comment 1`] = `
 `;
 
 exports[`using template "default" should report correct line numbers 1`] = `
-  × jest
+  × jest --runInBand
   ↳ exit code: 1
   ===[ STDOUT ]===================================================================
   console.log main.ts:2
@@ -123,7 +123,7 @@ exports[`using template "with-babel-6" should have the source mpas comment 1`] =
 `;
 
 exports[`using template "with-babel-6" should report correct line numbers 1`] = `
-  × jest
+  × jest --runInBand
   ↳ exit code: 1
   ===[ STDOUT ]===================================================================
   console.log main.ts:2
@@ -217,7 +217,7 @@ exports[`using template "with-babel-7" should have the source mpas comment 1`] =
 `;
 
 exports[`using template "with-babel-7" should report correct line numbers 1`] = `
-  × jest
+  × jest --runInBand
   ↳ exit code: 1
   ===[ STDOUT ]===================================================================
   console.log main.ts:2
@@ -305,7 +305,7 @@ exports[`using template "with-jest-22" should have the source mpas comment 1`] =
 `;
 
 exports[`using template "with-jest-22" should report correct line numbers 1`] = `
-  × jest
+  × jest --runInBand
   ↳ exit code: 1
   ===[ STDOUT ]===================================================================
   console.log main.ts:2
@@ -391,7 +391,7 @@ exports[`using template "with-typescript-2-7" should have the source mpas commen
 `;
 
 exports[`using template "with-typescript-2-7" should report correct line numbers 1`] = `
-  × jest
+  × jest --runInBand
   ↳ exit code: 1
   ===[ STDOUT ]===================================================================
   console.log main.ts:2
diff --git a/e2e/__tests__/__snapshots__/type-checking.test.ts.snap b/e2e/__tests__/__snapshots__/type-checking.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`With type checking should fail using template "default" 1`] = `
-  × jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"typeCheck":true}}}
+  × jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"typeCheck":true}}} --runInBand
   ↳ exit code: 1
   ===[ STDOUT ]===================================================================
   
@@ -24,7 +24,7 @@ exports[`With type checking should fail using template "default" 1`] = `
 `;
 
 exports[`With type checking should fail using template "with-babel-6" 1`] = `
-  × jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"babelConfig":true,"typeCheck":true}}}
+  × jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"babelConfig":true,"typeCheck":true}}} --runInBand
   ↳ exit code: 1
   ===[ STDOUT ]===================================================================
   
@@ -47,7 +47,7 @@ exports[`With type checking should fail using template "with-babel-6" 1`] = `
 `;
 
 exports[`With type checking should fail using template "with-babel-7" 1`] = `
-  × jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"babelConfig":true,"typeCheck":true}}}
+  × jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"babelConfig":true,"typeCheck":true}}} --runInBand
   ↳ exit code: 1
   ===[ STDOUT ]===================================================================
   
@@ -70,7 +70,7 @@ exports[`With type checking should fail using template "with-babel-7" 1`] = `
 `;
 
 exports[`With type checking should fail using template "with-jest-22" 1`] = `
-  × jest --config {"transform":{"^.+\\\\.tsx?$":"ts-jest"},"testMatch":["**/__tests__/**/*.js?(x)","**/?(*.)+(spec|test).js?(x)","**/__tests__/**/*.ts?(x)","**/?(*.)+(spec|test).ts?(x)"],"moduleFileExtensions":["js","json","jsx","node","ts","tsx"],"testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"typeCheck":true}}}
+  × jest --config {"transform":{"^.+\\\\.tsx?$":"ts-jest"},"testMatch":["**/__tests__/**/*.js?(x)","**/?(*.)+(spec|test).js?(x)","**/__tests__/**/*.ts?(x)","**/?(*.)+(spec|test).ts?(x)"],"moduleFileExtensions":["js","json","jsx","node","ts","tsx"],"testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"typeCheck":true}}} --runInBand
   ↳ exit code: 1
   ===[ STDOUT ]===================================================================
   
@@ -93,7 +93,7 @@ exports[`With type checking should fail using template "with-jest-22" 1`] = `
 `;
 
 exports[`With type checking should fail using template "with-typescript-2-7" 1`] = `
-  × jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"diagnostics":{"ignoreCodes":[5023]},"typeCheck":true}}}
+  × jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"diagnostics":{"ignoreCodes":[5023]},"typeCheck":true}}} --runInBand
   ↳ exit code: 1
   ===[ STDOUT ]===================================================================
   
@@ -116,7 +116,7 @@ exports[`With type checking should fail using template "with-typescript-2-7" 1`]
 `;
 
 exports[`Without type checking should pass using template "default" 1`] = `
-  √ jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"typeCheck":false}}}
+  √ jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"typeCheck":false}}} --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
@@ -133,7 +133,7 @@ exports[`Without type checking should pass using template "default" 1`] = `
 `;
 
 exports[`Without type checking should pass using template "with-babel-6" 1`] = `
-  √ jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"babelConfig":true,"typeCheck":false}}}
+  √ jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"babelConfig":true,"typeCheck":false}}} --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
@@ -150,7 +150,7 @@ exports[`Without type checking should pass using template "with-babel-6" 1`] = `
 `;
 
 exports[`Without type checking should pass using template "with-babel-7" 1`] = `
-  √ jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"babelConfig":true,"typeCheck":false}}}
+  √ jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"babelConfig":true,"typeCheck":false}}} --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
@@ -167,7 +167,7 @@ exports[`Without type checking should pass using template "with-babel-7" 1`] = `
 `;
 
 exports[`Without type checking should pass using template "with-jest-22" 1`] = `
-  √ jest --config {"transform":{"^.+\\\\.tsx?$":"ts-jest"},"testMatch":["**/__tests__/**/*.js?(x)","**/?(*.)+(spec|test).js?(x)","**/__tests__/**/*.ts?(x)","**/?(*.)+(spec|test).ts?(x)"],"moduleFileExtensions":["js","json","jsx","node","ts","tsx"],"testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"typeCheck":false}}}
+  √ jest --config {"transform":{"^.+\\\\.tsx?$":"ts-jest"},"testMatch":["**/__tests__/**/*.js?(x)","**/?(*.)+(spec|test).js?(x)","**/__tests__/**/*.ts?(x)","**/?(*.)+(spec|test).ts?(x)"],"moduleFileExtensions":["js","json","jsx","node","ts","tsx"],"testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"typeCheck":false}}} --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
@@ -184,7 +184,7 @@ exports[`Without type checking should pass using template "with-jest-22" 1`] = `
 `;
 
 exports[`Without type checking should pass using template "with-typescript-2-7" 1`] = `
-  √ jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"diagnostics":{"ignoreCodes":[5023]},"typeCheck":false}}}
+  √ jest --config {"preset":"ts-jest","testEnvironment":"node","globals":{"ts-jest":{"tsConfig":{},"diagnostics":{"ignoreCodes":[5023]},"typeCheck":false}}} --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
diff --git a/e2e/__tests__/__snapshots__/warning-messages.test.ts.snap b/e2e/__tests__/__snapshots__/warning-messages.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`With unsupported version test should pass using template "with-unsupported-version" 1`] = `
-  √ jest
+  √ jest --runInBand
   ↳ exit code: 0
   ===[ STDOUT ]===================================================================
   
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "23.2.0",
+  "version": "24.0.0-beta.0",
   "main": "dist/index.js",
   "types": "./dist/index.d.ts",
   "description": "A preprocessor with sourcemap support to help use Typescript with Jest",
@@ -49,8 +49,8 @@
     "semver": "^5.5.1"
   },
   "peerDependencies": {
-    "babel-jest": "23.x",
-    "jest": "23.x",
+    "babel-jest": ">=22 <24",
+    "jest": ">=22 <24",
     "typescript": ">=2.7.0 <4.0.0"
   },
   "devDependencies": {
diff --git a/scripts/clean.js b/scripts/clean.js
@@ -13,7 +13,7 @@ if (process.argv.indexOf('--when-ci-commit-message') !== -1) {
   if (process.env.APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED) {
     msg = `${msg}\n${process.env.APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED}`
   }
-  if (!/\[ci npm-clean\]/.test(msg)) process.exit(0)
+  if (!/\[ci clean\]/.test(msg)) process.exit(0)
 }
 
 removeSync(Paths.distDir)
diff --git a/scripts/e2e.js b/scripts/e2e.js
@@ -20,6 +20,7 @@ if (parentArgs.includes('--coverage')) {
   )
   parentArgs = parentArgs.filter(a => a !== '--coverage')
 }
+if (!parentArgs.includes('--runInBand')) parentArgs.push('--runInBand')
 
 function getDirectories(rootDir) {
   return fs.readdirSync(rootDir).filter(function(file) {
@@ -73,6 +74,22 @@ function setupE2e() {
     const pkgLockFile = path.join(sourceDir, 'package-lock.json')
     const e2eFile = path.join(nodeModulesDir, '.ts-jest-e2e.json')
 
+    // log installed versions
+    const logPackageVersions = () => {
+      log(`  [template: ${name}]`, 'installed direct dependencies:')
+      let deps = npm.directDepsPkg(dir)
+      Object.keys(deps)
+        .sort()
+        .forEach(name => {
+          log(
+            '      -',
+            `${name}${' '.repeat(20 - name.length)}`,
+            deps[name].version
+          )
+        })
+      deps = null
+    }
+
     // remove all files expect node_modules
     if (fs.existsSync(dir)) {
       log(`  [template: ${name}]`, 'removing old files')
@@ -96,9 +113,6 @@ function setupE2e() {
     }
 
     const pkgLockHash = sha1(fs.readFileSync(pkgLockFile))
-
-    // TODO: create a hash of package-lock.json as well as the bundle, and test it over one copied in each
-    // template dir, to know if we should re-install or not
     const e2eData = fs.existsSync(e2eFile) ? fs.readJsonSync(e2eFile) : {}
     let bundleOk = e2eData.bundleHash === bundleHash
     let packagesOk = e2eData.packageLockHash === pkgLockHash
@@ -111,6 +125,7 @@ function setupE2e() {
           `  [template: ${name}]`,
           'bundle and packages unchanged, nothing to do'
         )
+        logPackageVersions()
         return
       }
     }
@@ -130,6 +145,8 @@ function setupE2e() {
       spawnSync('npm', ['i', '-D', bundle], { cwd: dir })
     }
 
+    logPackageVersions()
+
     // write our data
     e2eData.bundleHash = bundleHash
     e2eData.packageLockHash = pkgLockHash
diff --git a/scripts/lib/npm.js b/scripts/lib/npm.js
@@ -1,6 +1,7 @@
 const { spawnSync: spawn } = require('./spawn-sync')
 const { satisfies } = require('semver')
 const memoize = require('lodash.memoize')
+const { join } = require('path')
 
 const version = memoize(() => {
   return spawnSync(['-s', '--version'])
@@ -17,8 +18,22 @@ const can = {
   prepare: memoize(() => satisfies(version(), '>=5.7.0')),
 }
 
+function directDepsPkg(dir) {
+  const main = require(join(dir, 'package.json'))
+  const res = {}
+  Object.keys(main.dependencies || {}).forEach(
+    key => (res[key] = require(join(dir, 'node_modules', key, 'package.json')))
+  )
+  Object.keys(main.devDependencies || {}).forEach(key => {
+    if (res[key]) return
+    res[key] = require(join(dir, 'node_modules', key, 'package.json'))
+  })
+  return res
+}
+
 module.exports = {
   version,
   spawnSync,
   can,
+  directDepsPkg,
 }
diff --git a/scripts/lib/spawn-sync.js b/scripts/lib/spawn-sync.js
@@ -1,4 +1,4 @@
-const { sync } = require('cross-spawn')
+const { spawnSync: sync } = require('child_process')
 
 /**
  * @type {typeof sync}
@@ -9,7 +9,13 @@ const spawnSync = (...args) => {
     throw res.error
   }
   if (res.status !== 0) {
-    throw new Error(res.stderr.toString('utf8'))
+    let msg = 'unknown error'
+    try {
+      msg = res.stderr.toString('utf8')
+    } catch (err) {
+      null
+    }
+    throw new Error(msg)
   }
   return res
 }
diff --git a/src/util/debug.spec.ts b/src/util/debug.spec.ts
diff --git a/src/util/importer.ts b/src/util/importer.ts

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`"devDependencies": {`
`6`	`6`	`"@types/jest": "^23.3.1",`
`7`	`7`	`"babel-core": "^6.26.3",`
`8`		`- "closest-file-data": "^0.1.4",`
`9`	`8`	`"jest": "^23.4.2",`
`10`	`9`	`"typescript": "^3.0.1"`
`11`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`"@babel/core": "^7.0.0-beta.56",`
`7`	`7`	`"@types/jest": "^23.3.1",`
`8`	`8`	`"babel-core": "^7.0.0-bridge.0",`
`9`		`- "closest-file-data": "^0.1.4",`
`10`	`9`	`"jest": "^23.4.2",`
`11`	`10`	`"typescript": "^3.0.1"`
`12`	`11`	`}`