Set version to 0.0.0 if using GitHub workflow file

badsyntax · badsyntax · commit ff8c32034a88 · 2019-12-09T20:11:35.000+01:00
diff --git a/generators/app/templates/ext-colortheme/github/workflows/publish.yml b/generators/app/templates/ext-colortheme/github/workflows/publish.yml
@@ -16,10 +16,9 @@ jobs:
           tag=${GITHUB_REF#refs/tags/}
           echo "Setting package version $tag"
           npm --no-git-tag-version version "$tag"
-          npm install -g vsce
-          vsce package
+          npx vsce package
       - name: Publish extension to marketplace
         env:
           AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
         run: |
-          vsce publish -p "$AZURE_TOKEN"
+          npx vsce publish -p "$AZURE_TOKEN"
diff --git a/generators/app/templates/ext-colortheme/package.json b/generators/app/templates/ext-colortheme/package.json
@@ -2,7 +2,7 @@
     "name": <%- JSON.stringify(name) %>,
     "displayName": <%- JSON.stringify(displayName) %>,
     "description": <%- JSON.stringify(description) %>,
-    "version": "0.0.1",
+    "version": "<% if (gitHubWorkFlowInit) { %>0.0.0<% } else { %>0.0.1<% } %>",
     "engines": {
         "vscode": <%- JSON.stringify(vsCodeEngine) %>
     },
@@ -18,4 +18,4 @@
             }
         ]
     }
-}
+}
diff --git a/generators/app/templates/ext-command-js/github/workflows/test-publish.yml b/generators/app/templates/ext-command-js/github/workflows/test-publish.yml
@@ -43,10 +43,9 @@ jobs:
           tag=${GITHUB_REF#refs/tags/}
           echo "Setting package version $tag"
           npm --no-git-tag-version version "$tag"
-          npm install -g vsce
-          vsce package
+          npx vsce package
       - name: Publish extension to marketplace
         env:
           AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
         run: |
-          vsce publish -p "$AZURE_TOKEN"
+          npx vsce publish -p "$AZURE_TOKEN"
diff --git a/generators/app/templates/ext-command-js/package.json b/generators/app/templates/ext-command-js/package.json
@@ -2,7 +2,7 @@
 	"name": <%- JSON.stringify(name) %>,
 	"displayName": <%- JSON.stringify(displayName) %>,
 	"description": <%- JSON.stringify(description) %>,
-	"version": "0.0.1",
+	"version": "<% if (gitHubWorkFlowInit) { %>0.0.0<% } else { %>0.0.1<% } %>",
 	"engines": {
 		"vscode": <%- JSON.stringify(vsCodeEngine) %>
 	},
diff --git a/generators/app/templates/ext-command-ts/github/workflows/test-publish.yml b/generators/app/templates/ext-command-ts/github/workflows/test-publish.yml
@@ -43,10 +43,9 @@ jobs:
           tag=${GITHUB_REF#refs/tags/}
           echo "Setting package version $tag"
           npm --no-git-tag-version version "$tag"
-          npm install -g vsce
-          vsce package
+          npx vsce package
       - name: Publish extension to marketplace
         env:
           AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
         run: |
-          vsce publish -p "$AZURE_TOKEN"
+          npx vsce publish -p "$AZURE_TOKEN"
diff --git a/generators/app/templates/ext-command-ts/package.json b/generators/app/templates/ext-command-ts/package.json
@@ -2,7 +2,7 @@
 	"name": <%- JSON.stringify(name) %>,
 	"displayName": <%- JSON.stringify(displayName) %>,
 	"description": <%- JSON.stringify(description) %>,
-	"version": "0.0.1",
+	"version": "<% if (gitHubWorkFlowInit) { %>0.0.0<% } else { %>0.0.1<% } %>",
 	"engines": {
 		"vscode": <%- JSON.stringify(vsCodeEngine) %>
 	},
diff --git a/generators/app/templates/ext-extensionpack/github/workflows/publish.yml b/generators/app/templates/ext-extensionpack/github/workflows/publish.yml
@@ -16,10 +16,9 @@ jobs:
           tag=${GITHUB_REF#refs/tags/}
           echo "Setting package version $tag"
           npm --no-git-tag-version version "$tag"
-          npm install -g vsce
-          vsce package
+          npx vsce package
       - name: Publish extension to marketplace
         env:
           AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
         run: |
-          vsce publish -p "$AZURE_TOKEN"
+          npx vsce publish -p "$AZURE_TOKEN"
diff --git a/generators/app/templates/ext-extensionpack/package.json b/generators/app/templates/ext-extensionpack/package.json
@@ -2,7 +2,7 @@
     "name": <%- JSON.stringify(name) %>,
     "displayName": <%- JSON.stringify(displayName) %>,
     "description": <%- JSON.stringify(description) %>,
-    "version": "0.0.1",
+    "version": "<% if (gitHubWorkFlowInit) { %>0.0.0<% } else { %>0.0.1<% } %>",
     "engines": {
         "vscode": <%- JSON.stringify(vsCodeEngine) %>
     },
@@ -13,4 +13,4 @@
         "<%- extensionList[i] %>", <%}%>
         "<%- extensionList[extensionList.length-1]%>"
     ]
-}
+}
diff --git a/generators/app/templates/ext-keymap/github/workflows/publish.yml b/generators/app/templates/ext-keymap/github/workflows/publish.yml
@@ -16,10 +16,9 @@ jobs:
           tag=${GITHUB_REF#refs/tags/}
           echo "Setting package version $tag"
           npm --no-git-tag-version version "$tag"
-          npm install -g vsce
-          vsce package
+          npx vsce package
       - name: Publish extension to marketplace
         env:
           AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
         run: |
-          vsce publish -p "$AZURE_TOKEN"
+          npx vsce publish -p "$AZURE_TOKEN"
diff --git a/generators/app/templates/ext-keymap/package.json b/generators/app/templates/ext-keymap/package.json
@@ -2,7 +2,7 @@
     "name": <%- JSON.stringify(name) %>,
     "displayName": <%- JSON.stringify(displayName) %>,
     "description": <%- JSON.stringify(description) %>,
-    "version": "0.0.1",
+    "version": "<% if (gitHubWorkFlowInit) { %>0.0.0<% } else { %>0.0.1<% } %>",
     "engines": {
         "vscode": <%- JSON.stringify(vsCodeEngine) %>
     },
@@ -17,4 +17,4 @@
             }
         ]
     }
-}
+}
diff --git a/generators/app/templates/ext-language/github/workflows/publish.yml b/generators/app/templates/ext-language/github/workflows/publish.yml
@@ -16,10 +16,9 @@ jobs:
           tag=${GITHUB_REF#refs/tags/}
           echo "Setting package version $tag"
           npm --no-git-tag-version version "$tag"
-          npm install -g vsce
-          vsce package
+          npx vsce package
       - name: Publish extension to marketplace
         env:
           AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
         run: |
-          vsce publish -p "$AZURE_TOKEN"
+          npx vsce publish -p "$AZURE_TOKEN"
diff --git a/generators/app/templates/ext-language/package.json b/generators/app/templates/ext-language/package.json
@@ -2,7 +2,7 @@
     "name": <%- JSON.stringify(name) %>,
     "displayName": <%- JSON.stringify(displayName) %>,
     "description": <%- JSON.stringify(description) %>,
-    "version": "0.0.1",
+    "version": "<% if (gitHubWorkFlowInit) { %>0.0.0<% } else { %>0.0.1<% } %>",
     "engines": {
         "vscode": <%- JSON.stringify(vsCodeEngine) %>
     },
@@ -22,4 +22,4 @@
             "path": <%- JSON.stringify("./syntaxes/" + languageFileName) %>
         }]
     }
-}
+}
diff --git a/generators/app/templates/ext-localization/github/workflows/publish.yml b/generators/app/templates/ext-localization/github/workflows/publish.yml
@@ -16,10 +16,9 @@ jobs:
           tag=${GITHUB_REF#refs/tags/}
           echo "Setting package version $tag"
           npm --no-git-tag-version version "$tag"
-          npm install -g vsce
-          vsce package
+          npx vsce package
       - name: Publish extension to marketplace
         env:
           AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
         run: |
-          vsce publish -p "$AZURE_TOKEN"
+          npx vsce publish -p "$AZURE_TOKEN"
diff --git a/generators/app/templates/ext-localization/package.json b/generators/app/templates/ext-localization/package.json
@@ -2,7 +2,7 @@
     "name": <%- JSON.stringify(name) %>,
     "displayName": <%- JSON.stringify(displayName) %>,
     "description": <%- JSON.stringify(description) %>,
-    "version": "0.0.1",
+    "version": "<% if (gitHubWorkFlowInit) { %>0.0.0<% } else { %>0.0.1<% } %>",
     "engines": {
         "vscode": <%- JSON.stringify(vsCodeEngine) %>
     },
diff --git a/generators/app/templates/ext-snippets/github/workflows/publish.yml b/generators/app/templates/ext-snippets/github/workflows/publish.yml
@@ -16,10 +16,9 @@ jobs:
           tag=${GITHUB_REF#refs/tags/}
           echo "Setting package version $tag"
           npm --no-git-tag-version version "$tag"
-          npm install -g vsce
-          vsce package
+          npx vsce package
       - name: Publish extension to marketplace
         env:
           AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
         run: |
-          vsce publish -p "$AZURE_TOKEN"
+          npx vsce publish -p "$AZURE_TOKEN"
diff --git a/generators/app/templates/ext-snippets/package.json b/generators/app/templates/ext-snippets/package.json
@@ -2,7 +2,7 @@
     "name": <%- JSON.stringify(name) %>,
     "displayName": <%- JSON.stringify(displayName) %>,
     "description": <%- JSON.stringify(description) %>,
-    "version": "0.0.1",
+    "version": "<% if (gitHubWorkFlowInit) { %>0.0.0<% } else { %>0.0.1<% } %>",
     "engines": {
         "vscode": <%- JSON.stringify(vsCodeEngine) %>
     },
diff --git a/test/test.js b/test/test.js

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": <%- JSON.stringify(name) %>,`
`3`	`3`	`"displayName": <%- JSON.stringify(displayName) %>,`
`4`	`4`	`"description": <%- JSON.stringify(description) %>,`
`5`		`- "version": "0.0.1",`
	`5`	`+ "version": "<% if (gitHubWorkFlowInit) { %>0.0.0<% } else { %>0.0.1<% } %>",`
`6`	`6`	`"engines": {`
`7`	`7`	`"vscode": <%- JSON.stringify(vsCodeEngine) %>`
`8`	`8`	`},`
`@@ -18,4 +18,4 @@`
`18`	`18`	`}`
`19`	`19`	`]`
`20`	`20`	`}`
`21`		`-}`
	`21`	`+}`