Skip to content

Commit 85465f6

Browse files
mikecentolamikecentola
authored
Merge pull request #50 from appliedengdesign/calculator
Machining Calculators feature to be release in 0.8.0
2 parents dc0b011 + 71bff5f commit 85465f6

36 files changed

+4497
-1135
lines changed

‎.vscode/extensions.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"recommendations": [
3+
"amodio.tsl-problem-matcher",
4+
"dbaeumer.vscode-eslint",
5+
"esbenp.prettier-vscode"
6+
]
7+
}

‎.vscode/launch.json‎

Lines changed: 75 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
// A launch configuration that launches the extension inside a new window
21
{
32
"version": "0.2.0",
43
"configurations": [
54
{
6-
"name": "Run G-Code (Sandbox) - Samples",
5+
"name": "Run G-Code (Sandbox)",
76
"type": "extensionHost",
87
"request": "launch",
98
"runtimeExecutable": "${execPath}",
@@ -23,39 +22,72 @@
2322
],
2423
"presentation": {
2524
"hidden": false,
26-
"group": "Launch Extension",
25+
"group": "1_run",
2726
"order": 1
2827
},
29-
"preLaunchTask": "npm: webpack",
3028
"skipFiles": [
3129
"<node_internals>/**",
3230
"**/node_modules/**",
3331
"**/resources/app/out/vs/**"
3432
],
3533
"smartStep": true,
3634
"sourceMaps": true,
37-
"trace": true,
35+
"trace": true
3836
},
3937
{
40-
"name": "Run G-Code (Sandbox)",
38+
"name": "Run G-Code (Full)",
39+
"type": "extensionHost",
40+
"request": "launch",
41+
"runtimeExecutable": "${execPath}",
42+
"args": [
43+
"--trace-depreciation",
44+
"--trace-warnings",
45+
"--extensionDevelopmentPath=${workspaceFolder}",
46+
"${workspaceFolder}/samplenc/sample-colors.nc",
47+
"${workspaceFolder}/samplenc/sample-profile.nc",
48+
"${workspaceFolder}/samplenc/sample-circular-pocket.nc"
49+
],
50+
"outFiles": [
51+
"${workspaceFolder}/dist/**/*.js"
52+
],
53+
"presentation": {
54+
"hidden": false,
55+
"group": "1_run",
56+
"order": 2
57+
},
58+
"skipFiles": [
59+
"<node_internals>/**",
60+
"**/node_modules/**",
61+
"**/resources/app/out/vs/**"
62+
],
63+
"smartStep": true,
64+
"sourceMaps": true,
65+
"trace": true
66+
},
67+
{
68+
"name": "Build & Run G-Code (Sandbox)",
4169
"type": "extensionHost",
4270
"request": "launch",
4371
"runtimeExecutable": "${execPath}",
4472
"args": [
4573
"--disable-extensions",
74+
"--trace-warnings",
4675
"--trace-depreciation",
47-
"--extensionDevelopmentPath=${workspaceFolder}"
76+
"--extensionDevelopmentPath=${workspaceFolder}",
77+
"${workspaceFolder}/samplenc/sample-colors.nc",
78+
"${workspaceFolder}/samplenc/sample-profile.nc",
79+
"${workspaceFolder}/samplenc/sample-circular-pocket.nc"
4880
],
4981
"cwd": "${workspaceFolder}",
5082
"outFiles": [
5183
"${workspaceFolder}/dist/**/*.js"
5284
],
5385
"presentation": {
5486
"hidden": false,
55-
"group": "Launch Extension",
56-
"order": 2
87+
"group": "2_build_launch",
88+
"order": 1
5789
},
58-
"preLaunchTask": "npm: webpack",
90+
"preLaunchTask": "npm: build",
5991
"skipFiles": [
6092
"<node_internals>/**",
6193
"**/node_modules/**",
@@ -66,49 +98,66 @@
6698
"trace": true
6799
},
68100
{
69-
"name": "Run G-Code (Full)",
101+
"name": "Build & Run G-Code (Full)",
70102
"type": "extensionHost",
71103
"request": "launch",
72104
"runtimeExecutable": "${execPath}",
73105
"args": [
74106
"--trace-depreciation",
75-
"--extensionDevelopmentPath=${workspaceFolder}"
107+
"--trace-warnings",
108+
"--extensionDevelopmentPath=${workspaceFolder}",
109+
"${workspaceFolder}/samplenc/sample-colors.nc",
110+
"${workspaceFolder}/samplenc/sample-profile.nc",
111+
"${workspaceFolder}/samplenc/sample-circular-pocket.nc"
76112
],
77113
"outFiles": [
78114
"${workspaceFolder}/dist/**/*.js"
79115
],
80116
"presentation": {
81117
"hidden": false,
82-
"group": "Launch Extension",
83-
"order": 3
118+
"group": "2_build_launch",
119+
"order": 2
84120
},
85-
"preLaunchTask": "npm: webpack",
121+
"preLaunchTask": "npm: build",
86122
"skipFiles": [
87123
"<node_internals>/**",
88-
"**/node_modules/**"
124+
"**/node_modules/**",
125+
"**/resources/app/out/vs/**"
89126
],
90127
"smartStep": true,
91128
"sourceMaps": true,
92129
"trace": true
93130
},
94131
{
95-
"name": "Run G-Code As Web Extension",
132+
"name": "Build & Run G-Code (Full/Production)",
96133
"type": "extensionHost",
97-
"debugWebWorkerHost": true,
98134
"request": "launch",
135+
"runtimeExecutable": "${execPath}",
99136
"args": [
137+
"--trace-depreciation",
138+
"--trace-warnings",
100139
"--extensionDevelopmentPath=${workspaceFolder}",
101-
"--extensionDevelopmentKind=web"
140+
"${workspaceFolder}/samplenc/sample-colors.nc",
141+
"${workspaceFolder}/samplenc/sample-profile.nc",
142+
"${workspaceFolder}/samplenc/sample-circular-pocket.nc"
102143
],
103144
"outFiles": [
104145
"${workspaceFolder}/dist/**/*.js"
105146
],
106-
"preLaunchTask": "npm: webpack",
107147
"presentation": {
108148
"hidden": false,
109-
"group": "Web Extension",
110-
"order": 1
111-
}
149+
"group": "2_build_launch",
150+
"order": 3
151+
},
152+
"preLaunchTask": "npm: bundle",
153+
"skipFiles": [
154+
"<node_internals>/**",
155+
"**/node_modules/**",
156+
"**/resources/app/out/vs/**"
157+
],
158+
"smartStep": true,
159+
"sourceMaps": true,
160+
"trace": true
112161
},
113162
{
114163
"name": "G-Code Mocha Unit Tests",
@@ -127,11 +176,12 @@
127176
],
128177
"skipFiles": [
129178
"<node_internals>/**",
130-
"**/node_modules/**"
179+
"**/node_modules/**",
180+
"**/resources/app/out/vs/**"
131181
],
132182
"presentation": {
133183
"hidden": false,
134-
"group": "Testing",
184+
"group": "3_test",
135185
"order": 1
136186
},
137187
"env": {

‎.vscode/settings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"files.exclude": {
3-
"out": false // set this to true to hide the "out" folder with the compiled JS files
3+
"out": false
44
},
55
"search.exclude": {
6-
"out": true // set this to false to include "out" folder in search results
6+
"out": true,
7+
"dist": true
78
},
8-
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
99
"typescript.tsc.autoDetect": "off",
1010
"[typescript]": {
1111
"editor.defaultFormatter": "dbaeumer.vscode-eslint"

‎.vscode/tasks.json‎

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,24 @@
11
{
22
"version": "2.0.0",
3+
"presentation": {
4+
"echo": false,
5+
"reveal": "always",
6+
"focus": false,
7+
"panel": "dedicated",
8+
"showReuseMessage": false,
9+
"clear": false
10+
},
311
"tasks": [
412
{
513
"type": "npm",
6-
"script": "watch",
7-
"problemMatcher": "$tsc-watch",
8-
"isBackground": true,
9-
"presentation": {
10-
"echo": true,
11-
"reveal": "never",
12-
"focus": false,
13-
"panel": "shared",
14-
"showReuseMessage": true,
15-
"clear": false
16-
},
14+
"script": "build",
15+
"problemMatcher": [
16+
"$ts-webpack",
17+
],
1718
"group": {
1819
"kind": "build",
1920
"isDefault": true
2021
}
21-
},
22-
{
23-
"type": "npm",
24-
"script": "webpack",
25-
"problemMatcher": "$tsc-watch",
26-
"label": "npm: webpack",
27-
"detail": "webpack --mode development",
28-
"isBackground": true,
29-
"presentation": {
30-
"echo": true,
31-
"reveal": "always",
32-
"focus": false,
33-
"panel": "shared",
34-
"showReuseMessage": true,
35-
"clear": false
36-
}
3722
}
3823
]
3924
}

‎.vscodeignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.prettierignore
99
.prettierrc
1010
.vscode-test/**
11+
.vscode-test-web/**
1112
.vscode/**
1213
**/*.map
1314
CODE_OF_CONDUCT.md
@@ -18,9 +19,12 @@ images/**/[^logo]*
1819
out/test/**
1920
package-lock.json
2021
samplenc/**
22+
scripts/**
2123
src/**
2224
test/**
2325
out/**
26+
node_modules/**
2427
tsconfig**
2528
tsconfig.tsbuildinfo
26-
webpack.config.js
29+
webpack.config*.js
30+
.DS_Store

‎images/calculator-screenshot.png‎

14.1 KB
Loading

0 commit comments

Comments
 (0)