generator-code 1.6.4 → 1.6.8

package/generators/app/index.js

@@ -12,7 +12,7 @@ const witch = require('which');
 
 const colortheme = require('./generate-colortheme');
 const commandjs = require('./generate-command-js');
-const commandts = require('./generate-command-ts ');
+const commandts = require('./generate-command-ts');
 const commandweb = require('./generate-command-web');
 const extensionpack = require('./generate-extensionpack');
 const keymap = require('./generate-keymap');
@@ -185,7 +185,7 @@ module.exports = class extends Generator {
 
         // Git init
         if (this.extensionConfig.gitInit) {
-            this.spawnCommand('git', ['init', '--quiet']);
+            this.spawnCommand('git', ['init', '--quiet', '--initial-branch=main']);
         }
 
         if (this.extensionConfig.proposedAPI) {
@@ -203,13 +203,10 @@ module.exports = class extends Generator {
 
             this.log('To start editing with Visual Studio Code, use the following commands:');
             this.log('');
-            if (cdLocation !== '.') {
-                this.log('     cd ' + cdLocation);
-            }
             if (!this.extensionConfig.insiders) {
-                this.log('     code .');
+                this.log('     code ' + cdLocation);
             } else {
-                this.log('     code-insiders .');
+                this.log('     code-insiders ' + cdLocation);
             }
             this.log('');
         }

package/generators/app/package.json

@@ -1,29 +1,34 @@
 {
+    "name": "yo-code-dependencies-versions",
+    "description": "Helper file to manage the versions of the node modules used by the generators.",
+    "version": "0.0.0",
+    "private": true,
     "dependencies": {
-        "@types/glob": "^7.1.4",
-        "@types/mocha": "^9.0.0",
+        "@types/glob": "^7.2.0",
+        "@types/mocha": "^9.1.0",
         "@types/node": "14.x",
-        "@typescript-eslint/eslint-plugin": "^5.1.0",
-        "@typescript-eslint/parser": "^5.1.0",
-        "eslint": "^8.1.0",
-        "glob": "^7.1.7",
-        "mocha": "^9.1.3",
-        "typescript": "^4.4.4",
-        "@vscode/test-electron": "^1.6.2",
-        "@vscode/test-web": "^0.0.15",
-        "@types/webpack-env": "^1.16.2",
+        "@typescript-eslint/eslint-plugin": "^5.12.1",
+        "@typescript-eslint/parser": "^5.12.1",
+        "eslint": "^8.9.0",
+        "glob": "^7.2.0",
+        "mocha": "^9.2.1",
+        "typescript": "^4.5.5",
+        "@vscode/test-electron": "^2.1.2",
+        "@vscode/test-web": "^0.0.22",
+        "@types/webpack-env": "^1.16.3",
         "@types/vscode-notebook-renderer": "^1.57.8",
         "concurrently": "^5.3.0",
         "css-loader": "^4.2.0",
         "fork-ts-checker-webpack-plugin": "^5.0.14",
         "style-loader": "^1.2.1",
-        "ts-loader": "^9.2.5",
-        "vscode-dts": "^0.3.1",
+        "ts-loader": "^9.2.6",
+        "vscode-dts": "^0.3.3",
         "vscode-notebook-error-overlay": "^1.0.1",
-        "webpack": "^5.52.1",
-        "webpack-cli": "^4.8.0",
+        "webpack": "^5.69.1",
+        "util": "^0.12.4",
+        "webpack-cli": "^4.9.2",
         "webpack-dev-server": "^3.11.2",
         "assert": "^2.0.0",
         "process": "^0.11.10"
     }
-}
+}

package/generators/app/templates/ext-command-ts/package.json

@@ -13,7 +13,7 @@
         <%- JSON.stringify(`onCommand:${name}.helloWorld`) %>
 	],
 	"main": "./out/extension.js",<% if (insiders) { %>
-	"enableProposedApi": true,<% } %>
+	"enabledApiProposals": [],<% } %>
 	"contributes": {
 		"commands": [
 			{

package/generators/app/templates/ext-command-ts/tsconfig.json

@@ -13,9 +13,5 @@
 		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
 		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
 		// "noUnusedParameters": true,  /* Report errors on unused parameters. */
-	},
-	"exclude": [
-		"node_modules",
-		".vscode-test"
-	]
+	}
 }

package/generators/app/templates/ext-command-ts/vscode-webpack/package.json

@@ -13,7 +13,7 @@
         <%- JSON.stringify(`onCommand:${name}.helloWorld`) %>
 	],
 	"main": "./dist/extension.js",<% if (insiders) { %>
-	"enableProposedApi": true,<% } %>
+	"enabledApiProposals": [],<% } %>
 	"contributes": {
 		"commands": [
 			{

package/generators/app/templates/ext-command-ts/vscode-webpack/tsconfig.json

@@ -12,9 +12,5 @@
 		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
 		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
 		// "noUnusedParameters": true,  /* Report errors on unused parameters. */
-	},
-	"exclude": [
-		"node_modules",
-		".vscode-test"
-	]
+	}
 }

package/generators/app/templates/ext-command-ts/vscode-webpack/vsc-extension-quickstart.md

@@ -11,7 +11,7 @@
 
 ## Setup
 
-- install the recommended extensions (amodio.tsl-problem-matcher and dbaeumer.vscode-eslint)
+* install the recommended extensions (amodio.tsl-problem-matcher and dbaeumer.vscode-eslint)
 
 
 ## Get up and running straight away
@@ -42,6 +42,6 @@
 
 ## Go further
 
- * Reduce the extension size and improve the startup time by [bundling your extension](https://code.visualstudio.com/api/working-with-extensions/bundling-extension).
- * [Publish your extension](https://code.visualstudio.com/api/working-with-extensions/publishing-extension) on the VSCode extension marketplace.
- * Automate builds by setting up [Continuous Integration](https://code.visualstudio.com/api/working-with-extensions/continuous-integration).
+* Reduce the extension size and improve the startup time by [bundling your extension](https://code.visualstudio.com/api/working-with-extensions/bundling-extension).
+* [Publish your extension](https://code.visualstudio.com/api/working-with-extensions/publishing-extension) on the VSCode extension marketplace.
+* Automate builds by setting up [Continuous Integration](https://code.visualstudio.com/api/working-with-extensions/continuous-integration).

package/generators/app/templates/ext-command-web/tsconfig.json

@@ -13,9 +13,5 @@
 		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
 		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
 		// "noUnusedParameters": true,  /* Report errors on unused parameters. */
-	},
-	"exclude": [
-		"node_modules",
-		".vscode-test-web"
-	]
+	}
 }

package/generators/app/templates/ext-localization/vsc-extension-quickstart.md

@@ -20,7 +20,7 @@ To create/update the `translations` folder with the latest strings from transife
 
 * Get an API token from https://www.transifex.com/user/settings/api. The token needs to have access to the `vscode-editor`, `vscode-workbench` and `vscode-extensions` projects.
 * Set the API token to the environment variable `TRANSIFEX_API_TOKEN`.
-* Check out the `master` branch of the [VS Code repository](https://github.com/Microsoft/vscode).
+* Check out the `main` branch of the [VS Code repository](https://github.com/Microsoft/vscode).
   * Preferably, place the VSCode repo next to the language pack extension (so both have the same parent folder).
   * `cd vscode` and run `yarn` to initialize the VS Code repo. More information on how to build VS Code you can find [here](https://github.com/Microsoft/vscode/wiki/How-to-Contribute).
   * If the language pack extension is placed next to the VS Code repository: `npm run update-localization-extension <%- lpLanguageId %>`

package/generators/app/templates/ext-notebook-renderer/README.md

@@ -11,8 +11,7 @@ This starter includes:
 
 ### Running this Sample
 
- 1. `cd <%- name %>`
- 1. `code-insiders .`: Open the folder in VS Code Insiders
+ 1. `code-insiders <%- name %>`: Open the folder in VS Code Insiders
  1. Hit `F5` to build+debug
 
 ### Structure

package/generators/app/templates/ext-notebook-renderer/package.json

@@ -52,6 +52,7 @@
     <%- dep("typescript") %>,
     <%- dep("vscode-notebook-error-overlay") %>,
     <%- dep("@vscode/test-electron") %>,
+    <%- dep("util") %>,
     <%- dep("webpack") %>,
     <%- dep("webpack-cli") %>
   }

package/generators/app/templates/ext-notebook-renderer/webpack.config.js

@@ -14,8 +14,12 @@ const makeConfig = (argv, { entry, out, target, library = 'commonjs' }) => ({
         libraryTarget: library,
         chunkFormat: library,
     },
+    externals: {
+        vscode: 'commonjs vscode',
+    },
     resolve: {
         extensions: ['.ts', '.tsx', '.js', '.jsx', '.css'],
+        fallback: { "util": require.resolve("util/") }
     },
     experiments: {
         outputModule: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-code",
-  "version": "1.6.4",
+  "version": "1.6.8",
   "description": "Yeoman generator for Visual Studio Code Extensions",
   "keywords": [
     "yeoman-generator",
@@ -36,19 +36,19 @@
   "dependencies": {
     "chalk": "^4.1.2",
     "fast-plist": "^0.1.2",
-    "request-light": "^0.5.4",
+    "request-light": "^0.5.7",
     "sanitize-filename": "^1.6.3",
     "which": "^2.0.2",
-    "yeoman-generator": "^5.4.2",
+    "yeoman-generator": "^5.6.1",
     "yosay": "^2.0.2"
   },
   "devDependencies": {
-    "@types/mocha": "^9.0.0",
+    "@types/mocha": "^9.1.0",
     "@types/node": "^16.11.6",
-    "@types/yeoman-generator": "^5.2.7",
+    "@types/yeoman-generator": "^5.2.8",
     "@types/yeoman-test": "^4.0.3",
-    "mocha": "^9.1.3",
-    "yeoman-test": "^6.2.0",
-    "yeoman-environment": "^3.6.0"
+    "mocha": "^9.2.0",
+    "yeoman-environment": "^3.9.1",
+    "yeoman-test": "^6.2.0"
   }
 }