@companion-module/tools 2.0.2 → 2.0.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.0.3](https://github.com/bitfocus/companion-module-tools/compare/v2.0.2...v2.0.3) (2024-09-11)
+
+
+### Bug Fixes
+
+* update `zx` and another try at `webpack` invocation on windows ([8973b61](https://github.com/bitfocus/companion-module-tools/commit/8973b613f4ae1fd07eaae88a8c9b3e963fd7f62b))
+
 ## [2.0.2](https://github.com/bitfocus/companion-module-tools/compare/v2.0.1...v2.0.2) (2024-09-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@companion-module/tools",
-	"version": "2.0.2",
+	"version": "2.0.3",
 	"type": "module",
 	"main": "index.js",
 	"license": "MIT",
@@ -26,7 +26,7 @@
 		"webpack.*"
 	],
 	"dependencies": {
-		"@eslint/js": "^9.9.1",
+		"@eslint/js": "^9.10.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-n": "^17.10.2",
 		"eslint-plugin-prettier": "^5.2.1",
@@ -35,7 +35,7 @@
 		"tar": "^7.4.3",
 		"webpack": "^5.94.0",
 		"webpack-cli": "^5.1.4",
-		"zx": "^7.2.3"
+		"zx": "^8.1.6"
 	},
 	"peerDependencies": {
 		"@companion-module/base": "^1.7.1",
@@ -55,10 +55,10 @@
 		}
 	},
 	"devDependencies": {
-		"@types/eslint": "^9.6.0",
-		"eslint": "^9.9.1",
+		"@types/eslint": "^9.6.1",
+		"eslint": "^9.10.0",
 		"prettier": "^3.3.3",
-		"typescript-eslint": "^8.2.0"
+		"typescript-eslint": "^8.5.0"
 	},
 	"packageManager": "yarn@4.4.1"
 }

package/scripts/build.js

@@ -9,6 +9,10 @@ import * as tar from 'tar'
 import { validateManifest } from '@companion-module/base'
 import { createRequire } from 'module'
 
+if (process.platform === 'win32') {
+	usePowerShell() // to enable powershell
+}
+
 const require = createRequire(import.meta.url)
 
 async function findModuleDir(cwd) {
@@ -44,11 +48,8 @@ for (const [k, v] of Object.entries(webpackArgs)) {
 // build the code
 $.cwd = toolsDir
 const webpackConfig = path.join(toolsDir, 'webpack.config.cjs').replace(/\\/g, '/') // Fix slashes because windows is a pain
-let webpackPath = path.join(toolsDir, 'node_modules', '.bin', 'webpack').replace(/\\/g, '/') // Fix slashes because windows is a pain
-// Try the level above too
-if (!fs.existsSync(webpackPath)) webpackPath = path.join(toolsDir, '../../.bin/webpack').replace(/\\/g, '/') // Fix slashes because windows is a pain
-// Use a manual path to the webpack binary to avoid issues with yarn versions
-await $`${webpackPath} -c ${webpackConfig} ${webpackArgsArray}`
+// use npx to invoke. manual paths does not work on windows, and using `yarn` requires corepack
+await $`npx webpack -c ${webpackConfig} ${webpackArgsArray}`
 $.cwd = undefined
 
 // copy in the metadata
@@ -184,6 +185,6 @@ await tar
 		{
 			gzip: true,
 		},
-		['pkg']
+		['pkg'],
 	)
 	.pipe(fs.createWriteStream('pkg.tgz'))

package/scripts/check.js

@@ -8,6 +8,10 @@ import { findUp } from 'find-up'
 import { validateManifest } from '@companion-module/base'
 import { createRequire } from 'module'
 
+if (process.platform === 'win32') {
+	usePowerShell() // to enable powershell
+}
+
 const require = createRequire(import.meta.url)
 
 async function findModuleDir(cwd) {

package/scripts/generate-manifest.js

@@ -5,6 +5,10 @@ import 'zx/globals'
 import { fs, path, $ } from 'zx'
 import parseAuthor from 'parse-author'
 
+if (process.platform === 'win32') {
+	usePowerShell() // to enable powershell
+}
+
 if (await fs.pathExists('companion/manifest.json')) {
 	throw new Error('Manifest has already been created')
 }