Skip to content

Commit 22acf1e

Browse files
baronfelbaronfel
committed
minimal changes
1 parent 65081fc commit 22acf1e

File tree

2 files changed

+64
-57
lines changed

2 files changed

+64
-57
lines changed

‎webpack.config.js

+44-37
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
//@ts-check
2+
/** @typedef {import('webpack').Configuration} WebpackConfig **/
3+
4+
'use strict';
5+
16
var path = require("path");
27

38
function resolve(filePath) {
@@ -13,48 +18,50 @@ var babelOptions = {
1318
plugins: ["@babel/plugin-transform-runtime"]
1419
}
1520

16-
module.exports = function(env, argv) {
21+
module.exports = function (env, argv) {
1722
var isProduction = argv.mode == "production"
1823
console.log("Bundling for " + (isProduction ? "production" : "development") + "...");
1924

2025
var ionideExperimental = (env && env.ionideExperimental);
2126
var outputPath = ionideExperimental ? "release-exp" : "release";
2227
console.log("Output path: " + outputPath);
2328

24-
return {
25-
target: 'node',
26-
mode: isProduction ? "production" : "development",
27-
devtool: "source-map",
28-
entry: './out/fsharp.js',
29-
output: {
30-
filename: 'fsharp.js',
31-
path: resolve('./' + outputPath),
32-
//library: 'IONIDEFSHARP',
33-
libraryTarget: 'commonjs2'
34-
},
35-
resolve: {
36-
modules: [resolve("./node_modules/")]
37-
},
38-
//externals: [nodeExternals()],
39-
externals: {
40-
// Who came first the host or the plugin ?
41-
"vscode": "commonjs vscode",
42-
43-
// Optional dependencies of ws
44-
"utf-8-validate": "commonjs utf-8-validate",
45-
"bufferutil": "commonjs bufferutil"
46-
},
47-
module: {
48-
rules: [
49-
{
50-
test: /\.js$/,
51-
exclude: /node_modules/,
52-
use: {
53-
loader: 'babel-loader',
54-
options: babelOptions
55-
},
56-
}
57-
]
58-
}
59-
};
29+
/**@type WebpackConfig*/
30+
const config = {
31+
target: 'node',
32+
mode: isProduction ? "production" : "development",
33+
devtool: "source-map",
34+
entry: './out/fsharp.js',
35+
output: {
36+
filename: 'fsharp.js',
37+
path: resolve('./' + outputPath),
38+
//library: 'IONIDEFSHARP',
39+
libraryTarget: 'commonjs2'
40+
},
41+
resolve: {
42+
modules: [resolve("./node_modules/")]
43+
},
44+
//externals: [nodeExternals()],
45+
externals: {
46+
// Who came first the host or the plugin ?
47+
"vscode": "commonjs vscode",
48+
49+
// Optional dependencies of ws
50+
"utf-8-validate": "commonjs utf-8-validate",
51+
"bufferutil": "commonjs bufferutil"
52+
},
53+
module: {
54+
rules: [
55+
{
56+
test: /\.js$/,
57+
exclude: /node_modules/,
58+
use: {
59+
loader: 'babel-loader',
60+
options: babelOptions
61+
},
62+
}
63+
]
64+
}
65+
};
66+
return config;
6067
}

‎yarn.lock

+20-20
Original file line numberDiff line numberDiff line change
@@ -4145,32 +4145,32 @@ [email protected]:
41454145
resolved "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.44.0.tgz"
41464146
integrity sha512-qf+eBnrDyR2MpP08y1JfzJnFZGHdkk86+SRGRp0XepDGNA6n/Nann5XhtAzdGX/yaZokjTAINK313S2yYhHoPQ==
41474147

4148-
vscode-jsonrpc@6.0.0:
4149-
version "6.0.0"
4150-
resolved "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz"
4151-
integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
4148+
vscode-jsonrpc@8.0.1:
4149+
version "8.0.1"
4150+
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz#f30b0625ebafa0fb3bc53e934ca47b706445e57e"
4151+
integrity sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==
41524152

4153-
vscode-languageclient@^7.0.0:
4154-
version "7.0.0"
4155-
resolved "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz"
4156-
integrity sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==
4153+
vscode-languageclient@^8.0.0:
4154+
version "8.0.1"
4155+
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-8.0.1.tgz#bf5535c4463a78daeaca0bcb4f5868aec86bb301"
4156+
integrity sha512-9XoE+HJfaWvu7Y75H3VmLo5WLCtsbxEgEhrLPqwt7eyoR49lUIyyrjb98Yfa50JCMqF2cePJAEVI6oe2o1sIhw==
41574157
dependencies:
41584158
minimatch "^3.0.4"
4159-
semver "^7.3.4"
4160-
vscode-languageserver-protocol "3.16.0"
4159+
semver "^7.3.5"
4160+
vscode-languageserver-protocol "3.17.1"
41614161

4162-
vscode-languageserver-protocol@3.16.0:
4163-
version "3.16.0"
4164-
resolved "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz"
4165-
integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==
4162+
vscode-languageserver-protocol@3.17.1:
4163+
version "3.17.1"
4164+
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz#e801762c304f740208b6c804a0cf21f2c87509ed"
4165+
integrity sha512-BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==
41664166
dependencies:
4167-
vscode-jsonrpc "6.0.0"
4168-
vscode-languageserver-types "3.16.0"
4167+
vscode-jsonrpc "8.0.1"
4168+
vscode-languageserver-types "3.17.1"
41694169

4170-
vscode-languageserver-types@3.16.0:
4171-
version "3.16.0"
4172-
resolved "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz"
4173-
integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
4170+
vscode-languageserver-types@3.17.1:
4171+
version "3.17.1"
4172+
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz#c2d87fa7784f8cac389deb3ff1e2d9a7bef07e16"
4173+
integrity sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==
41744174

41754175
watchpack-chokidar2@^2.0.0:
41764176
version "2.0.0"

0 commit comments

Comments
 (0)