Skip to content

Commit

Permalink
Simplify use of require, reducing need to disable ESLint rules.
Browse files Browse the repository at this point in the history
  • Loading branch information
QuintinWillison committed Mar 29, 2022
1 parent 0c5fe43 commit e337082
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 15 deletions.
3 changes: 1 addition & 2 deletions json-schemas/publish.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ const { S3Client, PutObjectCommand } = require('@aws-sdk/client-s3');

const srcDir = path.resolve(__dirname, 'src');

// eslint-disable-next-line import/no-dynamic-require
const versions = require(path.resolve(__dirname, 'versions.json'));
const versions = require('./versions.json');

const baseUrl = 'https://schemas.ably.com/json';
const s3Bucket = 'schemas.ably.com';
Expand Down
16 changes: 3 additions & 13 deletions test/agents.test.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
const path = require('path');
const { Validator } = require('jsonschema');

const schemaPath = path.resolve(__dirname, '..', 'json-schemas', 'src', 'agents.json');
const agentsPath = path.resolve(__dirname, '..', 'protocol', 'agents.json');
const versionsPath = path.resolve(__dirname, '..', 'json-schemas', 'versions.json');

// eslint-disable-next-line import/no-dynamic-require
const schema = require(schemaPath);

// eslint-disable-next-line import/no-dynamic-require
const agents = require(agentsPath);

// eslint-disable-next-line import/no-dynamic-require
const versions = require(versionsPath);
const schema = require('../json-schemas/src/agents.json');
const agents = require('../protocol/agents.json');
const versions = require('../json-schemas/versions.json');

const jsonschema = new Validator();
jsonschema.addSchema(
Expand Down

0 comments on commit e337082

Please sign in to comment.