Skip to content

Commit 878d894

Browse files
committed
Merge branch 'topic/fix-npm-win' into 'master'
Fix npm scripts for Windows See merge request eng/ide/ada_language_server!2079
2 parents c35e8ea + 2aa6c64 commit 878d894

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

integration/vscode/ada/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,17 +1510,17 @@
15101510
"vscode:prepublish": "npm run compile && npm run esbuild-base -- --minify --sourcemap",
15111511
"esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/src/extension.js --external:vscode --format=cjs --platform=node",
15121512
"compile": "node ./node_modules/typescript/bin/tsc && npm run compile-webview",
1513-
"compile-webview": "npm run copy && webpack",
1513+
"compile-webview": "npm run copy && node ./node_modules/webpack/bin/webpack.js",
15141514
"watch": "npm run copy && node ./node_modules/typescript/bin/tsc -watch",
15151515
"copy": "node -e \"fs.mkdirSync('out/src/visualizing', {recursive: true}); fs.copyFileSync('src/visualizing/visualizerStyleSheet.css','out/src/visualizing/visualizerStyleSheet.css')\"",
15161516
"pretest": "npm run compile",
1517-
"lint": "eslint \"./src/**/*.{js,ts,tsx}\" \"./test/**/*.{js,ts,tsx}\" --quiet --fix",
1518-
"cilint": "eslint \"./src/**/*.{js,ts,tsx}\" \"./test/**/*.{js,ts,tsx}\"",
1517+
"lint": "npm run cilint -- --quiet --fix",
1518+
"cilint": "node ./node_modules/eslint/bin/eslint.js \"./src/**/*.{js,ts,tsx}\" \"./test/**/*.{js,ts,tsx}\"",
15191519
"test": "vscode-test",
15201520
"resolve-backtrace": "npx stacktracify",
15211521
"clean": "node -e \"fs.rmSync('out',{force:true,recursive:true})\"",
15221522
"unresolve": "node unresolve.js",
1523-
"wdio": "wdio run ./test/visualizer_test/wdio.conf.ts"
1523+
"wdio": "node ./node_modules/bin/wdio run ./test/visualizer_test/wdio.conf.ts"
15241524
},
15251525
"dependencies": {
15261526
"@vscode/codicons": "^0.0.36",
@@ -1536,4 +1536,4 @@
15361536
"winston": "3.14.2",
15371537
"ws": "^8.18.0"
15381538
}
1539-
}
1539+
}

0 commit comments

Comments
 (0)