未验证 提交 c86746c7 编写于 作者: R Roman Donchenko 提交者: GitHub

Convert `api.ts`, `api-implementation.ts` and `frames.ts` to ES6 modules (#5283)

This fixes ESLint errors in these files.

Set the `resolveJsonModule` setting, so that TypeScript can recognize the
`package.json` import.
上级 5dd7eff9
此差异已折叠。
......@@ -8,34 +8,36 @@
* @module API
*/
function build() {
const PluginRegistry = require('./plugins').default;
const loggerStorage = require('./logger-storage').default;
const { Log } = require('./log');
const ObjectState = require('./object-state').default;
const Statistics = require('./statistics').default;
const Comment = require('./comment').default;
const Issue = require('./issue').default;
const { Job, Task } = require('./session');
const Project = require('./project').default;
const implementProject = require('./project-implementation').default;
const { Attribute, Label } = require('./labels');
const MLModel = require('./ml-model').default;
const { FrameData } = require('./frames');
const CloudStorage = require('./cloud-storage').default;
const Organization = require('./organization').default;
const Webhook = require('./webhook').default;
import PluginRegistry from './plugins';
import loggerStorage from './logger-storage';
import { Log } from './log';
import ObjectState from './object-state';
import Statistics from './statistics';
import Comment from './comment';
import Issue from './issue';
import { Job, Task } from './session';
import Project from './project';
import implementProject from './project-implementation';
import { Attribute, Label } from './labels';
import MLModel from './ml-model';
import { FrameData } from './frames';
import CloudStorage from './cloud-storage';
import Organization from './organization';
import Webhook from './webhook';
import * as enums from './enums';
const enums = require('./enums');
import {
Exception, ArgumentError, DataError, ScriptingError, PluginError, ServerError,
} from './exceptions';
const {
Exception, ArgumentError, DataError, ScriptingError, PluginError, ServerError,
} = require('./exceptions');
import User from './user';
import pjson from '../package.json';
import config from './config';
const User = require('./user').default;
const pjson = require('../package.json');
const config = require('./config').default;
import implementAPI from './api-implementation';
function build() {
/**
* API entrypoint
* @namespace cvat
......@@ -925,9 +927,8 @@ function build() {
cvat.cloudStorages = Object.freeze(cvat.cloudStorages);
cvat.organizations = Object.freeze(cvat.organizations);
const implementAPI = require('./api-implementation');
const implemented = Object.freeze(implementAPI(cvat));
return implemented;
}
module.exports = build();
export default build();
此差异已折叠。
......@@ -13,7 +13,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const serverProxy = require('../../src/server-proxy').default;
// Test cases
......
......@@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const CloudStorage= require('../../src/cloud-storage').default;
const { cloudStoragesDummyData } = require('../mocks/dummy-data.mock');
......
......@@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const { FrameData } = require('../../src/frames');
......
......@@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const { Job } = require('../../src/session');
......
......@@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
describe('Feature: set attributes for an object state', () => {
test('set a valid value', () => {
......
......@@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
describe('Feature: dummy feature', () => {
test('dummy test', async () => {
......
......@@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const Project = require('../../src/project').default;
......
......@@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const { AnnotationFormats, Loader, Dumper } = require('../../src/annotation-formats');
// Test cases
......
......@@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const { Task } = require('../../src/session');
......
......@@ -12,7 +12,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const User = require('../../src/user').default;
......
......@@ -11,7 +11,7 @@ jest.mock('../../src/server-proxy', () => {
});
// Initialize api
window.cvat = require('../../src/api');
window.cvat = require('../../src/api').default;
const Webhook = require('../../src/webhook').default;
const { webhooksDummyData, webhooksEventsDummyData } = require('../mocks/dummy-data.mock');
......
......@@ -8,6 +8,7 @@
"isolatedModules": true,
"noEmit": true,
"baseUrl": "src",
"resolveJsonModule": true,
},
"include": ["src/*.ts"]
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册