Fix web3x-codegen path resolution bug.

xf00f · Jun 23, 2019 · 8b7f519 · 8b7f519
1 parent d79266d
commit 8b7f519
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 653 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
-## [4.0.0] - 2019-05-22
+## [4.0.1] - 2019-06-23
+
+- Fix `web3x-codegen` path resolution bug.
+
+## [4.0.0] - 2019-06-23
 
 - Major project restructure.
 - `web3x-codegen` is its own package.
@@ -159,6 +163,7 @@ All notable changes to this project will be documented in this file.
 
 - Initial release of Typescript port from web3.js.
 
+[4.0.1]: https://github.com/xf00f/web3x/compare/v4.0.0...v4.0.1
 [4.0.0]: https://github.com/xf00f/web3x/compare/v3.0.11...v4.0.0
 [3.0.11]: https://github.com/xf00f/web3x/compare/v3.0.10...v3.0.11
 [3.0.10]: https://github.com/xf00f/web3x/compare/v3.0.9...v3.0.10

diff --git a/version.json b/version.json
@@ -1 +1 @@
-"4.0.0"
+"4.0.1"
diff --git a/web3x-codegen/package.json b/web3x-codegen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web3x-codegen",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "license": "MIT",
   "description": "Contract interface code generator for web3x.",
   "repository": {

diff --git a/web3x-codegen/src/index.ts b/web3x-codegen/src/index.ts
@@ -500,8 +500,8 @@ export async function makeAndWriteFiles(
 }
 
 export function getWeb3xPath() {
-  const pkg = JSON.parse(fs.readFileSync(__dirname + '/../package.json').toString());
-  return pkg.name;
+  const pkg = JSON.parse(fs.readFileSync('package.json').toString());
+  return { ...pkg.dependencies, ...pkg.devDependencies }['web3x-es'] ? 'web3x-es' : 'web3x';
 }
 
 async function main() {

diff --git a/web3x-node-example/package.json b/web3x-node-example/package.json
@@ -27,6 +27,7 @@
   "devDependencies": {
     "@types/jest": "^23.3.12",
     "jest": "^23.6.0",
-    "nodemon": "^1.18.5"
+    "nodemon": "^1.18.5",
+    "web3x-codegen": "^4.0.0"
   }
 }
diff --git a/web3x-node-example/yarn.lock b/web3x-node-example/yarn.lock
diff --git a/web3x-webpack-example/package.json b/web3x-webpack-example/package.json
@@ -47,6 +47,7 @@
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.15.0",
     "typescript": "^2.9.1",
+    "web3x-codegen": "^4.0.0",
     "web3x-es": "^4.0.0",
     "webpack": "^4.16.0",
     "webpack-cli": "^3.0.8",

diff --git a/web3x-webpack-example/src/contracts/DaiContract.ts b/web3x-webpack-example/src/contracts/DaiContract.ts
@@ -1,10 +1,3 @@
-/*
-  Copyright (c) 2019 xf00f
-
-  This file is part of web3x and is released under the MIT License.
-  https://opensource.org/licenses/MIT
-*/
-
 import BN from "bn.js";
 import { Address } from "web3x-es/address";
 import { EventLog, TransactionReceipt } from "web3x-es/formatters";

diff --git a/web3x-webpack-example/src/contracts/DaiContractAbi.ts b/web3x-webpack-example/src/contracts/DaiContractAbi.ts
@@ -1,10 +1,3 @@
-/*
-  Copyright (c) 2019 xf00f
-
-  This file is part of web3x and is released under the MIT License.
-  https://opensource.org/licenses/MIT
-*/
-
 import { ContractAbi} from 'web3x-es/contract';
 export default new ContractAbi([
   {