Merge branch 'master' into greenkeeper/standard-13.0.1

tleffew · Jan 2, 2022 · 1fd447c · 1fd447c
2 parents d95d19b + 3173629
commit 1fd447c
Show file tree

Hide file tree

Showing 4 changed files with 339 additions and 252 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,5 @@
+FROM node:alpine
+
+RUN npm install -g swagger-merger watch
+
+CMD ["swagger-merger"]
diff --git a/lib/reference.js b/lib/reference.js
@@ -50,6 +50,8 @@ function sliceHashtagJSON (content, hashtag) {
   if (hashtag) {
     let obj = JSON.parse(content)
     hashtag.split('/').every(k => {
+      k = k.replace(/~0/g, '~')
+      k = k.replace(/~1/g, '/')
       obj = Object.getOwnPropertyDescriptor(obj, k).value
       return obj
     })

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
   "devDependencies": {
     "ava": "^0.25.0",
     "coveralls": "^3.0.2",
-    "nyc": "^13.1.0",
+    "nyc": "^14.0.0",
     "standard": "^13.0.1"
   }
 }