Skip to content

Commit

Permalink
use lerna version + align latest prerelease version
Browse files Browse the repository at this point in the history
  • Loading branch information
rotemmiz committed Nov 3, 2020
1 parent 2229873 commit 615b8ea
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion detox-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "detox-cli",
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"description": "detox CLI tool wrapper",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion detox/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "detox",
"description": "E2E tests and automation for mobile",
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"bin": {
"detox": "local-cli/cli.js"
},
Expand Down
4 changes: 2 additions & 2 deletions detox/test/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "detox-test",
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"private": true,
"engines": {
"node": ">=8.3.0"
Expand Down Expand Up @@ -31,7 +31,7 @@
},
"devDependencies": {
"@babel/core": "^7.8.7",
"detox": "^18.0.0-alpha.0",
"detox": "^18.0.0-next.0",
"express": "^4.15.3",
"jest": "^26.5.0",
"jest-circus": "^26.5.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/demo-native-android/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "detox-demo-native-android",
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"private": true,
"scripts": {
"packager": "react-native start",
"detox-server": "detox run-server",
"e2e": "mocha e2e --opts ./e2e/mocha.opts"
},
"devDependencies": {
"detox": "^18.0.0-alpha.0",
"detox": "^18.0.0-next.0",
"mocha": "^6.1.3"
},
"detox": {}
Expand Down
4 changes: 2 additions & 2 deletions examples/demo-native-ios/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "detox-demo-native-ios",
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"private": true,
"devDependencies": {
"detox": "^18.0.0-alpha.0",
"detox": "^18.0.0-next.0",
"mocha": "^6.1.3"
},
"detox": {
Expand Down
4 changes: 2 additions & 2 deletions examples/demo-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "demo-plugin",
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"private": true,
"scripts": {
"test:plugin": "detox test --configuration plugin -l verbose"
},
"devDependencies": {
"detox": "^18.0.0-alpha.0",
"detox": "^18.0.0-next.0",
"jest": "^26.5.0"
},
"detox": {
Expand Down
4 changes: 2 additions & 2 deletions examples/demo-react-native-detox-instruments/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "demo-react-native-detox-instruments",
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"private": true,
"scripts": {},
"devDependencies": {
"detox": "^18.0.0-alpha.0",
"detox": "^18.0.0-next.0",
"mocha": "6.x.x"
},
"detox": {
Expand Down
4 changes: 2 additions & 2 deletions examples/demo-react-native-jest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "demo-react-native-jest",
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"private": true,
"scripts": {
"test:ios-release": "detox test --configuration ios.sim.release -l verbose",
Expand All @@ -9,7 +9,7 @@
"test:android-release-ci": "detox test --configuration android.emu.release -l verbose --workers 2 --headless --record-logs all --take-screenshots all"
},
"devDependencies": {
"detox": "^18.0.0-alpha.0",
"detox": "^18.0.0-next.0",
"jest": "^26.5.0",
"jest-circus": "^26.5.2",
"sanitize-filename": "^1.6.1"
Expand Down
4 changes: 2 additions & 2 deletions examples/demo-react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example",
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"private": true,
"scripts": {
"start": "react-native start",
Expand All @@ -22,7 +22,7 @@
"react-native": "0.62.x"
},
"devDependencies": {
"detox": "^18.0.0-alpha.0",
"detox": "^18.0.0-next.0",
"mocha": "^6.1.3"
}
}
2 changes: 1 addition & 1 deletion generation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generation",
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"description": "Generate wrapper code for native dependencies",
"main": "index.js",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"generation",
"."
],
"version": "18.0.0-alpha.0",
"version": "18.0.0-next.0",
"npmClient": "npm",
"command": {
"publish": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
"semver": "5.x.x",
"shell-utils": "1.x.x"
},
"version": "18.0.0-alpha.0"
"version": "18.0.0-next.0"
}
2 changes: 1 addition & 1 deletion scripts/ci.android-release.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function run() {

const npmTag = releaseNpmTag();
const preid = npmTag === 'latest'? '': `--preid=${npmTag}`;
exec.execSync(`lerna publish --cd-version "${versionType}" --yes ${preid} --no-git-tag-version --no-push --skip-npm`);
exec.execSync(`lerna version --yes ${versionType} ${preid} --no-git-tag-version --no-push`);
const futureVersion = getVersionSafe();
log('Version is: ' + futureVersion);
exec.execSync('git reset --hard');
Expand Down
3 changes: 2 additions & 1 deletion scripts/ci.publish.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ function publishToNpm(npmTag) {
log('SKIP NPM is set: Lerna-publishing without publishing to NPM');
}
const preid = npmTag === 'latest'? '': `--preid=${npmTag}`;
exec.execSync(`lerna publish --cd-version "${versionType}" --yes --dist-tag ${npmTag} ${preid} --no-git-tag-version --no-push ${(dryRun || skipNpm) ? '--skip-npm' : ''}`);
exec.execSync(`lerna version --yes ${versionType} ${preid} --no-git-tag-version --no-push`);
exec.execSync(`lerna publish --yes --dist-tag ${npmTag} ${preid} --no-git-tag-version --no-push ${(dryRun || skipNpm) ? '--skip-npm' : ''}`);
exec.execSync('git status');
}

Expand Down

0 comments on commit 615b8ea

Please sign in to comment.