aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-11-26 21:11:04 +0800
committerGitHub <noreply@github.com>2018-11-26 21:11:04 +0800
commit8caded1d1d94d03aa49a2490b46eaebd8bf5ed74 (patch)
treea34b0e80c4b6c73a2e4e9db641a4c6027a0b7362
parent387d7199d16287444b2ff0b13d4dd9664119150f (diff)
parentebc31169094e17b17a0968ad2e5f1d2eb014a698 (diff)
downloaddexon-sol-tools-8caded1d1d94d03aa49a2490b46eaebd8bf5ed74.tar
dexon-sol-tools-8caded1d1d94d03aa49a2490b46eaebd8bf5ed74.tar.gz
dexon-sol-tools-8caded1d1d94d03aa49a2490b46eaebd8bf5ed74.tar.bz2
dexon-sol-tools-8caded1d1d94d03aa49a2490b46eaebd8bf5ed74.tar.lz
dexon-sol-tools-8caded1d1d94d03aa49a2490b46eaebd8bf5ed74.tar.xz
dexon-sol-tools-8caded1d1d94d03aa49a2490b46eaebd8bf5ed74.tar.zst
dexon-sol-tools-8caded1d1d94d03aa49a2490b46eaebd8bf5ed74.zip
Merge pull request #1319 from 0xProject/revert-1312-feature/build-fix-instant
Revert "[@0x/instant] Fix CI build broken by instant installation tests"
-rw-r--r--packages/instant/package.json2
-rw-r--r--packages/monorepo-scripts/CHANGELOG.json9
-rw-r--r--packages/monorepo-scripts/src/publish.ts2
3 files changed, 2 insertions, 11 deletions
diff --git a/packages/instant/package.json b/packages/instant/package.json
index 9616af54f..d3a85a646 100644
--- a/packages/instant/package.json
+++ b/packages/instant/package.json
@@ -11,7 +11,7 @@
"build": "yarn build:all",
"build:all": "run-p build:umd:prod build:commonjs",
"build:umd:prod": "webpack --mode production",
- "build:commonjs": "tsc -b && shx cp -r src/assets lib",
+ "build:commonjs": "tsc -b",
"build:ci": "yarn build",
"watch_without_deps": "tsc -w",
"dev": "webpack-dev-server --mode development",
diff --git a/packages/monorepo-scripts/CHANGELOG.json b/packages/monorepo-scripts/CHANGELOG.json
index 4aa6be382..170a97a33 100644
--- a/packages/monorepo-scripts/CHANGELOG.json
+++ b/packages/monorepo-scripts/CHANGELOG.json
@@ -1,14 +1,5 @@
[
{
- "version": "1.0.7",
- "changes": [
- {
- "note": "Fix the lerna parameter name from cdVersions to cd-versions",
- "pr": 1312
- }
- ]
- },
- {
"version": "1.0.6",
"changes": [
{
diff --git a/packages/monorepo-scripts/src/publish.ts b/packages/monorepo-scripts/src/publish.ts
index 19947d78f..854a72b86 100644
--- a/packages/monorepo-scripts/src/publish.ts
+++ b/packages/monorepo-scripts/src/publish.ts
@@ -208,7 +208,7 @@ async function lernaPublishAsync(packageToNextVersion: { [name: string]: string
const packageVersionString = _.map(packageToNextVersion, (nextVersion: string, packageName: string) => {
return `${packageName}@${nextVersion}`;
}).join(',');
- let lernaPublishCmd = `node ${constants.lernaExecutable} publish --cd-versions=${packageVersionString} --registry=${
+ let lernaPublishCmd = `node ${constants.lernaExecutable} publish --cdVersions=${packageVersionString} --registry=${
configs.NPM_REGISTRY_URL
} --yes`;
if (configs.IS_LOCAL_PUBLISH) {