Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: replace assert with with #579

Merged
merged 1 commit into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion safeImport.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
const safeImport = async (path, fallback = {}) => {
try {
const mod = await import(path, path.includes('.json') ? { assert: { type: 'json' } } : {});
const mod = await import(path, path.includes('.json') ? { with: { type: 'json' } } : {});
if (mod?.default) return mod.default;
return mod;
} catch (error) {
Expand Down
2 changes: 1 addition & 1 deletion test/arcanes.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import arcanes from '../data/arcanes.json' assert { type: 'json' };
import arcanes from '../data/arcanes.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/archonShards.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import archonShards from '../data/archonShards.json' assert { type: 'json' };
import archonShards from '../data/archonShards.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/conclaveData.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import conclaveData from '../data/conclaveData.json' assert { type: 'json' };
import conclaveData from '../data/conclaveData.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/eventsData.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import eventsData from '../data/eventsData.json' assert { type: 'json' };
import eventsData from '../data/eventsData.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/factionsData.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import factionsData from '../data/factionsData.json' assert { type: 'json' };
import factionsData from '../data/factionsData.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/fissureModifiers.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import fissureModifiers from '../data/fissureModifiers.json' assert { type: 'json' };
import fissureModifiers from '../data/fissureModifiers.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
4 changes: 2 additions & 2 deletions test/languages.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import languages from '../data/languages.json' assert { type: 'json' };
import languages from '../data/languages.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);

chai.should();
const { expect } = chai;

const syndicates = Object.keys(await import('../data/syndicatesData.json', { assert: { type: 'json' } }));
const syndicates = Object.keys(await import('../data/syndicatesData.json', { with: { type: 'json' } }));

const languagesSchema = {
definitions: {
Expand Down
2 changes: 1 addition & 1 deletion test/missionTypes.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import missionTypes from '../data/missionTypes.json' assert { type: 'json' };
import missionTypes from '../data/missionTypes.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/operationTypes.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import operationTypes from '../data/operationTypes.json' assert { type: 'json' };
import operationTypes from '../data/operationTypes.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/persistentEnemyData.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import persistentEnemyData from '../data/persistentEnemyData.json' assert { type: 'json' };
import persistentEnemyData from '../data/persistentEnemyData.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/solNodes.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import solNodes from '../data/solNodes.json' assert { type: 'json' };
import solNodes from '../data/solNodes.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/sortieData.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import sortieData from '../data/sortieData.json' assert { type: 'json' };
import sortieData from '../data/sortieData.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/syndicatesData.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import syndicatesData from '../data/syndicatesData.json' assert { type: 'json' };
import syndicatesData from '../data/syndicatesData.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/synthTargets.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import synthTargets from '../data/synthTargets.json' assert { type: 'json' };
import synthTargets from '../data/synthTargets.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/tutorials.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import tutorials from '../data/tutorials.json' assert { type: 'json' };
import tutorials from '../data/tutorials.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down
2 changes: 1 addition & 1 deletion test/upgradeTypes.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as chai from 'chai';
import chaiJson from 'chai-json';
import chaiJsonSchema from 'chai-json-schema-ajv';

import upgradeTypes from '../data/upgradeTypes.json' assert { type: 'json' };
import upgradeTypes from '../data/upgradeTypes.json' with { type: 'json' };

chai.use(chaiJson);
chai.use(chaiJsonSchema);
Expand Down