Skip to content

Commit c03a6ba

Browse files
fix(overmind-devtools-vscode): actually running now
1 parent 25d44ff commit c03a6ba

File tree

6 files changed

+65
-26
lines changed

6 files changed

+65
-26
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ es
1111
lib
1212
.cache
1313
.DS_Store
14+
devtoolsDist
1415

1516
# Runtime data
1617
pids

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,16 @@
5959
"devDependencies": {
6060
"@babel/core": "7.4.5",
6161
"@babel/plugin-proposal-class-properties": "7.3.4",
62+
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
6263
"@babel/plugin-transform-react-jsx": "7.1.6",
6364
"@babel/preset-react": "7.0.0",
6465
"@babel/preset-typescript": "7.1.0",
6566
"@types/jest": "23.1.4",
67+
"@types/node": "10.12.21",
6668
"@types/react": "16.7.13",
6769
"@types/react-dom": "16.0.6",
70+
"@types/vscode": "^1.35.0",
71+
"@types/ws": "6.0.1",
6872
"@vue/component-compiler-utils": "2.1.0",
6973
"babel-loader": "^8.0.5",
7074
"babel-plugin-transform-vue-jsx": "3.7.0",
@@ -101,19 +105,16 @@
101105
"ts-jest": "23.10.4",
102106
"ts-loader": "4.4.2",
103107
"tslib": "1.9.3",
108+
"tslint": "5.12.1",
104109
"typescript": "^3.5.2",
105110
"typescript-eslint-parser": "^21.0.1",
106111
"url-loader": "1.0.1",
112+
"vscode": "1.1.34",
107113
"vue": "2.5.16",
108114
"vue-template-compiler": "2.5.16",
109115
"webpack": "4.28.4",
110116
"webpack-cli": "3.1.2",
111-
"webpack-dev-server": "3.1.11",
112-
"@types/node": "10.12.21",
113-
"tslint": "5.12.1",
114-
"@types/vscode": "^1.35.0",
115-
"@types/ws": "6.0.1",
116-
"vscode": "1.1.34"
117+
"webpack-dev-server": "3.1.11"
117118
},
118119
"lint-staged": {
119120
"*.{js,ts,tsx}": [

packages/node_modules/overmind-devtools-vscode/.vscode/launch.json

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,11 @@
1111
"request": "launch",
1212
"runtimeExecutable": "${execPath}",
1313
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
14-
"outFiles": ["${workspaceFolder}/out/**/*.js"],
14+
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
1515
"preLaunchTask": "npm: watch",
1616
"env": {
1717
"VSCODE_DEBUG_MODE": "true"
1818
}
19-
},
20-
{
21-
"name": "Extension Tests",
22-
"type": "extensionHost",
23-
"request": "launch",
24-
"runtimeExecutable": "${execPath}",
25-
"args": [
26-
"--extensionDevelopmentPath=${workspaceFolder}",
27-
"--extensionTestsPath=${workspaceFolder}/out/test"
28-
],
29-
"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
30-
"preLaunchTask": "npm: watch"
3119
}
3220
]
3321
}
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
.vscode/**
22
.vscode-test/**
3-
out/test/**
3+
dist/test/**
44
src/**
55
.gitignore
66
vsc-extension-quickstart.md
77
**/tsconfig.json
88
**/tslint.json
99
**/*.map
10-
**/*.ts
10+
**/*.ts
11+
tsconfig.json
12+
webpack.config.js

packages/node_modules/overmind-devtools-vscode/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "Overmind Devtools VSCode",
44
"description": "Devtools for Overmind",
55
"publisher": "christianalfoni",
6-
"version": "0.0.1",
6+
"version": "0.0.3",
77
"engines": {
88
"vscode": "^1.35.0"
99
},
@@ -14,7 +14,7 @@
1414
"onCommand:overmind-devtools.start",
1515
"onWebviewPanel:overmindDevtools"
1616
],
17-
"main": "./out/extension.js",
17+
"main": "./dist/extension.js",
1818
"contributes": {
1919
"configuration": {
2020
"title": "Overmind Devtools",
@@ -41,9 +41,9 @@
4141
]
4242
},
4343
"scripts": {
44-
"vscode:prepublish": "npm run compile",
45-
"compile": "tsc -p ./",
46-
"watch": "tsc -watch -p ./",
44+
"vscode:prepublish": "webpack --mode production",
45+
"compile": "webpack --mode none",
46+
"watch": "webpack --mode none --watch",
4747
"postinstall": "node ./node_modules/vscode/bin/install",
4848
"build": "rimraf devtoolsDist && cp -R ../overmind-devtools-client/dist devtoolsDist"
4949
},
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
const path = require('path')
2+
3+
module.exports = (env) => ({
4+
devtool: 'inline-source-map',
5+
target: 'node',
6+
mode: 'development',
7+
entry: path.resolve('src', 'extension.ts'),
8+
output: {
9+
path: path.resolve('dist'),
10+
filename: 'extension.js',
11+
libraryTarget: 'commonjs2',
12+
devtoolModuleFilenameTemplate: '../[resource-path]',
13+
},
14+
devServer: {
15+
disableHostCheck: true,
16+
},
17+
externals: {
18+
vscode: 'commonjs vscode',
19+
bufferutil: 'commonjs bufferutil',
20+
'utf-8-validate': 'commonjs utf-8-validate',
21+
},
22+
module: {
23+
rules: [
24+
{
25+
test: /\.tsx?$/,
26+
loader: 'babel-loader',
27+
options: {
28+
presets: ['@babel/preset-typescript', '@babel/preset-env'],
29+
plugins: [
30+
'@babel/plugin-proposal-class-properties',
31+
'@babel/plugin-transform-runtime',
32+
],
33+
},
34+
},
35+
{
36+
test: /\.js$/,
37+
loader: 'babel-loader',
38+
options: {
39+
plugins: ['@babel/plugin-proposal-object-rest-spread'],
40+
},
41+
},
42+
],
43+
},
44+
resolve: {
45+
extensions: ['.js', '.tsx', '.ts'],
46+
},
47+
})

0 commit comments

Comments
 (0)