From f86cc0dc7a5d75792b8ef7a38cbf9bba04cb6ab4 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Wed, 9 May 2018 13:29:43 -0700 Subject: Document Node.js version requirement and add it to package.json --- .circleci/config.yml | 18 +++++++++--------- README.md | 2 ++ package.json | 3 +++ packages/0x.js/package.json | 6 +++--- packages/abi-gen/package.json | 3 +++ packages/assert/package.json | 3 +++ packages/base-contract/package.json | 3 +++ packages/connect/package.json | 6 +++--- packages/contracts/package.json | 3 +++ packages/dev-utils/package.json | 3 +++ packages/json-schemas/package.json | 3 +++ packages/metacoin/package.json | 3 +++ packages/migrations/package.json | 3 +++ packages/monorepo-scripts/package.json | 3 +++ packages/order-utils/package.json | 3 +++ packages/react-docs-example/package.json | 3 +++ packages/react-docs/package.json | 3 +++ packages/react-shared/package.json | 3 +++ packages/sol-compiler/package.json | 3 +++ packages/sol-cov/package.json | 3 +++ packages/sol-resolver/package.json | 3 +++ packages/sra-report/package.json | 3 +++ packages/subproviders/package.json | 3 +++ packages/testnet-faucets/package.json | 3 +++ packages/tslint-config/package.json | 3 +++ packages/types/package.json | 3 +++ packages/typescript-typings/package.json | 3 +++ packages/utils/package.json | 3 +++ packages/web3-wrapper/package.json | 3 +++ packages/website/package.json | 3 +++ 30 files changed, 95 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dbd8b2926..56330aa01 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: circleci/node:6.12 + - image: circleci/node:8.11 environment: CONTRACTS_COMMIT_HASH: '9ed05f5' working_directory: ~/repo @@ -29,7 +29,7 @@ jobs: - ~/repo test-installation: docker: - - image: circleci/node:6.12 + - image: circleci/node:8.11 working_directory: ~/repo steps: - restore_cache: @@ -38,7 +38,7 @@ jobs: - run: yarn test:installation test-0xjs: docker: - - image: circleci/node:6.12 + - image: circleci/node:8.11 working_directory: ~/repo steps: - restore_cache: @@ -55,7 +55,7 @@ jobs: - ~/repo/packages/0x.js/coverage/lcov.info test-contracts: docker: - - image: circleci/node:6.12 + - image: circleci/node:8.11 working_directory: ~/repo steps: - restore_cache: @@ -72,7 +72,7 @@ jobs: - ~/repo/packages/contracts/coverage/lcov.info test-sol-compiler: docker: - - image: circleci/node:6.12 + - image: circleci/node:8.11 working_directory: ~/repo steps: - restore_cache: @@ -89,7 +89,7 @@ jobs: - ~/repo/packages/sol-compiler/coverage/lcov.info test-rest: docker: - - image: circleci/node:6.12 + - image: circleci/node:8.11 working_directory: ~/repo steps: - restore_cache: @@ -131,7 +131,7 @@ jobs: lint: working_directory: ~/repo docker: - - image: circleci/node:6.12 + - image: circleci/node:8.11 steps: - restore_cache: keys: @@ -140,7 +140,7 @@ jobs: prettier: working_directory: ~/repo docker: - - image: circleci/node:6.12 + - image: circleci/node:8.11 steps: - restore_cache: keys: @@ -148,7 +148,7 @@ jobs: - run: yarn prettier:ci submit-coverage: docker: - - image: circleci/node:6.12 + - image: circleci/node:8.11 working_directory: ~/repo steps: - restore_cache: diff --git a/README.md b/README.md index de77e980e..85d3ebcf6 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,8 @@ Dedicated documentation pages: * [Sol-cov](https://0xproject.com/docs/sol-cov) * [Standard Relayer API](https://github.com/0xProject/standard-relayer-api/blob/master/README.md) +Node version >= 8.0 is required. + Most of the packages require additional typings for external dependencies. You can include those by prepending @0xproject/typescript-typings package to your [`typeRoots`](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html) config. diff --git a/package.json b/package.json index 6aa79c840..e4aed8564 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,9 @@ { "private": true, "name": "0x-monorepo", + "engines": { + "node" : ">=8.0.0" + }, "workspaces": [ "packages/*" ], diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 36ea0751f..3da0ca337 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,9 @@ { "name": "0x.js", "version": "0.37.2", + "engines": { + "node" : ">=8.0.0" + }, "description": "A javascript library for interacting with the 0x protocol", "keywords": [ "0x.js", @@ -62,9 +65,6 @@ "url": "https://github.com/0xProject/0x-monorepo" }, "license": "Apache-2.0", - "engines": { - "node": ">=6.0.0" - }, "devDependencies": { "@0xproject/sol-compiler": "^0.4.3", "@0xproject/dev-utils": "^0.4.1", diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 82184a596..663dc88c6 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/abi-gen", "version": "0.2.13", + "engines": { + "node" : ">=8.0.0" + }, "description": "Generate contract wrappers from ABI and handlebars templates", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/assert/package.json b/packages/assert/package.json index f86bbb33f..7d3d90fbc 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/assert", "version": "0.2.9", + "engines": { + "node" : ">=8.0.0" + }, "description": "Provides a standard way of performing type and schema validation across 0x projects", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 90253616b..559865a78 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/base-contract", "version": "0.3.1", + "engines": { + "node" : ">=8.0.0" + }, "description": "0x Base TS contract", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/packages/connect/package.json b/packages/connect/package.json index 2930de98e..a3a518355 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/connect", "version": "0.6.12", + "engines": { + "node" : ">=8.0.0" + }, "description": "A javascript library for interacting with the standard relayer api", "keywords": [ "connect", @@ -42,9 +45,6 @@ }, "author": "Brandon Millman", "license": "Apache-2.0", - "engines": { - "node": ">=6.0.0" - }, "bugs": { "url": "https://github.com/0xProject/0x-monorepo/issues" }, diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 557effca2..6cc07d0dc 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -2,6 +2,9 @@ "private": true, "name": "contracts", "version": "2.1.28", + "engines": { + "node" : ">=8.0.0" + }, "description": "Smart contract components of 0x protocol", "main": "index.js", "directories": { diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 67b448024..63b93f8ad 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/dev-utils", "version": "0.4.1", + "engines": { + "node" : ">=8.0.0" + }, "description": "0x dev TS utils", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 9da9da2b7..86edb1343 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/json-schemas", "version": "0.7.23", + "engines": { + "node" : ">=8.0.0" + }, "description": "0x-related json schemas", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index be1a33d65..d4b7f2997 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/metacoin", "version": "0.0.6", + "engines": { + "node" : ">=8.0.0" + }, "private": true, "description": "Example solidity project using 0x dev tools", "scripts": { diff --git a/packages/migrations/package.json b/packages/migrations/package.json index 95922f7b6..e69171b3e 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/migrations", "version": "0.0.5", + "engines": { + "node" : ">=8.0.0" + }, "description": "0x smart contract migrations", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index ef5840546..0afd640f9 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/monorepo-scripts", "version": "0.1.19", + "engines": { + "node" : ">=8.0.0" + }, "description": "Helper scripts for the monorepo", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index cdb5b63b0..a7077f9b1 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/order-utils", "version": "0.0.4", + "engines": { + "node" : ">=8.0.0" + }, "description": "0x order utils", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/packages/react-docs-example/package.json b/packages/react-docs-example/package.json index b6b6c6c7d..3c8940f2d 100644 --- a/packages/react-docs-example/package.json +++ b/packages/react-docs-example/package.json @@ -2,6 +2,9 @@ "private": true, "name": "@0xproject/react-docs-example", "version": "0.0.11", + "engines": { + "node" : ">=8.0.0" + }, "description": "An example app using react-docs", "scripts": { "lint": "tslint --project .", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index ca9ae610e..6be2acb35 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/react-docs", "version": "0.0.11", + "engines": { + "node" : ">=8.0.0" + }, "description": "React documentation component for rendering TypeDoc & Doxity generated JSON", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index b9a46376c..1bc54f308 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/react-shared", "version": "0.1.6", + "engines": { + "node" : ">=8.0.0" + }, "description": "0x shared react components", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 19d390c32..72a5d0e53 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/sol-compiler", "version": "0.4.3", + "engines": { + "node" : ">=8.0.0" + }, "description": "Solidity compiler wrapper and artifactor", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 6268df4c7..e618f961c 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/sol-cov", "version": "0.0.10", + "engines": { + "node" : ">=8.0.0" + }, "description": "Generate coverage reports for Solidity code", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index 6e4ba97e4..380decb73 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/sol-resolver", "version": "0.0.4", + "engines": { + "node" : ">=8.0.0" + }, "description": "Import resolver for smart contracts dependencies", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 1fc0d3ade..ebafc222b 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/sra-report", "version": "0.0.14", + "engines": { + "node" : ">=8.0.0" + }, "description": "Generate reports for standard relayer API compliance", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 92377f118..c127ad0f2 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/subproviders", "version": "0.10.1", + "engines": { + "node" : ">=8.0.0" + }, "main": "lib/src/index.js", "types": "lib/src/index.d.ts", "license": "Apache-2.0", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 48fe77bf4..d1899e1b4 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -2,6 +2,9 @@ "private": true, "name": "@0xproject/testnet-faucets", "version": "1.0.29", + "engines": { + "node" : ">=8.0.0" + }, "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether", "main": "server.js", "scripts": { diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index a5b34a35e..0f894cecc 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/tslint-config", "version": "0.4.17", + "engines": { + "node" : ">=8.0.0" + }, "description": "Lint rules related to 0xProject for TSLint", "main": "tslint.json", "scripts": { diff --git a/packages/types/package.json b/packages/types/package.json index 973d5b8d0..55c961510 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/types", "version": "0.6.3", + "engines": { + "node" : ">=8.0.0" + }, "description": "0x types", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json index ad865854c..2e03ed5ea 100644 --- a/packages/typescript-typings/package.json +++ b/packages/typescript-typings/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/typescript-typings", "version": "0.3.1", + "engines": { + "node" : ">=8.0.0" + }, "description": "0x project typescript type definitions", "scripts": { "build": "tsc && copyfiles -u 1 './lib/**/*' ./scripts", diff --git a/packages/utils/package.json b/packages/utils/package.json index 0924aefc3..a1d8242a3 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/utils", "version": "0.6.1", + "engines": { + "node" : ">=8.0.0" + }, "description": "0x TS utils", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index bc38df00d..d8cd38b18 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/web3-wrapper", "version": "0.6.3", + "engines": { + "node" : ">=8.0.0" + }, "description": "Wraps around web3 and gives a nicer interface", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/packages/website/package.json b/packages/website/package.json index ad84a3eb9..9ec2b0ae5 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,9 @@ { "name": "@0xproject/website", "version": "0.0.32", + "engines": { + "node" : ">=8.0.0" + }, "private": true, "description": "Website and 0x portal dapp", "scripts": { -- cgit v1.2.3 From fdeab0475c956c48ab79bb5238ae60e732b14e11 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Thu, 10 May 2018 11:46:02 -0700 Subject: Change minimum Node version to 6.12 --- .circleci/config.yml | 18 +++++++++--------- README.md | 2 +- package.json | 2 +- packages/0x.js/package.json | 2 +- packages/abi-gen/package.json | 2 +- packages/assert/package.json | 2 +- packages/base-contract/package.json | 2 +- packages/connect/package.json | 2 +- packages/contracts/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/json-schemas/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/migrations/package.json | 2 +- packages/monorepo-scripts/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/react-docs-example/package.json | 2 +- packages/react-docs/package.json | 2 +- packages/react-shared/package.json | 2 +- packages/sol-compiler/package.json | 2 +- packages/sol-cov/package.json | 2 +- packages/sol-resolver/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/subproviders/package.json | 2 +- packages/testnet-faucets/package.json | 2 +- packages/tslint-config/package.json | 2 +- packages/types/package.json | 2 +- packages/typescript-typings/package.json | 2 +- packages/utils/package.json | 2 +- packages/web3-wrapper/package.json | 2 +- packages/website/package.json | 2 +- 30 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 56330aa01..dbd8b2926 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: circleci/node:8.11 + - image: circleci/node:6.12 environment: CONTRACTS_COMMIT_HASH: '9ed05f5' working_directory: ~/repo @@ -29,7 +29,7 @@ jobs: - ~/repo test-installation: docker: - - image: circleci/node:8.11 + - image: circleci/node:6.12 working_directory: ~/repo steps: - restore_cache: @@ -38,7 +38,7 @@ jobs: - run: yarn test:installation test-0xjs: docker: - - image: circleci/node:8.11 + - image: circleci/node:6.12 working_directory: ~/repo steps: - restore_cache: @@ -55,7 +55,7 @@ jobs: - ~/repo/packages/0x.js/coverage/lcov.info test-contracts: docker: - - image: circleci/node:8.11 + - image: circleci/node:6.12 working_directory: ~/repo steps: - restore_cache: @@ -72,7 +72,7 @@ jobs: - ~/repo/packages/contracts/coverage/lcov.info test-sol-compiler: docker: - - image: circleci/node:8.11 + - image: circleci/node:6.12 working_directory: ~/repo steps: - restore_cache: @@ -89,7 +89,7 @@ jobs: - ~/repo/packages/sol-compiler/coverage/lcov.info test-rest: docker: - - image: circleci/node:8.11 + - image: circleci/node:6.12 working_directory: ~/repo steps: - restore_cache: @@ -131,7 +131,7 @@ jobs: lint: working_directory: ~/repo docker: - - image: circleci/node:8.11 + - image: circleci/node:6.12 steps: - restore_cache: keys: @@ -140,7 +140,7 @@ jobs: prettier: working_directory: ~/repo docker: - - image: circleci/node:8.11 + - image: circleci/node:6.12 steps: - restore_cache: keys: @@ -148,7 +148,7 @@ jobs: - run: yarn prettier:ci submit-coverage: docker: - - image: circleci/node:8.11 + - image: circleci/node:6.12 working_directory: ~/repo steps: - restore_cache: diff --git a/README.md b/README.md index 85d3ebcf6..c10bda115 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Dedicated documentation pages: * [Sol-cov](https://0xproject.com/docs/sol-cov) * [Standard Relayer API](https://github.com/0xProject/standard-relayer-api/blob/master/README.md) -Node version >= 8.0 is required. +Node version >= 6.12 is required. Most of the packages require additional typings for external dependencies. You can include those by prepending @0xproject/typescript-typings package to your [`typeRoots`](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html) config. diff --git a/package.json b/package.json index e4aed8564..8cd55f3a8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "name": "0x-monorepo", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "workspaces": [ "packages/*" diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 3da0ca337..4addac622 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -2,7 +2,7 @@ "name": "0x.js", "version": "0.37.2", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "A javascript library for interacting with the 0x protocol", "keywords": [ diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 663dc88c6..3c7fb1b42 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/abi-gen", "version": "0.2.13", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "Generate contract wrappers from ABI and handlebars templates", "main": "lib/index.js", diff --git a/packages/assert/package.json b/packages/assert/package.json index 7d3d90fbc..b0ff38dd8 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/assert", "version": "0.2.9", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "Provides a standard way of performing type and schema validation across 0x projects", "main": "lib/src/index.js", diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 559865a78..b7e0b9e4a 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/base-contract", "version": "0.3.1", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "0x Base TS contract", "main": "lib/src/index.js", diff --git a/packages/connect/package.json b/packages/connect/package.json index a3a518355..5d6073155 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/connect", "version": "0.6.12", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "A javascript library for interacting with the standard relayer api", "keywords": [ diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 6cc07d0dc..7efcb6862 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -3,7 +3,7 @@ "name": "contracts", "version": "2.1.28", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "Smart contract components of 0x protocol", "main": "index.js", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 63b93f8ad..358813f5d 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/dev-utils", "version": "0.4.1", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "0x dev TS utils", "main": "lib/src/index.js", diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 86edb1343..f80b4b31a 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/json-schemas", "version": "0.7.23", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "0x-related json schemas", "main": "lib/src/index.js", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index d4b7f2997..42be6574d 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/metacoin", "version": "0.0.6", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "private": true, "description": "Example solidity project using 0x dev tools", diff --git a/packages/migrations/package.json b/packages/migrations/package.json index e69171b3e..45328b634 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/migrations", "version": "0.0.5", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "0x smart contract migrations", "main": "lib/index.js", diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 0afd640f9..aa056aa27 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/monorepo-scripts", "version": "0.1.19", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "Helper scripts for the monorepo", "main": "lib/index.js", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index a7077f9b1..e9da68480 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/order-utils", "version": "0.0.4", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "0x order utils", "main": "lib/src/index.js", diff --git a/packages/react-docs-example/package.json b/packages/react-docs-example/package.json index 3c8940f2d..b05a03154 100644 --- a/packages/react-docs-example/package.json +++ b/packages/react-docs-example/package.json @@ -3,7 +3,7 @@ "name": "@0xproject/react-docs-example", "version": "0.0.11", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "An example app using react-docs", "scripts": { diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 6be2acb35..49c6d6a1a 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/react-docs", "version": "0.0.11", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "React documentation component for rendering TypeDoc & Doxity generated JSON", "main": "lib/index.js", diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 1bc54f308..eba3504eb 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/react-shared", "version": "0.1.6", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "0x shared react components", "main": "lib/index.js", diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 72a5d0e53..4eac472c7 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/sol-compiler", "version": "0.4.3", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "Solidity compiler wrapper and artifactor", "main": "lib/src/index.js", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index e618f961c..fbaf2ab44 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/sol-cov", "version": "0.0.10", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "Generate coverage reports for Solidity code", "main": "lib/src/index.js", diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index 380decb73..70675c18d 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/sol-resolver", "version": "0.0.4", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "Import resolver for smart contracts dependencies", "main": "lib/index.js", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index ebafc222b..245ab7668 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/sra-report", "version": "0.0.14", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "Generate reports for standard relayer API compliance", "main": "lib/src/index.js", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index c127ad0f2..d7c1538b6 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/subproviders", "version": "0.10.1", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "main": "lib/src/index.js", "types": "lib/src/index.d.ts", diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index d1899e1b4..f49d17425 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -3,7 +3,7 @@ "name": "@0xproject/testnet-faucets", "version": "1.0.29", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether", "main": "server.js", diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index 0f894cecc..2b3c66eb9 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/tslint-config", "version": "0.4.17", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "Lint rules related to 0xProject for TSLint", "main": "tslint.json", diff --git a/packages/types/package.json b/packages/types/package.json index 55c961510..b261a682c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/types", "version": "0.6.3", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "0x types", "main": "lib/index.js", diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json index 2e03ed5ea..8a8b2c19e 100644 --- a/packages/typescript-typings/package.json +++ b/packages/typescript-typings/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/typescript-typings", "version": "0.3.1", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "0x project typescript type definitions", "scripts": { diff --git a/packages/utils/package.json b/packages/utils/package.json index a1d8242a3..d49f4ff52 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/utils", "version": "0.6.1", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "0x TS utils", "main": "lib/index.js", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index d8cd38b18..4da40d479 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/web3-wrapper", "version": "0.6.3", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "description": "Wraps around web3 and gives a nicer interface", "main": "lib/src/index.js", diff --git a/packages/website/package.json b/packages/website/package.json index 9ec2b0ae5..707fea108 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/website", "version": "0.0.32", "engines": { - "node" : ">=8.0.0" + "node" : ">=6.12" }, "private": true, "description": "Website and 0x portal dapp", -- cgit v1.2.3 From 184232ba4fe304bb00a3dbbee21972b1ff29736b Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Tue, 15 May 2018 13:51:43 -0700 Subject: Add dogfood configs to website --- packages/website/package.json | 1 + packages/website/ts/index.tsx | 2 +- packages/website/ts/utils/configs.ts | 6 +++++- packages/website/ts/utils/utils.ts | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/website/package.json b/packages/website/package.json index 538aa91a7..f1b2a1750 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -11,6 +11,7 @@ "clean": "shx rm -f public/bundle*", "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'", "watch": "webpack-dev-server --content-base public --https", + "deploy_dogfood": "npm run build; aws s3 sync ./public/. s3://dogfood-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers", "deploy_staging": "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers", "deploy_live": "npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers" }, diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx index 49bcdeaac..f255f81e7 100644 --- a/packages/website/ts/index.tsx +++ b/packages/website/ts/index.tsx @@ -35,7 +35,7 @@ import 'less/all.less'; // At the same time webpack statically parses for System.import() to determine bundle chunk split points // so each lazy import needs it's own `System.import()` declaration. const LazyPortal = - utils.isDevelopment() || utils.isStaging() + utils.isDevelopment() || utils.isStaging() || utils.isDogfood() ? createLazyComponent('Portal', async () => System.import(/* webpackChunkName: "portal" */ 'ts/containers/portal'), ) diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts index a54fc56a8..bea9c4ee2 100644 --- a/packages/website/ts/utils/configs.ts +++ b/packages/website/ts/utils/configs.ts @@ -1,5 +1,6 @@ import * as _ from 'lodash'; import { Environments, OutdatedWrappedEtherByNetworkId, PublicNodeUrlsByNetworkId } from 'ts/types'; +import { utils } from 'ts/utils/utils'; const BASE_URL = window.location.origin; const isDevelopment = _.includes( @@ -10,13 +11,16 @@ const INFURA_API_KEY = 'T5WSC8cautR4KXyYgsRs'; export const configs = { AMOUNT_DISPLAY_PRECSION: 5, - BACKEND_BASE_URL: 'https://website-api.0xproject.com', + BACKEND_BASE_URL: utils.isDogfood() + ? 'http://ec2-52-91-181-85.compute-1.amazonaws.com' + : 'https://website-api.0xproject.com', BASE_URL, BITLY_ACCESS_TOKEN: 'ffc4c1a31e5143848fb7c523b39f91b9b213d208', DEFAULT_DERIVATION_PATH: `44'/60'/0'`, // WARNING: ZRX & WETH MUST always be default trackedTokens DEFAULT_TRACKED_TOKEN_SYMBOLS: ['WETH', 'ZRX'], DOMAIN_STAGING: 'staging-0xproject.s3-website-us-east-1.amazonaws.com', + DOMAIN_DOGFOOD: 'dogfood-0xproject.s3-website-us-east-1.amazonaws.com', DOMAIN_DEVELOPMENT: '0xproject.localhost:3572', DOMAIN_PRODUCTION: '0xproject.com', ENVIRONMENT: isDevelopment ? Environments.DEVELOPMENT : Environments.PRODUCTION, diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index bf30f4e04..c3e261ddb 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -308,4 +308,7 @@ export const utils = { isStaging(): boolean { return _.includes(window.location.href, configs.DOMAIN_STAGING); }, + isDogfood(): boolean { + return _.includes(window.location.href, configs.DOMAIN_DOGFOOD); + }, }; -- cgit v1.2.3 From 509a81a572937e1a7376d59c0ebb66fdb9e99960 Mon Sep 17 00:00:00 2001 From: fragosti Date: Tue, 15 May 2018 14:44:57 -0700 Subject: Add myself to about page --- packages/website/ts/pages/about/about.tsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index 673022329..360cbb136 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -128,9 +128,6 @@ const teamRow4: ProfileInfo[] = [ github: '', medium: '', }, -]; - -const teamRow5: ProfileInfo[] = [ { name: 'Greg Hysen', title: 'Blockchain Engineer', @@ -140,6 +137,9 @@ const teamRow5: ProfileInfo[] = [ github: 'https://github.com/hysz', medium: '', }, +]; + +const teamRow5: ProfileInfo[] = [ { name: 'Remco Bloemen', title: 'Technical Fellow', @@ -149,6 +149,14 @@ const teamRow5: ProfileInfo[] = [ github: 'http://github.com/recmo', medium: '', }, + { + name: 'Francesco Agosti', + title: 'Senior Frontend Engineer', + description: `Full-stack engineer. Previously senior software engineer at Yelp. Computer science Duke.`, + image: 'images/team/fragosti.png', + linkedIn: 'https://www.linkedin.com/in/fragosti/', + github: 'http://github.com/fragosti', + }, ]; const advisors: ProfileInfo[] = [ -- cgit v1.2.3 From f43b275f16b46a72409962bb61fe1eb66f700c62 Mon Sep 17 00:00:00 2001 From: fragosti Date: Tue, 15 May 2018 14:50:33 -0700 Subject: Add my profile image to images --- packages/website/public/images/team/fragosti.png | Bin 0 -> 26209 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/website/public/images/team/fragosti.png diff --git a/packages/website/public/images/team/fragosti.png b/packages/website/public/images/team/fragosti.png new file mode 100644 index 000000000..60c168514 Binary files /dev/null and b/packages/website/public/images/team/fragosti.png differ -- cgit v1.2.3 From 2ba78eb740d4eb04ecc1147f52dce236047f6816 Mon Sep 17 00:00:00 2001 From: fragosti Date: Tue, 15 May 2018 15:27:27 -0700 Subject: Fix circular dependency --- packages/website/ts/utils/backend_client.ts | 10 +++++----- packages/website/ts/utils/configs.ts | 5 ++--- packages/website/ts/utils/utils.ts | 9 ++++++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/website/ts/utils/backend_client.ts b/packages/website/ts/utils/backend_client.ts index 63e06fda7..cc238325a 100644 --- a/packages/website/ts/utils/backend_client.ts +++ b/packages/website/ts/utils/backend_client.ts @@ -1,7 +1,7 @@ import * as _ from 'lodash'; import { ArticlesBySection, WebsiteBackendGasInfo, WebsiteBackendPriceInfo, WebsiteBackendRelayerInfo } from 'ts/types'; -import { configs } from 'ts/utils/configs'; +import { utils } from 'ts/utils/utils'; import { fetchUtils } from 'ts/utils/fetch_utils'; const ETH_GAS_STATION_ENDPOINT = '/eth_gas_station'; @@ -11,7 +11,7 @@ const WIKI_ENDPOINT = '/wiki'; export const backendClient = { async getGasInfoAsync(): Promise { - const result = await fetchUtils.requestAsync(configs.BACKEND_BASE_URL, ETH_GAS_STATION_ENDPOINT); + const result = await fetchUtils.requestAsync(utils.getBackendBaseUrl(), ETH_GAS_STATION_ENDPOINT); return result; }, async getPriceInfoAsync(tokenSymbols: string[]): Promise { @@ -22,15 +22,15 @@ export const backendClient = { const queryParams = { tokens: joinedTokenSymbols, }; - const result = await fetchUtils.requestAsync(configs.BACKEND_BASE_URL, PRICES_ENDPOINT, queryParams); + const result = await fetchUtils.requestAsync(utils.getBackendBaseUrl(), PRICES_ENDPOINT, queryParams); return result; }, async getRelayerInfosAsync(): Promise { - const result = await fetchUtils.requestAsync(configs.BACKEND_BASE_URL, RELAYERS_ENDPOINT); + const result = await fetchUtils.requestAsync(utils.getBackendBaseUrl(), RELAYERS_ENDPOINT); return result; }, async getWikiArticlesBySectionAsync(): Promise { - const result = await fetchUtils.requestAsync(configs.BACKEND_BASE_URL, WIKI_ENDPOINT); + const result = await fetchUtils.requestAsync(utils.getBackendBaseUrl(), WIKI_ENDPOINT); return result; }, }; diff --git a/packages/website/ts/utils/configs.ts b/packages/website/ts/utils/configs.ts index bea9c4ee2..9fec814b7 100644 --- a/packages/website/ts/utils/configs.ts +++ b/packages/website/ts/utils/configs.ts @@ -11,9 +11,8 @@ const INFURA_API_KEY = 'T5WSC8cautR4KXyYgsRs'; export const configs = { AMOUNT_DISPLAY_PRECSION: 5, - BACKEND_BASE_URL: utils.isDogfood() - ? 'http://ec2-52-91-181-85.compute-1.amazonaws.com' - : 'https://website-api.0xproject.com', + BACKEND_BASE_PROD_URL: 'https://website-api.0xproject.com', + BACKEND_BASE_STAGING_URL: 'http://ec2-52-91-181-85.compute-1.amazonaws.com', BASE_URL, BITLY_ACCESS_TOKEN: 'ffc4c1a31e5143848fb7c523b39f91b9b213d208', DEFAULT_DERIVATION_PATH: `44'/60'/0'`, diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index c3e261ddb..cb01fec24 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -24,6 +24,8 @@ import * as u2f from 'ts/vendor/u2f_api'; const LG_MIN_EM = 64; const MD_MIN_EM = 52; +const isDogfood = (): boolean => _.includes(window.location.href, configs.DOMAIN_DOGFOOD); + export const utils = { assert(condition: boolean, message: string): void { if (!condition) { @@ -302,13 +304,14 @@ export const utils = { } return parsedProviderName; }, + getBackendBaseUrl(): string { + return isDogfood() ? configs.BACKEND_BASE_STAGING_URL : configs.BACKEND_BASE_PROD_URL; + }, isDevelopment(): boolean { return configs.ENVIRONMENT === Environments.DEVELOPMENT; }, isStaging(): boolean { return _.includes(window.location.href, configs.DOMAIN_STAGING); }, - isDogfood(): boolean { - return _.includes(window.location.href, configs.DOMAIN_DOGFOOD); - }, + isDogfood, }; -- cgit v1.2.3 From dc58d539c2ec0561974323aced0841d17117927d Mon Sep 17 00:00:00 2001 From: fragosti Date: Tue, 15 May 2018 15:54:17 -0700 Subject: fix style errors --- packages/website/ts/utils/backend_client.ts | 2 +- packages/website/ts/utils/utils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/ts/utils/backend_client.ts b/packages/website/ts/utils/backend_client.ts index cc238325a..c440b1604 100644 --- a/packages/website/ts/utils/backend_client.ts +++ b/packages/website/ts/utils/backend_client.ts @@ -1,8 +1,8 @@ import * as _ from 'lodash'; import { ArticlesBySection, WebsiteBackendGasInfo, WebsiteBackendPriceInfo, WebsiteBackendRelayerInfo } from 'ts/types'; -import { utils } from 'ts/utils/utils'; import { fetchUtils } from 'ts/utils/fetch_utils'; +import { utils } from 'ts/utils/utils'; const ETH_GAS_STATION_ENDPOINT = '/eth_gas_station'; const PRICES_ENDPOINT = '/prices'; diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index cb01fec24..3c99bd2fe 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -305,7 +305,7 @@ export const utils = { return parsedProviderName; }, getBackendBaseUrl(): string { - return isDogfood() ? configs.BACKEND_BASE_STAGING_URL : configs.BACKEND_BASE_PROD_URL; + return isDogfood() ? configs.BACKEND_BASE_STAGING_URL : configs.BACKEND_BASE_PROD_URL; }, isDevelopment(): boolean { return configs.ENVIRONMENT === Environments.DEVELOPMENT; -- cgit v1.2.3