Merge pull request #50 from appliedengdesign/calculator

Machining Calculators feature to be release in 0.8.0

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "amodio.tsl-problem-matcher",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode"
+    ]
+}

.vscode/launch.json

@@ -1,9 +1,8 @@
-// A launch configuration that launches the extension inside a new window
 {
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Run G-Code (Sandbox) - Samples",
+            "name": "Run G-Code (Sandbox)",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
@@ -23,39 +22,72 @@
             ],
             "presentation": {
                 "hidden": false,
-                "group": "Launch Extension",
+                "group": "1_run",
                 "order": 1
             },
-            "preLaunchTask": "npm: webpack",
             "skipFiles": [
                 "<node_internals>/**",
                 "**/node_modules/**",
                 "**/resources/app/out/vs/**"
             ],
             "smartStep": true,
             "sourceMaps": true,
-            "trace": true,
+            "trace": true
         },
         {
-            "name": "Run G-Code (Sandbox)",
+            "name": "Run G-Code (Full)",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--trace-depreciation",
+                "--trace-warnings",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "${workspaceFolder}/samplenc/sample-colors.nc",
+                "${workspaceFolder}/samplenc/sample-profile.nc",
+                "${workspaceFolder}/samplenc/sample-circular-pocket.nc"
+            ],
+            "outFiles": [
+                "${workspaceFolder}/dist/**/*.js"
+            ],
+            "presentation": {
+                "hidden": false,
+                "group": "1_run",
+                "order": 2
+            },
+            "skipFiles": [
+                "<node_internals>/**",
+                "**/node_modules/**",
+                "**/resources/app/out/vs/**"
+            ],
+            "smartStep": true,
+            "sourceMaps": true,
+            "trace": true
+        },
+        {
+            "name": "Build & Run G-Code (Sandbox)",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
                 "--disable-extensions",
+                "--trace-warnings",
                 "--trace-depreciation",
-                "--extensionDevelopmentPath=${workspaceFolder}"
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "${workspaceFolder}/samplenc/sample-colors.nc",
+                "${workspaceFolder}/samplenc/sample-profile.nc",
+                "${workspaceFolder}/samplenc/sample-circular-pocket.nc"
             ],
             "cwd": "${workspaceFolder}",
             "outFiles": [
                 "${workspaceFolder}/dist/**/*.js"
             ],
             "presentation": {
                 "hidden": false,
-                "group": "Launch Extension",
-                "order": 2
+                "group": "2_build_launch",
+                "order": 1
             },
-            "preLaunchTask": "npm: webpack",
+            "preLaunchTask": "npm: build",
             "skipFiles": [
                 "<node_internals>/**",
                 "**/node_modules/**",
@@ -66,49 +98,66 @@
             "trace": true
         },
         {
-            "name": "Run G-Code (Full)",
+            "name": "Build & Run G-Code (Full)",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
                 "--trace-depreciation",
-                "--extensionDevelopmentPath=${workspaceFolder}"
+                "--trace-warnings",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "${workspaceFolder}/samplenc/sample-colors.nc",
+                "${workspaceFolder}/samplenc/sample-profile.nc",
+                "${workspaceFolder}/samplenc/sample-circular-pocket.nc"
             ],
             "outFiles": [
                 "${workspaceFolder}/dist/**/*.js"
             ],
             "presentation": {
                 "hidden": false,
-                "group": "Launch Extension",
-                "order": 3
+                "group": "2_build_launch",
+                "order": 2
             },
-            "preLaunchTask": "npm: webpack",
+            "preLaunchTask": "npm: build",
             "skipFiles": [
                 "<node_internals>/**",
-                "**/node_modules/**"
+                "**/node_modules/**",
+                "**/resources/app/out/vs/**"
             ],
             "smartStep": true,
             "sourceMaps": true,
             "trace": true
         },
         {
-            "name": "Run G-Code As Web Extension",
+            "name": "Build & Run G-Code (Full/Production)",
             "type": "extensionHost",
-            "debugWebWorkerHost": true,
             "request": "launch",
+            "runtimeExecutable": "${execPath}",
             "args": [
+                "--trace-depreciation",
+                "--trace-warnings",
                 "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionDevelopmentKind=web"
+                "${workspaceFolder}/samplenc/sample-colors.nc",
+                "${workspaceFolder}/samplenc/sample-profile.nc",
+                "${workspaceFolder}/samplenc/sample-circular-pocket.nc"
             ],
             "outFiles": [
                 "${workspaceFolder}/dist/**/*.js"
             ],
-            "preLaunchTask": "npm: webpack",
             "presentation": {
                 "hidden": false,
-                "group": "Web Extension",
-                "order": 1
-            }
+                "group": "2_build_launch",
+                "order": 3
+            },
+            "preLaunchTask": "npm: bundle",
+            "skipFiles": [
+                "<node_internals>/**",
+                "**/node_modules/**",
+                "**/resources/app/out/vs/**"
+            ],
+            "smartStep": true,
+            "sourceMaps": true,
+            "trace": true
         },
         {
             "name": "G-Code Mocha Unit Tests",
@@ -127,11 +176,12 @@
             ],
             "skipFiles": [
                 "<node_internals>/**",
-                "**/node_modules/**"
+                "**/node_modules/**",
+                "**/resources/app/out/vs/**"
             ],
             "presentation": {
                 "hidden": false,
-                "group": "Testing",
+                "group": "3_test",
                 "order": 1
             },
             "env": {

.vscode/settings.json

@@ -1,11 +1,11 @@
 {
     "files.exclude": {
-        "out": false // set this to true to hide the "out" folder with the compiled JS files
+        "out": false
     },
     "search.exclude": {
-        "out": true // set this to false to include "out" folder in search results
+        "out": true,
+        "dist": true
     },
-    // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
     "typescript.tsc.autoDetect": "off",
     "[typescript]": {
         "editor.defaultFormatter": "dbaeumer.vscode-eslint"

.vscode/tasks.json

@@ -1,39 +1,24 @@
 {
 	"version": "2.0.0",
+	"presentation": {
+		"echo": false,
+		"reveal": "always",
+		"focus": false,
+		"panel": "dedicated",
+		"showReuseMessage": false,
+		"clear": false
+	},
 	"tasks": [
 		{
 			"type": "npm",
-			"script": "watch",
-			"problemMatcher": "$tsc-watch",
-			"isBackground": true,
-			"presentation": {
-				"echo": true,
-				"reveal": "never",
-				"focus": false,
-				"panel": "shared",
-				"showReuseMessage": true,
-				"clear": false
-			},
+			"script": "build",
+			"problemMatcher": [
+				"$ts-webpack",
+			],
 			"group": {
 				"kind": "build",
 				"isDefault": true
 			}
-		},
-		{
-			"type": "npm",
-			"script": "webpack",
-			"problemMatcher": "$tsc-watch",
-			"label": "npm: webpack",
-			"detail": "webpack --mode development",
-			"isBackground": true,
-			"presentation": {
-				"echo": true,
-				"reveal": "always",
-				"focus": false,
-				"panel": "shared",
-				"showReuseMessage": true,
-				"clear": false
-			}
 		}
 	]
 }

.vscodeignore

@@ -8,6 +8,7 @@
 .prettierignore
 .prettierrc
 .vscode-test/**
+.vscode-test-web/**
 .vscode/**
 **/*.map
 CODE_OF_CONDUCT.md
@@ -18,9 +19,12 @@ images/**/[^logo]*
 out/test/**
 package-lock.json
 samplenc/**
+scripts/**
 src/**
 test/**
 out/**
+node_modules/**
 tsconfig**
 tsconfig.tsbuildinfo
-webpack.config.js
+webpack.config*.js
+.DS_Store