Skip to content

Commit 4bd2c33

Browse files
authored
Merge pull request #41 from mathworks/dklilley-bugfix-PackageOnMac
Fix bug with packaging on Mac
2 parents 725bd77 + 8268d23 commit 4bd2c33

File tree

5 files changed

+115
-2
lines changed

5 files changed

+115
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ MATLAB language server supports these editors by installing the corresponding ex
2626
### Unreleased
2727

2828
Fixed:
29+
* Resolved packaging failure on Mac
2930
* General bug fixes
3031

3132
### 1.2.1

package-lock.json

Lines changed: 104 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"eslint-plugin-import": "^2.26.0",
3232
"eslint-plugin-node": "^11.1.0",
3333
"eslint-plugin-promise": "^6.0.1",
34+
"node-loader": "^2.0.0",
3435
"ts-loader": "^9.4.1",
3536
"typescript": "^4.8.3",
3637
"webpack": "^5.74.0",

src/lifecycle/MatlabSession.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ export async function launchNewMatlab (): Promise<MatlabSession> {
4444
const outFile = path.join(Logger.logDir, 'matlabls_conn.json')
4545

4646
const watcher = chokidar.watch(outFile, {
47-
persistent: true
47+
persistent: true,
48+
useFsEvents: false
4849
})
4950

5051
// This callback will be triggered when MATLAB has launched and writes the watched file.

webpack.config.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ const path = require('path')
55
const config = {
66
target: 'node',
77
mode: 'none',
8-
8+
node: {
9+
__dirname: false
10+
},
911
entry: './src/index.ts',
1012
output: {
1113
path: path.resolve(__dirname, 'out'),
@@ -26,6 +28,10 @@ const config = {
2628
loader: 'ts-loader'
2729
}
2830
]
31+
},
32+
{
33+
test: /\.node$/,
34+
loader: 'node-loader'
2935
}
3036
]
3137
}

0 commit comments

Comments
 (0)