Pinned moment version.

Fix for eclipse-theia/theia#7726 Signed-off-by: Akos Kitta <[email protected]>
SemanticApplicationDesignLanguage · May 4, 2020 · 6f5697b · 6f5697b
1 parent 13b5501
commit 6f5697b
Show file tree

Hide file tree

Showing 5 changed files with 317 additions and 241 deletions.
diff --git a/sadl3/com.ge.research.sadl.parent/theia-sadl-extension/browser-app/package.json b/sadl3/com.ge.research.sadl.parent/theia-sadl-extension/browser-app/package.json
@@ -23,7 +23,7 @@
     "@theia/terminal": "next",
     "@theia/userstorage": "next",
     "@theia/workspace": "next",
-    "sadl-extension": "^0.1.9"
+    "sadl-extension": "0.1.9"
   },
   "devDependencies": {
     "@theia/cli": "next"

diff --git a/sadl3/com.ge.research.sadl.parent/theia-sadl-extension/package.json b/sadl3/com.ge.research.sadl.parent/theia-sadl-extension/package.json
@@ -8,8 +8,11 @@
   "devDependencies": {
     "lerna": "2.4.0"
   },
+  "resolutions": {
+    "**/**/moment": "2.24.0"
+  },
   "workspaces": [
     "sadl-extension",
     "browser-app"
   ]
-}
+}
diff --git a/sadl3/com.ge.research.sadl.parent/theia-sadl-extension/sadl-extension/package.json b/sadl3/com.ge.research.sadl.parent/theia-sadl-extension/sadl-extension/package.json
@@ -41,4 +41,4 @@
       "backend": "lib/node/sadl-backend-module"
     }
   ]
-}
+}
diff --git a/sadl3/com.ge.research.sadl.parent/theia-sadl-extension/scripts/build-docker.sh b/sadl3/com.ge.research.sadl.parent/theia-sadl-extension/scripts/build-docker.sh
@@ -5,7 +5,7 @@ cd "$(dirname "$0")" \
 && cp -rf ../yarn.lock . \
 && NEXT_VERSION=`npm view sadl-extension@next version` \
 && mv -f ./package.json ./package.json.original \
-&& cat ./package.json.original | jq .version=\"$NEXT_VERSION\" > package.json \
+&& cat ./package.json.original | jq .version=\"$NEXT_VERSION\" | jq .dependencies.\"sadl-extension\"=\"$NEXT_VERSION\" > package.json \
 && docker build --build-arg "GITHUB_TOKEN=$GITHUB_TOKEN" --no-cache . -t theiaide/sadl:$NEXT_VERSION \
 && docker tag theiaide/sadl:$NEXT_VERSION theiaide/sadl:next \
 && rm ./package.json \
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,4 +41,4 @@ @@
           "backend": "lib/node/sadl-backend-module"
         }
       ]
-    }
+    }