Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into release
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	package/conev-sync-core/package.json
#	package/conev-sync-json-source/package.json
  • Loading branch information
siyul-park committed Sep 1, 2020
2 parents 715461d + 336ee80 commit bbeea59
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "conev-sync",
"version": "1.0.1",
"version": "1.0.2",
"description": "",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"scripts": {
"run": "node dist/index.js",
"prepublish": "npm run build:production",
"prepublishOnly": "npm run build:production",
"build": "gulp",
"build:production": "cross-env NODE_ENV=production npm run build",
"build:all": "script/run-command-all-package.sh run build",
Expand Down Expand Up @@ -83,7 +83,7 @@
"typescript": "^4.0.2"
},
"dependencies": {
"conev-sync-core": "^1.0.3",
"conev-sync-json-source": "^1.0.3"
"conev-sync-core": "^1.0.4",
"conev-sync-json-source": "^1.0.4"
}
}
4 changes: 2 additions & 2 deletions package/conev-sync-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "conev-sync-core",
"version": "1.0.3",
"version": "1.0.4",
"description": "",
"main": "dist/index.js",
"types" : "dist/index.d.ts",
Expand All @@ -9,7 +9,7 @@
"run": "node dist/index.js",
"build": "gulp",
"build:production": "cross-env NODE_ENV=production npm run build",
"install": "npm run build:production"
"prepublishOnly": "npm run build:production"
},
"author": "",
"license": "ISC",
Expand Down
4 changes: 2 additions & 2 deletions package/conev-sync-json-source/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "conev-sync-json-source",
"version": "1.0.3",
"version": "1.0.4",
"description": "",
"main": "dist/index.js",
"types" : "dist/index.d.ts",
Expand All @@ -9,7 +9,7 @@
"run": "node dist/index.js",
"build": "gulp",
"build:production": "cross-env NODE_ENV=production npm run build",
"install": "npm run build:production"
"prepublishOnly": "npm run build:production"
},
"author": "",
"license": "ISC",
Expand Down

0 comments on commit bbeea59

Please sign in to comment.