Webpack and icons

lanly-dev · lanly-dev · commit bc4fa656ea32 · 2020-02-16T00:19:58.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .vscode-test/
 *.vsix
 **/.DS_Store
+dist/
 icon/res/
 node_modules
 out/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,21 +6,21 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Run Extension",
+      "name": "Extension:webpack",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-      "outFiles": ["${workspaceFolder}/out/**/*.js"],
-      "preLaunchTask": "npm: watch"
+      "outFiles": ["${workspaceFolder}/dist/**/*.js"],
+      "preLaunchTask": "npm: webpack"
     },
     {
-      "name": "Extension Tests",
+      "name": "Extension:watch",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out/test/suite/index"],
-      "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
+      "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
+      "outFiles": ["${workspaceFolder}/out/**/*.js"],
       "preLaunchTask": "npm: watch"
     }
   ]
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -20,11 +20,6 @@
       "type": "npm",
       "script": "task-clean",
       "isBackground": false
-    },
-    {
-      "type": "npm",
-      "script": "task-copy",
-      "isBackground": false
     }
 	]
 }
diff --git a/.vscodeignore b/.vscodeignore
@@ -8,7 +8,10 @@
 **/tsconfig.json
 backend/
 icon/res/
+node_modules
 package-lock.json
+out/
 src/
 tasks.ts
-vsc-extension-quickstart.md
+vsc-extension-quickstart.md
+webpack.config.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,35 +3,39 @@ All notable changes to the "voice-commands" extension will be documented in this
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## [Unreleased]
-    - Depends on the popularity of this extension.
-    - Possible future features:
-        * Enable/disable specific commands.
-        * Add new commands.
-        * Switch to better maintained library or intergate with virtual assisstant API.
+## [2.1.2] - February 2020
+### Changed
+- Use Webpack
+- tslint to eslint
+- 13 files, 35.22MB, 1.42.0
 
 ## [2.1.1] - Sep 2019
 ### Changed
-    - Change to off mode when activate rather than listen right away
-    - Set MSP targets to .NET 4.5
-    - New icon
+- Change to off mode when activate rather than listen right away
+- Set MSP targets to .NET 4.5
+- [New icon](icon/voicecmd3.png)
+- 10 files, 35.12MB, 1.38.0
 
 ## [2.1.0] - Feb 2019
 ### Changed
-    - Extension activates from the start instead by typing VS Code command
+- Extension activates from the start instead by typing VS Code command
 ### Fixed
-    - Windows OS uses MSP as of now
+- Windows OS uses MSP as of now
+- 9 files, 35.15MB, 1.18.0
 
 ## [2.0.0, 2.0.1] - Jan 2018
 ### Added
-    - Cross-platform:
-        - Windows OS still uses built-in Speech library.
-        - Other OS uses JRE to run the CMUSphinx open source speech recognition.
-    - New commands: delete, stop listen, format.
-    - New icon
+- Cross-platform:
+  - Windows OS still uses built-in Speech library.
+  - Other OS uses JRE to run the CMUSphinx open source speech recognition.
+- New commands: delete, stop listen, format.
+- [New icon](icon/voicecmd2.png)
+- 9 files, 35.15MB, 1.18.0
 
 ## [1.0.0] - Jan 2017
 ### Added
-    - Commands include: copy, cut, find, go to line, hello world, paste, quick open, redo, search, select all, and undo.
-    - "hello world" command has no action.
-    - Uses Microsoft Speech Platform.
+- Commands include: copy, cut, find, go to line, hello world, paste, quick open, redo, search, select all, and undo.
+- "hello world" command has no action.
+- Uses Microsoft Speech Platform.
+- [Icon](icon/voicecmd1.png), [icon-remastered](icon/voicecmd1-remastered.png)
+- 9 files, 26.87KB, 1.8.1
diff --git a/README.md b/README.md
@@ -33,10 +33,13 @@ Context menu could hold the commands' actions
 
 ## Release Notes
 
+### 2.1.2
+- Use Webpack
+
 ### 2.1.1
 - Activate extension in off mode from the start
 - Update project's dependencies
-- New icon
+- [New icon](icon/voicecmd3.png)
 
 ### 2.1.0
 - Bugfix - Windows OS wasn't using MSP
@@ -47,7 +50,7 @@ Context menu could hold the commands' actions
 - Development SDK and packages: donet core 2.0, .NET framework 4.7.1, Sphinx4 alpha5
 - Now the extension is cross-platform thanks to [CMUSphinx Voice Recognition](https://cmusphinx.github.io/)
 - Note that this extension still uses the built-in [Microsoft Speech Platform](https://msdn.microsoft.com/en-us/library/office/hh361572(v=office.14).aspx) if it use in Windows OS
-- New icon
+- [New icon](icon/voicecmd2.png)
 
 ### 1.0.0
 - Initial release of voice commands
diff --git a/icon/voicecmd1-remastered.png b/icon/voicecmd1-remastered.png
diff --git a/icon/voicecmd1.png b/icon/voicecmd1.png
diff --git a/icon/voicecmd2.png b/icon/voicecmd2.png
diff --git a/package.json b/package.json
@@ -3,10 +3,10 @@
   "displayName": "Voice Commands",
   "description": "Listen to the user's voice commands",
   "homepage": "https://github.com/lanly-dev/VSCode-VoiceCommands",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "publisher": "lanly-dev",
   "engines": {
-    "vscode": "^1.38.0"
+    "vscode": "^1.42.0"
   },
   "categories": [
     "Other"
@@ -20,27 +20,32 @@
   "activationEvents": [
     "*"
   ],
-  "main": "./out/extension.js",
+  "main": "./dist/extension.js",
   "contributes": {},
   "scripts": {
-    "vscode:prepublish": "npm run compile",
+    "vscode:prepublish": "webpack --mode production",
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
-    "pretest": "npm run compile",
-    "test": "node ./out/test/runTest.js",
-    "task-clean": "ts-node tasks.ts clean",
-    "task-copy": "ts-node tasks.ts copy"
+    "webpack": "webpack --mode development",
+    "webpack-dev": "webpack --mode development --watch",
+    "lint": "eslint . --ext ts",
+    "lint-fix": "eslint . --ext ts --fix",
+    "task-clean": "ts-node tasks.ts clean"
   },
   "devDependencies": {
-    "@types/node": "^13.7.0",
+    "@types/node": "^13.7.1",
     "@types/shelljs": "^0.8.6",
     "@types/vscode": "^1.42.0",
-    "@typescript-eslint/eslint-plugin": "^2.19.0",
-    "@typescript-eslint/parser": "^2.19.0",
+    "@typescript-eslint/eslint-plugin": "^2.19.2",
+    "@typescript-eslint/parser": "^2.19.2",
+    "copy-webpack-plugin": "^5.1.1",
     "eslint": "^6.8.0",
     "shelljs": "^0.8.3",
+    "ts-loader": "^6.2.1",
     "ts-node": "^8.6.2",
-    "typescript": "^3.7.5"
+    "typescript": "^3.7.5",
+    "webpack": "^4.41.6",
+    "webpack-cli": "^3.3.11"
   },
   "repository": {
     "type": "git",
diff --git a/tasks.ts b/tasks.ts
@@ -3,12 +3,8 @@ import * as shell from 'shelljs'
 // clean out file
 console.log(`Run task ${process.argv[2]}`)
 if (process.argv[2] === 'clean'){
-  console.log('Remove out directory')
-  shell.rm('-rf', 'out')
+  console.log('Remove out and dist directories')
+  shell.rm('-rf', './out')
+  shell.rm('-rf', './dist')
 }
-else if (process.argv[2] === 'copy') {
-  console.log('Copy jar and exe files to out directory')
-  shell.mkdir('-p', 'out')
-  shell.cp('src/WordsListener.jar', 'out')
-  shell.cp('src/WordsMatching.exe', 'out')
-}
+else console.log(`Unknown task ${process.argv[2]}`)
diff --git a/webpack.config.js b/webpack.config.js
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// @ts-check
+'use strict'
+
+const path = require('path')
+const CopyPlugin = require('copy-webpack-plugin')
+
+// @ts-ignore
+/**@type {import('webpack').Configuration}*/
+const config = {
+  target: 'node', // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
+
+  // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
+  entry: {
+    extension: './src/extension.ts'
+  },
+  output: { // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
+    path: path.resolve(__dirname,'dist'),
+    filename: '[name].js',
+    libraryTarget: 'commonjs2',
+    devtoolModuleFilenameTemplate: '../[resource-path]'
+  },
+  // devtool: 'source-map',
+  externals: {
+    vscode: 'commonjs vscode', // the vscode-module is created on-the-fly and must be excluded. Add other modules that cannot be webpack'ed, 📖 -> https://webpack.js.org/configuration/externals/
+  },
+  resolve: { // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader
+    extensions: ['.ts','.js']
+  },
+  module: {
+    rules: [{
+      test: /\.ts$/,
+      exclude: /node_modules/,
+      use: [{
+        loader: 'ts-loader',
+        options: {
+          compilerOptions: {
+            module: 'es6' // override `tsconfig.json` so that TypeScript emits native JavaScript modules.
+          }
+        }
+      }]
+    }]
+  },
+  plugins: [
+    new CopyPlugin([
+      { from: './src/WordsListener.jar' },
+      { from: './src/WordsMatching.exe' }
+    ])
+  ],
+  node: {
+    __dirname: false
+  }
+}
+
+module.exports = config

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,6 @@`
`20`	`20`	`"type": "npm",`
`21`	`21`	`"script": "task-clean",`
`22`	`22`	`"isBackground": false`
`23`		`- },`
`24`		`- {`
`25`		`- "type": "npm",`
`26`		`- "script": "task-copy",`
`27`		`- "isBackground": false`
`28`	`23`	`}`
`29`	`24`	`]`
`30`	`25`	`}`