Upgrade XO and apply changes

Author: novemberborn

index.js

@@ -44,7 +44,7 @@ const configProperties = {
 		required: true,
 		isValid(compile) {
 			return compile === false || compile === 'tsc';
-		}
+		},
 	},
 	rewritePaths: {
 		required: true,
@@ -53,20 +53,18 @@ const configProperties = {
 				return false;
 			}
 
-			return Object.entries(rewritePaths).every(([from, to]) => {
-				return from.endsWith('/') && typeof to === 'string' && to.endsWith('/');
-			});
-		}
+			return Object.entries(rewritePaths).every(([from, to]) => from.endsWith('/') && typeof to === 'string' && to.endsWith('/'));
+		},
 	},
 	extensions: {
 		required: false,
 		isValid(extensions) {
-			return Array.isArray(extensions) &&
-				extensions.length > 0 &&
-				extensions.every(ext => typeof ext === 'string' && ext !== '') &&
-				new Set(extensions).size === extensions.length;
-		}
-	}
+			return Array.isArray(extensions)
+				&& extensions.length > 0
+				&& extensions.every(ext => typeof ext === 'string' && ext !== '')
+				&& new Set(extensions).size === extensions.length;
+		},
+	},
 };
 
 module.exports = ({negotiateProtocol}) => {
@@ -86,12 +84,12 @@ module.exports = ({negotiateProtocol}) => {
 			const {
 				extensions = ['ts'],
 				rewritePaths: relativeRewritePaths,
-				compile
+				compile,
 			} = config;
 
 			const rewritePaths = Object.entries(relativeRewritePaths).map(([from, to]) => [
 				path.join(protocol.projectDir, from),
-				path.join(protocol.projectDir, to)
+				path.join(protocol.projectDir, to),
 			]);
 			const testFileExtension = new RegExp(`\\.(${extensions.map(ext => escapeStringRegexp(ext)).join('|')})$`);
 
@@ -102,13 +100,13 @@ module.exports = ({negotiateProtocol}) => {
 					}
 
 					return {
-						extensions: extensions.slice(),
-						rewritePaths: rewritePaths.slice()
+						extensions: [...extensions],
+						rewritePaths: [...rewritePaths],
 					};
 				},
 
 				get extensions() {
-					return extensions.slice();
+					return [...extensions];
 				},
 
 				ignoreChange(filePath) {
@@ -139,14 +137,14 @@ module.exports = ({negotiateProtocol}) => {
 						filePatterns: [
 							...filePatterns,
 							'!**/*.d.ts',
-							...Object.values(relativeRewritePaths).map(to => `!${to}**`)
+							...Object.values(relativeRewritePaths).map(to => `!${to}**`),
 						],
 						ignoredByWatcherPatterns: [
 							...ignoredByWatcherPatterns,
-							...Object.values(relativeRewritePaths).map(to => `${to}**/*.js.map`)
-						]
+							...Object.values(relativeRewritePaths).map(to => `${to}**/*.js.map`),
+						],
 					};
-				}
+				},
 			};
 		},
 
@@ -169,8 +167,8 @@ module.exports = ({negotiateProtocol}) => {
 					// TODO: Support JSX preserve mode — https://www.typescriptlang.org/docs/handbook/jsx.html
 					const rewritten = `${to}${ref.slice(from.length)}`.replace(testFileExtension, '.js');
 					return requireFn(rewritten);
-				}
+				},
 			};
-		}
+		},
 	};
 };

package.json

@@ -27,7 +27,7 @@
     "c8": "^7.7.1",
     "del": "^6.0.0",
     "typescript": "^4.2.4",
-    "xo": "^0.38.2"
+    "xo": "^0.46.3"
   },
   "c8": {
     "reporter": [
@@ -47,7 +47,9 @@
       "test/broken-fixtures"
     ],
     "rules": {
-      "import/order": "off"
+      "import/extensions": "off",
+      "import/order": "off",
+      "unicorn/prefer-module": "off"
     }
   }
 }

test/_with-provider.js

@@ -2,22 +2,20 @@ const path = require('path');
 const pkg = require('../package.json');
 const makeProvider = require('..');
 
-const createProviderMacro = (identifier, avaVersion, projectDir = __dirname) => {
-	return (t, run) => run(t, makeProvider({
-		negotiateProtocol(identifiers, {version}) {
-			t.true(identifiers.includes(identifier));
-			t.is(version, pkg.version);
-			return {
-				ava: {avaVersion},
-				identifier,
-				normalizeGlobPatterns: patterns => patterns,
-				async findFiles({patterns}) {
-					return patterns.map(file => path.join(projectDir, file));
-				},
-				projectDir
-			};
-		}
-	}));
-};
+const createProviderMacro = (identifier, avaVersion, projectDir = __dirname) => (t, run) => run(t, makeProvider({
+	negotiateProtocol(identifiers, {version}) {
+		t.true(identifiers.includes(identifier));
+		t.is(version, pkg.version);
+		return {
+			ava: {avaVersion},
+			identifier,
+			normalizeGlobPatterns: patterns => patterns,
+			async findFiles({patterns}) {
+				return patterns.map(file => path.join(projectDir, file));
+			},
+			projectDir,
+		};
+	},
+}));
 
 module.exports = createProviderMacro;

test/compilation.js

@@ -12,26 +12,24 @@ test.before('deleting compiled files', async t => {
 	t.log(await del('test/broken-fixtures/typescript/compiled'));
 });
 
-const compile = async provider => {
-	return {
-		state: await provider.main({
-			config: {
-				rewritePaths: {
-					'ts/': 'typescript/',
-					'compiled/': 'typescript/compiled/'
-				},
-				compile: 'tsc'
-			}
-		}).compile()
-	};
-};
+const compile = async provider => ({
+	state: await provider.main({
+		config: {
+			rewritePaths: {
+				'ts/': 'typescript/',
+				'compiled/': 'typescript/compiled/',
+			},
+			compile: 'tsc',
+		},
+	}).compile(),
+});
 
 test('worker(): load rewritten paths files', withProvider, async (t, provider) => {
 	const {state} = await compile(provider);
 	const {stdout, stderr} = await execa.node(
 		path.join(__dirname, 'fixtures/install-and-load'),
 		[JSON.stringify(state), path.join(__dirname, 'fixtures/ts', 'file.ts')],
-		{cwd: path.join(__dirname, 'fixtures')}
+		{cwd: path.join(__dirname, 'fixtures')},
 	);
 	if (stderr.length > 0) {
 		t.log(stderr);
@@ -45,7 +43,7 @@ test('worker(): runs compiled files', withProvider, async (t, provider) => {
 	const {stdout, stderr} = await execa.node(
 		path.join(__dirname, 'fixtures/install-and-load'),
 		[JSON.stringify(state), path.join(__dirname, 'fixtures/compiled', 'index.ts')],
-		{cwd: path.join(__dirname, 'fixtures')}
+		{cwd: path.join(__dirname, 'fixtures')},
 	);
 	if (stderr.length > 0) {
 		t.log(stderr);

test/fixtures/install-and-load.js

@@ -1,15 +1,16 @@
 const path = require('path');
+const process = require('process');
 const makeProvider = require('../..');
 
 const provider = makeProvider({
 	negotiateProtocol() {
 		return {identifier: 'ava-3.2', ava: {version: '3.15.0'}, projectDir: __dirname};
-	}
+	},
 });
 
 const worker = provider.worker({
 	extensionsToLoadAsModules: [],
-	state: JSON.parse(process.argv[2])
+	state: JSON.parse(process.argv[2]),
 });
 
 const ref = path.resolve(process.argv[3]);

test/protocol-ava-3.2.js

@@ -81,6 +81,6 @@ test('main() updateGlobs()', withProvider, (t, provider) => {
 	const main = provider.main({config: {rewritePaths: {'src/': 'build/'}, compile: false}});
 	t.snapshot(main.updateGlobs({
 		filePatterns: ['src/test.ts'],
-		ignoredByWatcherPatterns: ['assets/**']
+		ignoredByWatcherPatterns: ['assets/**'],
 	}));
 });