diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-04 18:29:38 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-12 00:39:58 +0800 |
| commit | 72aa3d3005c81c1d0deb66369ce543bda3cccdc1 (patch) | |
| tree | 280642dbba6808da550ab89ab941cc51b028dff0 /packages/monorepo-scripts | |
| parent | e8d4f6d5322930cf8618abcb9fea7c773a87ecd7 (diff) | |
| download | dexon-0x-contracts-72aa3d3005c81c1d0deb66369ce543bda3cccdc1.tar.gz dexon-0x-contracts-72aa3d3005c81c1d0deb66369ce543bda3cccdc1.tar.zst dexon-0x-contracts-72aa3d3005c81c1d0deb66369ce543bda3cccdc1.zip | |
Fix some of the publishing/installation issues
Diffstat (limited to 'packages/monorepo-scripts')
| -rw-r--r-- | packages/monorepo-scripts/src/test_installation.ts | 6 | ||||
| -rw-r--r-- | packages/monorepo-scripts/tsconfig.json | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/monorepo-scripts/src/test_installation.ts b/packages/monorepo-scripts/src/test_installation.ts index 195b64b2a..78e0f0929 100644 --- a/packages/monorepo-scripts/src/test_installation.ts +++ b/packages/monorepo-scripts/src/test_installation.ts @@ -31,7 +31,7 @@ import { utils } from './utils'; utils.log(`Installing ${packedPackageFileName}`); result = await execAsync(`yarn add ${packagePath}/${packedPackageFileName}`, { cwd: testDirectory }); const indexFilePath = path.join(testDirectory, 'index.ts'); - fs.writeFileSync(indexFilePath, `import * as Package from '${packageName}'`); + fs.writeFileSync(indexFilePath, `import * as Package from '${packageName}';\n`); const tsConfig = { compilerOptions: { typeRoots: ['node_modules/@0xproject/typescript-typings/types', 'node_modules/@types'], @@ -48,11 +48,13 @@ import { utils } from './utils'; const tsconfigFilePath = path.join(testDirectory, 'tsconfig.json'); fs.writeFileSync(tsconfigFilePath, JSON.stringify(tsConfig, null, 4)); utils.log(`Compiling ${packageName}`); - await execAsync('../node_modules/typescript/bin/tsc', { cwd: testDirectory }); + const tscBinaryPath = path.join(monorepoRootPath, './node_modules/typescript/bin/tsc'); + await execAsync(tscBinaryPath, { cwd: testDirectory }); utils.log(`Successfully compiled with ${packageName} as a dependency`); rimraf.sync(testDirectory); } })().catch(err => { + utils.log(err.stderr); utils.log(err.stdout); process.exit(1); }); diff --git a/packages/monorepo-scripts/tsconfig.json b/packages/monorepo-scripts/tsconfig.json index 5ec2db5e0..332d3a5e1 100644 --- a/packages/monorepo-scripts/tsconfig.json +++ b/packages/monorepo-scripts/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { - "typeRoots": ["node_modules/@types"], + "typeRoots": ["../../node_modules/@types", "node_modules/@types"], "outDir": "lib" }, "include": ["./src/**/*"] |