Skip to content

Commit 7084a54

Browse files
committed
fix(analyzeSchemaSync): make it work in CI
1 parent 72bc5c4 commit 7084a54

File tree

4 files changed

+32
-34
lines changed

4 files changed

+32
-34
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"clean": "rimraf es lib $(cd src; ls) *.js *.d.ts",
1515
"build": "npm run clean && npm run build:types && npm run build:js",
1616
"build:types": "tsc --emitDeclarationOnly",
17-
"build:js": "babel src --out-dir es --extensions \".ts\" --source-maps inline && cross-env BABEL_ENV=es5 babel src --out-dir . --extensions \".ts\" && node scripts/setHashbangs.js",
17+
"build:js": "babel src --out-dir es --extensions \".ts\" --source-maps inline && cross-env BABEL_ENV=es5 babel src --out-dir . --extensions \".ts\" && copy 'src/**/*.js' .",
1818
"test": "cross-env NODE_ENV=test BABEL_ENV=es5 mocha $npm_package_config_mocha && cross-env NODE_ENV=test BABEL_ENV=coverage nyc --reporter=lcov --reporter=text mocha $npm_package_config_mocha",
1919
"test:watch": "cross-env NODE_ENV=test BABEL_ENV=test mocha $npm_package_config_mocha --watch --watch-extensions js,ts",
2020
"test:debug": "cross-env NODE_ENV=test BABEL_ENV=test mocha --inspect-brk $npm_package_config_mocha",
@@ -96,7 +96,7 @@
9696
"@babel/plugin-transform-runtime": "^7.1.0",
9797
"@babel/preset-env": "^7.1.6",
9898
"@babel/preset-typescript": "^7.7.2",
99-
"@babel/register": "^7.0.0",
99+
"@babel/register": "^7.8.3",
100100
"@commitlint/cli": "^6.0.2",
101101
"@commitlint/config-conventional": "^6.0.2",
102102
"@jedwards1211/commitlint-config": "^1.0.0",

scripts/setHashbangs.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/internal/analyzeSchema.ts

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -404,10 +404,14 @@ export function analyzeSchemaSync(options: {
404404
}
405405

406406
const schema = flatted.parse(
407-
execFileSync(__filename, [JSON.stringify(options)], {
408-
encoding: 'utf8',
409-
maxBuffer: 256 * 1024 * 1024,
410-
})
407+
execFileSync(
408+
require.resolve('./runAnalyzeSchemaSync'),
409+
[JSON.stringify({ ...options, target: __filename })],
410+
{
411+
encoding: 'utf8',
412+
maxBuffer: 256 * 1024 * 1024,
413+
}
414+
)
411415
)
412416
if (file) {
413417
const latest = fs.statSync(file).mtime
@@ -416,15 +420,3 @@ export function analyzeSchemaSync(options: {
416420
}
417421
return schema
418422
}
419-
420-
if (!module.parent) {
421-
analyzeSchema(JSON.parse(process.argv[2])).then(
422-
(result: any) => {
423-
process.stdout.write(flatted.stringify(result), () => process.exit(0))
424-
},
425-
(error: Error) => {
426-
console.error(error.stack) // eslint-disable-line no-console
427-
process.exit(1)
428-
}
429-
)
430-
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#! /usr/bin/env node
2+
3+
/* eslint-disable */
4+
5+
var flatted = require('flatted')
6+
var options = JSON.parse(process.argv[2])
7+
if (/\.ts$/.test(options.target)) {
8+
require('@babel/register')({ extensions: ['.js', '.ts'] })
9+
}
10+
require(options.target)
11+
.default(JSON.parse(process.argv[2]))
12+
.then(
13+
function(result) {
14+
process.stdout.write(flatted.stringify(result), function() {
15+
process.exit(0)
16+
})
17+
},
18+
function(error) {
19+
console.error(error.stack) // eslint-disable-line no-console
20+
process.exit(1)
21+
}
22+
)

0 commit comments

Comments
 (0)