diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 360f3d345c..80e5ce82e1 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -216,8 +216,7 @@ module.exports = { { files: ['examples/**/*'], rules: { - 'import/no-unresolved': ['error', {ignore: ['^react-native$']}], - 'import/order': 'off', + 'no-restricted-imports': 'off', }, }, { diff --git a/examples/angular/app.component.spec.ts b/examples/angular/app.component.spec.ts index 6d5fcf88fd..19fc8d9eb0 100644 --- a/examples/angular/app.component.spec.ts +++ b/examples/angular/app.component.spec.ts @@ -1,6 +1,5 @@ import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {describe, expect, it, jest} from '@jest/globals'; - import {AppComponent} from './app.component'; import {DataService} from './shared/data.service'; diff --git a/examples/angular/app.component.ts b/examples/angular/app.component.ts index 86aff20a89..b8125bbbcc 100644 --- a/examples/angular/app.component.ts +++ b/examples/angular/app.component.ts @@ -1,5 +1,4 @@ import {Component} from '@angular/core'; - import {DataService} from './shared/data.service'; @Component({ diff --git a/examples/angular/app.module.ts b/examples/angular/app.module.ts index 3d73ce15a3..485addfc9a 100644 --- a/examples/angular/app.module.ts +++ b/examples/angular/app.module.ts @@ -1,6 +1,5 @@ import {NgModule} from '@angular/core'; import {BrowserModule} from '@angular/platform-browser'; - import {AppComponent} from './app.component'; @NgModule({ diff --git a/examples/angular/shared/data.service.spec.ts b/examples/angular/shared/data.service.spec.ts index d2e7f82960..00593e14b4 100644 --- a/examples/angular/shared/data.service.spec.ts +++ b/examples/angular/shared/data.service.spec.ts @@ -1,6 +1,5 @@ import {TestBed} from '@angular/core/testing'; import {beforeEach, describe, expect, it, jest} from '@jest/globals'; - import {DataService} from './data.service'; import {SubService} from './sub.service'; diff --git a/examples/angular/shared/data.service.ts b/examples/angular/shared/data.service.ts index f5359fd2c7..92f49ae692 100644 --- a/examples/angular/shared/data.service.ts +++ b/examples/angular/shared/data.service.ts @@ -1,5 +1,4 @@ import {Injectable} from '@angular/core'; - import {SubService} from './sub.service'; @Injectable() diff --git a/examples/angular/shared/sub.service.spec.ts b/examples/angular/shared/sub.service.spec.ts index 941f987729..769b826f16 100644 --- a/examples/angular/shared/sub.service.spec.ts +++ b/examples/angular/shared/sub.service.spec.ts @@ -1,6 +1,5 @@ import {TestBed} from '@angular/core/testing'; import {beforeEach, describe, expect, it} from '@jest/globals'; - import {SubService} from './sub.service'; describe('Service: SubService', () => { diff --git a/examples/enzyme/__tests__/CheckboxWithLabel-test.js b/examples/enzyme/__tests__/CheckboxWithLabel-test.js index 068dfa172e..6e96b96516 100644 --- a/examples/enzyme/__tests__/CheckboxWithLabel-test.js +++ b/examples/enzyme/__tests__/CheckboxWithLabel-test.js @@ -2,11 +2,10 @@ import Enzyme, {shallow} from 'enzyme'; import Adapter from 'enzyme-adapter-react-16'; +import CheckboxWithLabel from '../CheckboxWithLabel'; Enzyme.configure({adapter: new Adapter()}); -import CheckboxWithLabel from '../CheckboxWithLabel'; - it('CheckboxWithLabel changes the text after click', () => { // Render a checkbox with label in the document const checkbox = shallow(); diff --git a/examples/mongodb/mongo-environment.js b/examples/mongodb/mongo-environment.js index 60e5e8f14b..c07bd2d4b0 100644 --- a/examples/mongodb/mongo-environment.js +++ b/examples/mongodb/mongo-environment.js @@ -1,9 +1,6 @@ -// mongo-environment.js -const NodeEnvironment = require('jest-environment-node').default; - -const path = require('path'); - -const fs = require('fs'); +import fs from 'fs'; +import path from 'path'; +import NodeEnvironment from 'jest-environment-node'; const globalConfigPath = path.join(__dirname, 'globalConfig.json'); diff --git a/examples/mongodb/setup.js b/examples/mongodb/setup.js index 095d57b150..ae87f7d782 100644 --- a/examples/mongodb/setup.js +++ b/examples/mongodb/setup.js @@ -1,9 +1,6 @@ -// setup.js -const path = require('path'); - -const fs = require('fs'); - -const {MongoMemoryServer} = require('mongodb-memory-server'); +import fs from 'fs'; +import path from 'path'; +import {MongoMemoryServer} from 'mongodb-memory-server'; const globalConfigPath = path.join(__dirname, 'globalConfig.json'); diff --git a/examples/mongodb/teardown.js b/examples/mongodb/teardown.js index 2104c8ebf4..5a2c4a5f4d 100644 --- a/examples/mongodb/teardown.js +++ b/examples/mongodb/teardown.js @@ -1,7 +1,5 @@ -// teardown.js -const path = require('path'); - -const fs = require('fs'); +import fs from 'fs'; +import path from 'path'; const globalConfigPath = path.join(__dirname, 'globalConfig.json'); diff --git a/examples/react-native/index.js b/examples/react-native/index.js index 33885e6ea2..8b1ac7e236 100644 --- a/examples/react-native/index.js +++ b/examples/react-native/index.js @@ -6,9 +6,9 @@ * @flow */ -import Intro from './Intro'; import React, {Component} from 'react'; import {AppRegistry} from 'react-native'; +import Intro from './Intro'; class App extends Component<{}> { render() { diff --git a/examples/react/__tests__/CheckboxWithLabel-test.js b/examples/react/__tests__/CheckboxWithLabel-test.js index 05a89ab546..554c7007af 100644 --- a/examples/react/__tests__/CheckboxWithLabel-test.js +++ b/examples/react/__tests__/CheckboxWithLabel-test.js @@ -1,7 +1,6 @@ // Copyright 2004-present Facebook. All Rights Reserved. import {createRef} from 'react'; - import * as TestUtils from 'react-dom/test-utils'; import CheckboxWithLabel from '../CheckboxWithLabel'; diff --git a/examples/snapshot/__tests__/clock.test.js b/examples/snapshot/__tests__/clock.test.js index a4254cf284..78218ef2c1 100644 --- a/examples/snapshot/__tests__/clock.test.js +++ b/examples/snapshot/__tests__/clock.test.js @@ -2,8 +2,8 @@ 'use strict'; -import Clock from '../Clock'; import renderer from 'react-test-renderer'; +import Clock from '../Clock'; jest.useFakeTimers(); Date.now = jest.fn(() => 1482363367071); diff --git a/examples/snapshot/__tests__/link.test.js b/examples/snapshot/__tests__/link.test.js index 607c8a6395..f7b868d6b4 100644 --- a/examples/snapshot/__tests__/link.test.js +++ b/examples/snapshot/__tests__/link.test.js @@ -2,8 +2,8 @@ 'use strict'; -import Link from '../Link'; import renderer from 'react-test-renderer'; +import Link from '../Link'; it('renders correctly', () => { const tree = renderer diff --git a/examples/typescript/memory.ts b/examples/typescript/Memory.ts similarity index 100% rename from examples/typescript/memory.ts rename to examples/typescript/Memory.ts diff --git a/examples/typescript/__tests__/CheckboxWithLabel-test.tsx b/examples/typescript/__tests__/CheckboxWithLabel-test.tsx index 85159d2d4b..96f73fb3f3 100644 --- a/examples/typescript/__tests__/CheckboxWithLabel-test.tsx +++ b/examples/typescript/__tests__/CheckboxWithLabel-test.tsx @@ -2,7 +2,6 @@ import * as React from 'react'; import * as TestUtils from 'react-dom/test-utils'; - const CheckboxWithLabel = require('../CheckboxWithLabel').default; it('CheckboxWithLabel changes the text after click', () => { diff --git a/examples/typescript/__tests__/calc.test.ts b/examples/typescript/__tests__/calc.test.ts index 7a05eadd87..7ee93ef046 100644 --- a/examples/typescript/__tests__/calc.test.ts +++ b/examples/typescript/__tests__/calc.test.ts @@ -1,13 +1,12 @@ // Copyright (c) 2014-present, Facebook, Inc. All rights reserved. import {jest} from '@jest/globals'; - -import Memory from '../memory'; +import Memory from '../Memory'; +import makeCalc from '../calc'; import sub from '../sub'; import sum from '../sum'; -import makeCalc from '../calc'; -jest.mock('../memory'); +jest.mock('../Memory'); jest.mock('../sub'); jest.mock('../sum'); diff --git a/examples/typescript/calc.ts b/examples/typescript/calc.ts index 00a934b645..ca3840c69f 100644 --- a/examples/typescript/calc.ts +++ b/examples/typescript/calc.ts @@ -1,6 +1,6 @@ +import Memory from './Memory'; import sub from './sub'; import sum from './sum'; -import Memory from './memory'; type Op = 'MemoryAdd' | 'MemoryClear' | 'MemorySub' | 'Sub' | 'Sum';