@lifefinder/vsm-mqtt-client-open-source 0.0.55 → 0.0.57
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/merge-and-publish.sh +34 -0
- package/package.json +2 -2
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
set -e
|
|
3
|
+
|
|
4
|
+
# Merge main if there are changes, but keep our package.json
|
|
5
|
+
git fetch origin main
|
|
6
|
+
if ! git diff --quiet HEAD...origin/main; then
|
|
7
|
+
git merge origin/main --no-commit --no-ff || true
|
|
8
|
+
git checkout --ours package.json
|
|
9
|
+
git add package.json
|
|
10
|
+
git diff --cached --quiet || git commit -m "Merge origin/main, keeping local package.json"
|
|
11
|
+
fi
|
|
12
|
+
|
|
13
|
+
# Bump patch version in package.json
|
|
14
|
+
current_version=$(node -p "require('./package.json').version")
|
|
15
|
+
new_version=$(echo "$current_version" | awk -F. '{print $1"."$2"."$3+1}')
|
|
16
|
+
sed -i "s/\"version\": \"$current_version\"/\"version\": \"$new_version\"/" package.json
|
|
17
|
+
|
|
18
|
+
# Bump dependency version
|
|
19
|
+
current_dep=$(node -p "require('./package.json').dependencies['@lifefinder/vsm-translator-open-source']")
|
|
20
|
+
new_dep=$(echo "$current_dep" | awk -F. '{print $1"."$2"."$3+1}')
|
|
21
|
+
sed -i "s|\"@lifefinder/vsm-translator-open-source\": \"$current_dep\"|\"@lifefinder/vsm-translator-open-source\": \"$new_dep\"|" package.json
|
|
22
|
+
|
|
23
|
+
echo "Bumped version: $current_version -> $new_version"
|
|
24
|
+
echo "Bumped dependency: $current_dep -> $new_dep"
|
|
25
|
+
|
|
26
|
+
# Commit version bump
|
|
27
|
+
git add package.json
|
|
28
|
+
git commit -m "Bump version to $new_version"
|
|
29
|
+
|
|
30
|
+
# Push to remote
|
|
31
|
+
git push
|
|
32
|
+
|
|
33
|
+
echo ""
|
|
34
|
+
echo "Done! Now run: npm publish"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lifefinder/vsm-mqtt-client-open-source",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.57",
|
|
4
4
|
"description": "MQTT client for vsm sensors",
|
|
5
5
|
"main": "vsm-mqtt-client.js",
|
|
6
6
|
"author": "Lars Mats",
|
|
@@ -14,6 +14,6 @@
|
|
|
14
14
|
"mongodb": "6.3.0",
|
|
15
15
|
"mqtt": "4.3.7",
|
|
16
16
|
"node-fetch": "3.3.1",
|
|
17
|
-
"@lifefinder/vsm-translator-open-source": "^0.2.
|
|
17
|
+
"@lifefinder/vsm-translator-open-source": "^0.2.169"
|
|
18
18
|
}
|
|
19
19
|
}
|