From a906fb8da95e194a32ed768f84d6e9c7cbb6e9c6 Mon Sep 17 00:00:00 2001 From: Mike Donnalley Date: Thu, 11 Feb 2021 15:34:47 -0700 Subject: [PATCH] fix: testing and linting on windows --- packages/dev-scripts/bin/sf-test.js | 4 ++-- packages/prettier-config/prettier-config.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/dev-scripts/bin/sf-test.js b/packages/dev-scripts/bin/sf-test.js index add66f85..0506a499 100755 --- a/packages/dev-scripts/bin/sf-test.js +++ b/packages/dev-scripts/bin/sf-test.js @@ -7,17 +7,17 @@ */ const shell = require('../utils/shelljs'); - const packageRoot = require('../utils/package-path'); const { resolveConfig } = require('../utils/sf-config'); const nyc = require.resolve('nyc/bin/nyc'); +const mocha = require.resolve('mocha/bin/mocha'); const config = resolveConfig(packageRoot); const testConfig = config.test || {}; const includes = testConfig.testsPath || '**/*.test.ts'; -const command = `${nyc} mocha "${includes}"`; +const command = `node ${nyc} ${mocha} "${includes}"`; try { shell.exec(command, { diff --git a/packages/prettier-config/prettier-config.js b/packages/prettier-config/prettier-config.js index 783d42f7..fca8b847 100644 --- a/packages/prettier-config/prettier-config.js +++ b/packages/prettier-config/prettier-config.js @@ -1,4 +1,5 @@ module.exports = { singleQuote: true, printWidth: 120, + endOfLine: 'auto', };