From 39724292e36c9812ec727d2734e34a2ffd92cdb7 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 23 Jul 2018 19:28:27 +0200 Subject: Omit building website before publish --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 66f9a9e0c..0fa7076e9 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc", "report_coverage": "lcov-result-merger 'packages/*/coverage/lcov.info' | coveralls", "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js", - "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild script:publish", - "run:publish:dry": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild script:publish:dry", + "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild:no_website script:publish", + "run:publish:dry": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild:no_website script:publish:dry", "script:prepublish_checks": "node ./packages/monorepo-scripts/lib/prepublish_checks.js", "script:publish": "node ./packages/monorepo-scripts/lib/publish.js", "script:publish:dry": "IS_DRY_RUN=true yarn script:publish", @@ -23,10 +23,12 @@ "lerna:run": "lerna run", "watch": "wsrun watch_without_deps $PKG --fast-exit -r --stages --done-criteria='complete|successfully'", "build": "wsrun build $PKG --fast-exit -r --stages", + "build:no_website": "wsrun build $PKG --fast-exit -r --stages --exclude @0xproject/website", "build:monorepo_scripts": "PKG=@0xproject/monorepo-scripts yarn build", "clean": "wsrun clean $PKG --fast-exit -r --parallel", "remove_node_modules": "lerna clean --yes; rm -rf node_modules", "rebuild": "run-s clean build", + "rebuild:no_website": "run-s clean build:no_website", "test": "wsrun test $PKG --fast-exit --serial --exclude-missing", "stage_docs": "wsrun docs:stage $PKG --fast-exit --parallel --exclude-missing", "lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing", -- cgit v1.2.3 From e873b8948f8a158acdb15a76c13479eb90416e1e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 23 Jul 2018 20:15:35 +0200 Subject: And also temporarily remove rebuilding from publish flow --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 0fa7076e9..397c267a7 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc", "report_coverage": "lcov-result-merger 'packages/*/coverage/lcov.info' | coveralls", "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js", - "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild:no_website script:publish", - "run:publish:dry": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild:no_website script:publish:dry", + "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks script:publish", + "run:publish:dry": "run-s install:all build:monorepo_scripts script:prepublish_checks script:publish:dry", "script:prepublish_checks": "node ./packages/monorepo-scripts/lib/prepublish_checks.js", "script:publish": "node ./packages/monorepo-scripts/lib/publish.js", "script:publish:dry": "IS_DRY_RUN=true yarn script:publish", -- cgit v1.2.3 From 5fe0e9f2e78d064c4a941777a3f7e25bbba19e86 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 24 Jul 2018 12:36:53 +0200 Subject: Temporarily use local lerna --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 397c267a7..7aa4d8c9d 100644 --- a/package.json +++ b/package.json @@ -42,11 +42,11 @@ "coveralls": "^3.0.0", "ganache-cli": "6.1.3", "lcov-result-merger": "^3.0.0", - "lerna": "3.0.0-beta.14", + "lerna": "3.0.0-beta.23", "npm-run-all": "^4.1.2", "prettier": "^1.11.1", - "wsrun": "^2.2.0", - "source-map-support": "^0.5.6" + "source-map-support": "^0.5.6", + "wsrun": "^2.2.0" }, "resolutions": { "ethers": "0xproject/ethers.js#eip-838-reasons" -- cgit v1.2.3 From 789762617fd58628c60486403ce0ff674fa29142 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 24 Jul 2018 13:05:18 +0200 Subject: Upgrade to new lerna --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7aa4d8c9d..b500f727b 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "coveralls": "^3.0.0", "ganache-cli": "6.1.3", "lcov-result-merger": "^3.0.0", - "lerna": "3.0.0-beta.23", + "lerna": "^3.0.0-beta.25", "npm-run-all": "^4.1.2", "prettier": "^1.11.1", "source-map-support": "^0.5.6", -- cgit v1.2.3 From 0772403ea9265d0f959761e7c3ce3b4dda9d0e07 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 24 Jul 2018 15:18:46 +0200 Subject: Fix(lerna): Change lerna version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index b500f727b..bd6b66a30 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "coveralls": "^3.0.0", "ganache-cli": "6.1.3", "lcov-result-merger": "^3.0.0", - "lerna": "^3.0.0-beta.25", + "lerna": "^3.0.0-beta.24", "npm-run-all": "^4.1.2", "prettier": "^1.11.1", "source-map-support": "^0.5.6", -- cgit v1.2.3 From 14b3c50b69df4c61818cb11164778027a6be80f4 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 24 Jul 2018 16:29:55 +0200 Subject: Fix lerna verson --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index bd6b66a30..66bc5f807 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "coveralls": "^3.0.0", "ganache-cli": "6.1.3", "lcov-result-merger": "^3.0.0", - "lerna": "^3.0.0-beta.24", + "lerna": "^3.0.0-beta.23", "npm-run-all": "^4.1.2", "prettier": "^1.11.1", "source-map-support": "^0.5.6", -- cgit v1.2.3 From c5859b65a395f31c87a3d3fbd303ed17156be09f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Tue, 24 Jul 2018 19:35:13 +0200 Subject: Install our fork of lerna and use it --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 66bc5f807..1cea9ff61 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "coveralls": "^3.0.0", "ganache-cli": "6.1.3", "lcov-result-merger": "^3.0.0", - "lerna": "^3.0.0-beta.23", + "@0x-lerna-fork/lerna": "3.0.0-beta.23", "npm-run-all": "^4.1.2", "prettier": "^1.11.1", "source-map-support": "^0.5.6", -- cgit v1.2.3 From dbc798596b052d3e28cf5772c94789d37ee5a4c7 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 24 Jul 2018 21:37:01 +0200 Subject: Replace dry mode with local publishing mode --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 1cea9ff61..0045ea6c8 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,10 @@ "report_coverage": "lcov-result-merger 'packages/*/coverage/lcov.info' | coveralls", "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js", "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks script:publish", - "run:publish:dry": "run-s install:all build:monorepo_scripts script:prepublish_checks script:publish:dry", + "run:publish:local": "run-s install:all build:monorepo_scripts script:prepublish_checks script:publish:local", "script:prepublish_checks": "node ./packages/monorepo-scripts/lib/prepublish_checks.js", "script:publish": "node ./packages/monorepo-scripts/lib/publish.js", - "script:publish:dry": "IS_DRY_RUN=true yarn script:publish", + "script:publish:local": "IS_LOCAL_PUBLISH=true yarn script:publish", "install:all": "yarn install", "wsrun": "wsrun", "lerna:run": "lerna run", -- cgit v1.2.3 From c40b3dea6cefc9a192136d66311839bd7c5d5169 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 24 Jul 2018 21:39:31 +0200 Subject: Specify registry url only if local publish attempted --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 0045ea6c8..7fe0dc5d2 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,9 @@ "report_coverage": "lcov-result-merger 'packages/*/coverage/lcov.info' | coveralls", "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js", "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks script:publish", - "run:publish:local": "run-s install:all build:monorepo_scripts script:prepublish_checks script:publish:local", + "run:publish:local": "IS_LOCAL_PUBLISH=true yarn run:publish", "script:prepublish_checks": "node ./packages/monorepo-scripts/lib/prepublish_checks.js", "script:publish": "node ./packages/monorepo-scripts/lib/publish.js", - "script:publish:local": "IS_LOCAL_PUBLISH=true yarn script:publish", "install:all": "yarn install", "wsrun": "wsrun", "lerna:run": "lerna run", -- cgit v1.2.3 From c1e35332874700f3e15d42a490d6b32383abf0b1 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Wed, 25 Jul 2018 11:47:52 +0200 Subject: Add back build step --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7fe0dc5d2..40050fd2e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc", "report_coverage": "lcov-result-merger 'packages/*/coverage/lcov.info' | coveralls", "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js", - "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks script:publish", + "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild:no_website script:publish", "run:publish:local": "IS_LOCAL_PUBLISH=true yarn run:publish", "script:prepublish_checks": "node ./packages/monorepo-scripts/lib/prepublish_checks.js", "script:publish": "node ./packages/monorepo-scripts/lib/publish.js", -- cgit v1.2.3 From e320f343f8d18a301bc1d74dcb2816e3d1e3be6f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 26 Jul 2018 14:14:14 +0200 Subject: Add support for testing installations post-publish as well --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 40050fd2e..d4a21402f 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc", "report_coverage": "lcov-result-merger 'packages/*/coverage/lcov.info' | coveralls", "test:installation": "node ./packages/monorepo-scripts/lib/test_installation.js", + "test:installation:local": "IS_LOCAL_PUBLISH=true node ./packages/monorepo-scripts/lib/test_installation.js", "run:publish": "run-s install:all build:monorepo_scripts script:prepublish_checks rebuild:no_website script:publish", "run:publish:local": "IS_LOCAL_PUBLISH=true yarn run:publish", "script:prepublish_checks": "node ./packages/monorepo-scripts/lib/prepublish_checks.js", -- cgit v1.2.3 From 2e7c130f629c93fa9b0fd98b0181fe46e0bd56c9 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 26 Jul 2018 16:00:46 +0200 Subject: Expose lerna dep --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index d4a21402f..438fe5b68 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "script:publish": "node ./packages/monorepo-scripts/lib/publish.js", "install:all": "yarn install", "wsrun": "wsrun", - "lerna:run": "lerna run", + "lerna": "lerna", "watch": "wsrun watch_without_deps $PKG --fast-exit -r --stages --done-criteria='complete|successfully'", "build": "wsrun build $PKG --fast-exit -r --stages", "build:no_website": "wsrun build $PKG --fast-exit -r --stages --exclude @0xproject/website", -- cgit v1.2.3