Merge pull request #37 from github/joshmgross/update-workspace

Update dev workspace with new language service repository

Author: joshmgross

script/bootstrap

@@ -17,13 +17,12 @@ root="$(dirname "$repo_root")"
 
 # Clone dependent repos
 echo "Cloning dependent repos..."
-clone_repo https://github.com/github/actions-languageservices "$root"/actions-languageservices
+clone_repo https://github.com/actions/languageservices "$root"/languageservices
 
 
 # Copy workspace files
 echo "Copying workspace files..."
 cp "$repo_root"/script/workspace/package.json "$root"
 cp "$repo_root"/script/workspace/vscode-github-actions.code-workspace "$root"
-cp "$repo_root"/script/workspace/.npmrc "$root"
 cp "$repo_root"/script/workspace/update-package-locks.sh "$root"
 cp "$repo_root"/script/workspace/watch.sh "$root"

script/workspace/.npmrc

@@ -1,10 +1,10 @@
 {
   "private": true,
   "workspaces": [
-    "./actions-languageservices/expressions",
-    "./actions-languageservices/workflow-parser",
-    "./actions-languageservices/languageservice",
-    "./actions-languageservices/languageserver",
+    "./languageservices/expressions",
+    "./languageservices/workflow-parser",
+    "./languageservices/languageservice",
+    "./languageservices/languageserver",
     "./vscode-github-actions"
   ]
-}
+}

script/workspace/package.json

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-for DIR in "actions-languageservices" "vscode-github-actions"
+for DIR in "languageservices" "vscode-github-actions"
 do
   pushd $DIR
   # Trigger an npm i without workspaces support to update the local package-lock.json

script/workspace/update-package-locks.sh

@@ -1,9 +1,9 @@
 {
   "folders": [
-    {"path": "./actions-languageservices/expressions"},
-    {"path": "./actions-languageservices/workflow-parser"},
-    {"path": "./actions-languageservices/languageservice"},
-    {"path": "./actions-languageservices/languageserver"},
+    {"path": "./languageservices/expressions"},
+    {"path": "./languageservices/workflow-parser"},
+    {"path": "./languageservices/languageservice"},
+    {"path": "./languageservices/languageserver"},
     {"path": "./vscode-github-actions"}
   ],
   "extensions": {

script/workspace/vscode-github-actions.code-workspace

@@ -3,7 +3,7 @@
 # allow killing all processes with ctrl-c
 trap 'kill 0' SIGINT
 
-for DIR in "actions-languageservices/expressions" "actions-languageservices/workflow-parser" "actions-languageservices/languageservice" "actions-languageservices/languageserver" "vscode-github-actions"
+for DIR in "languageservices/expressions" "languageservices/workflow-parser" "languageservices/languageservice" "languageservices/languageserver" "vscode-github-actions"
 do
   pushd $DIR
   npm run watch &