From 2e5ff53d7271509accc226e83d76d1785350b1d2 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Fri, 13 Jul 2018 12:42:01 +0200 Subject: -fetch'; --- packages/sol-compiler/package.json | 1 - packages/sol-compiler/src/compiler.ts | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'packages/sol-compiler') diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index e738ab56b..8460420ad 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -87,7 +87,6 @@ "ethereum-types": "^0.0.2", "chalk": "^2.3.0", "ethereumjs-util": "^5.1.1", - "isomorphic-fetch": "^2.2.1", "lodash": "^4.17.4", "mkdirp": "^0.5.1", "require-from-string": "^2.0.1", diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts index bb701a8ce..e61c606be 100644 --- a/packages/sol-compiler/src/compiler.ts +++ b/packages/sol-compiler/src/compiler.ts @@ -8,11 +8,10 @@ import { Resolver, URLResolver, } from '@0xproject/sol-resolver'; -import { logUtils } from '@0xproject/utils'; +import { fetchAsync, logUtils } from '@0xproject/utils'; import chalk from 'chalk'; import * as ethUtil from 'ethereumjs-util'; import * as fs from 'fs'; -import 'isomorphic-fetch'; import * as _ from 'lodash'; import * as path from 'path'; import * as requireFromString from 'require-from-string'; @@ -149,7 +148,7 @@ export class Compiler { } else { logUtils.log(`Downloading ${fullSolcVersion}...`); const url = `${constants.BASE_COMPILER_URL}${fullSolcVersion}`; - const response = await fetch(url); + const response = await fetchAsync(url); const SUCCESS_STATUS = 200; if (response.status !== SUCCESS_STATUS) { throw new Error(`Failed to load ${fullSolcVersion}`); -- cgit v1.2.3 From edcdc9b1b903158cc61529853d7e9028ecbc266a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 17 Jul 2018 12:58:42 +0200 Subject: Upgrade tslint to the newest version --- packages/sol-compiler/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/sol-compiler') diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 8460420ad..99e00cdc2 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -68,7 +68,7 @@ "npm-run-all": "^4.1.2", "nyc": "^11.0.1", "shx": "^0.2.2", - "tslint": "5.8.0", + "tslint": "5.11.0", "typedoc": "0xProject/typedoc", "types-bn": "^0.0.1", "typescript": "2.7.1", -- cgit v1.2.3 From bf8ac3b9e6ee59f267f7850418febfe84dedceb8 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 17 Jul 2018 12:59:02 +0200 Subject: Fix tslint issues --- packages/sol-compiler/src/compiler.ts | 14 +++++++------- packages/sol-compiler/test/compiler_test.ts | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'packages/sol-compiler') diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts index e61c606be..3620a3ec1 100644 --- a/packages/sol-compiler/src/compiler.ts +++ b/packages/sol-compiler/src/compiler.ts @@ -58,13 +58,13 @@ const CONFIG_FILE = 'compiler.json'; * to artifact files. */ export class Compiler { - private _resolver: Resolver; - private _nameResolver: NameResolver; - private _contractsDir: string; - private _compilerSettings: solc.CompilerSettings; - private _artifactsDir: string; - private _solcVersionIfExists: string | undefined; - private _specifiedContracts: string[] | TYPE_ALL_FILES_IDENTIFIER; + private readonly _resolver: Resolver; + private readonly _nameResolver: NameResolver; + private readonly _contractsDir: string; + private readonly _compilerSettings: solc.CompilerSettings; + private readonly _artifactsDir: string; + private readonly _solcVersionIfExists: string | undefined; + private readonly _specifiedContracts: string[] | TYPE_ALL_FILES_IDENTIFIER; /** * Instantiates a new instance of the Compiler class. * @return An instance of the Compiler class. diff --git a/packages/sol-compiler/test/compiler_test.ts b/packages/sol-compiler/test/compiler_test.ts index ce359dceb..c9e141ee9 100644 --- a/packages/sol-compiler/test/compiler_test.ts +++ b/packages/sol-compiler/test/compiler_test.ts @@ -12,7 +12,7 @@ import { constants } from './util/constants'; const expect = chai.expect; describe('#Compiler', function(): void { - this.timeout(constants.timeoutMs); + this.timeout(constants.timeoutMs); // tslint:disable-line:no-invalid-this const artifactsDir = `${__dirname}/fixtures/artifacts`; const contractsDir = `${__dirname}/fixtures/contracts`; const exchangeArtifactPath = `${artifactsDir}/Exchange.json`; -- cgit v1.2.3 From 8a2a4052f33df4461065df77c81f95bed58b9532 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 18 Jul 2018 15:30:38 +0200 Subject: Update changelogs --- packages/sol-compiler/CHANGELOG.json | 9 +++++++++ packages/sol-compiler/CHANGELOG.md | 4 ++++ 2 files changed, 13 insertions(+) (limited to 'packages/sol-compiler') diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json index c96efcd89..3633cc5db 100644 --- a/packages/sol-compiler/CHANGELOG.json +++ b/packages/sol-compiler/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "timestamp": 1531919263, + "version": "0.5.4", + "changes": [ + { + "note": "Dependencies updated" + } + ] + }, { "timestamp": 1531149657, "version": "0.5.3", diff --git a/packages/sol-compiler/CHANGELOG.md b/packages/sol-compiler/CHANGELOG.md index 1a69a1c8e..2ee2931a6 100644 --- a/packages/sol-compiler/CHANGELOG.md +++ b/packages/sol-compiler/CHANGELOG.md @@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v0.5.4 - _July 18, 2018_ + + * Dependencies updated + ## v0.5.3 - _July 9, 2018_ * Dependencies updated -- cgit v1.2.3 From f99232095b3effea261b5b24bc01db4f96c416f6 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 18 Jul 2018 15:48:09 +0200 Subject: Update package versions --- packages/sol-compiler/package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/sol-compiler') diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 99e00cdc2..670dfad2e 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/sol-compiler", - "version": "0.5.3", + "version": "0.5.4", "engines": { "node": ">=6.12" }, @@ -53,7 +53,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-compiler/README.md", "devDependencies": { - "@0xproject/dev-utils": "^0.4.5", + "@0xproject/dev-utils": "^0.4.6", "@0xproject/monorepo-scripts": "^0.2.2", "@0xproject/tslint-config": "^0.4.21", "@types/mkdirp": "^0.5.2", @@ -77,12 +77,12 @@ }, "dependencies": { "@0xproject/assert": "0.2.13", - "@0xproject/json-schemas": "0.8.2", + "@0xproject/json-schemas": "0.8.3", "@0xproject/sol-resolver": "^0.0.8", "@0xproject/types": "^0.8.2", - "@0xproject/typescript-typings": "^0.4.2", - "@0xproject/utils": "^0.7.2", - "@0xproject/web3-wrapper": "^0.7.2", + "@0xproject/typescript-typings": "^0.4.3", + "@0xproject/utils": "^0.7.3", + "@0xproject/web3-wrapper": "^0.7.3", "@types/yargs": "^11.0.0", "ethereum-types": "^0.0.2", "chalk": "^2.3.0", -- cgit v1.2.3