Skip to content

Commit b8cdb12

Browse files
orzyyyypeko-bot
andauthored
fix: upgrade jest to 27 (#127)
* fix: upgrade jest to 27 * ditto * chore: upgrade adapter of enzyme to 17 * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto * ditto Co-authored-by: peko-bot <[email protected]>
1 parent 8ac2441 commit b8cdb12

File tree

9 files changed

+26
-41
lines changed

9 files changed

+26
-41
lines changed

cases/compile/ts/index.ts

-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import { format } from 'date-fns';
22
import { calc } from './src/calc';
33

44
const defaultFunc = (prefix: string) => {
5-
// tslint:disable-next-line: no-console
65
console.log(`${prefix}: ${format(new Date(), 'yyyy-MM-dd hh:mm:ss')}`);
7-
// tslint:disable-next-line: no-console
86
console.log(calc());
97
};
108

cases/compile/tsx/index-tsx.tsx

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ import { format } from 'date-fns';
22
import { calc } from './src/calc-tsx';
33

44
const defaultFunc = (prefix: string) => {
5-
// tslint:disable-next-line: no-console
6-
console.log(`${prefix}: ${format(new Date(), 'yyyy-MM-dd hh:mm:ss')}`); // eslint-disable-line
7-
// tslint:disable-next-line: no-console
8-
console.log(calc()); // eslint-disable-line
5+
console.log(`${prefix}: ${format(new Date(), 'yyyy-MM-dd hh:mm:ss')}`);
6+
console.log(calc());
97
};
108

119
defaultFunc('timeStamp:');

package.json

+4-7
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"@babel/runtime": "^7.7.6",
7171
"@typescript-eslint/eslint-plugin": "^5.0.0",
7272
"@typescript-eslint/parser": "^5.0.0",
73+
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.5",
7374
"babel-core": "^7.0.0-bridge.0",
7475
"babel-jest": "^26.0.0",
7576
"babel-loader": "^8.0.6",
@@ -81,33 +82,29 @@
8182
"css-loader": "^6.0.0",
8283
"date-fns": "^2.8.1",
8384
"enzyme": "^3.10.0",
84-
"enzyme-adapter-react-16": "^1.15.1",
8585
"enzyme-to-json": "^3.4.3",
8686
"eslint": "^8.0.0",
8787
"eslint-plugin-react": "^7.17.0",
8888
"eslint-plugin-react-hooks": "^4.0.0",
8989
"fs-extra": "^10.0.0",
9090
"html-webpack-plugin": "^5.0.0",
91-
"jest": "^26.0.0",
91+
"jest": "^27.0.0",
9292
"lint-staged": "^12.0.0",
9393
"prettier": "^2.0.0",
9494
"source-map-loader": "^3.0.0",
9595
"style-loader": "^3.0.0",
9696
"toho-log-plugin": "^1.1.0",
9797
"ts-loader": "^9.0.0",
98-
"tslint-config-prettier": "^1.18.0",
99-
"tslint-eslint-rules": "^5.4.0",
10098
"url-loader": "^4.1.1",
10199
"walk": "^2.3.14",
102100
"webpack": "^5.43.0",
103101
"webpack-cli": "^4.0.0",
104102
"webpack-dev-server": "^4.0.0",
105103
"webpack-merge": "^5.0.0",
106-
"webpackbar": "^5.0.0-3"
104+
"webpackbar": "^5.0.0"
107105
},
108106
"devDependencies": {
109107
"@types/enzyme": "^3.10.4",
110-
"@types/enzyme-adapter-react-16": "^1.0.5",
111108
"@types/fs-extra": "^9.0.0",
112109
"@types/glob": "^7.2.0",
113110
"@types/jest": "^27.0.0",
@@ -119,6 +116,6 @@
119116
"react": "^17.0.0",
120117
"react-dom": "^17.0.0",
121118
"rimraf": "^3.0.0",
122-
"typescript": "^4.0.0"
119+
"typescript": "^4.5.2"
123120
}
124121
}

src/compile/__tests__/__snapshots__/compile.test.ts.snap

+6-12
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,12 @@ var _dateFns = require(\\"date-fns\\");
9191
var _calcTsx = require(\\"./src/calc-tsx\\");
9292
9393
var defaultFunc = function defaultFunc(prefix) {
94-
// tslint:disable-next-line: no-console
95-
console.log(\\"\\".concat(prefix, \\": \\").concat((0, _dateFns.format)(new Date(), 'yyyy-MM-dd hh:mm:ss'))); // eslint-disable-line
96-
// tslint:disable-next-line: no-console
97-
98-
console.log((0, _calcTsx.calc)()); // eslint-disable-line
94+
console.log(\\"\\".concat(prefix, \\": \\").concat((0, _dateFns.format)(new Date(), 'yyyy-MM-dd hh:mm:ss')));
95+
console.log((0, _calcTsx.calc)());
9996
};
10097
10198
defaultFunc('timeStamp:');
102-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LXRzeC50c3giXSwibmFtZXMiOlsiZGVmYXVsdEZ1bmMiLCJwcmVmaXgiLCJjb25zb2xlIiwibG9nIiwiRGF0ZSJdLCJtYXBwaW5ncyI6Ijs7QUFBQTs7QUFDQTs7QUFFQSxJQUFNQSxXQUFXLEdBQUcsU0FBZEEsV0FBYyxDQUFDQyxNQUFELEVBQW9CO0FBQ3RDO0FBQ0FDLEVBQUFBLE9BQU8sQ0FBQ0MsR0FBUixXQUFlRixNQUFmLGVBQTBCLHFCQUFPLElBQUlHLElBQUosRUFBUCxFQUFtQixxQkFBbkIsQ0FBMUIsR0FGc0MsQ0FFa0M7QUFDeEU7O0FBQ0FGLEVBQUFBLE9BQU8sQ0FBQ0MsR0FBUixDQUFZLG9CQUFaLEVBSnNDLENBSWpCO0FBQ3RCLENBTEQ7O0FBT0FILFdBQVcsQ0FBQyxZQUFELENBQVgiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmb3JtYXQgfSBmcm9tICdkYXRlLWZucyc7XG5pbXBvcnQgeyBjYWxjIH0gZnJvbSAnLi9zcmMvY2FsYy10c3gnO1xuXG5jb25zdCBkZWZhdWx0RnVuYyA9IChwcmVmaXg6IHN0cmluZykgPT4ge1xuICAvLyB0c2xpbnQ6ZGlzYWJsZS1uZXh0LWxpbmU6IG5vLWNvbnNvbGVcbiAgY29uc29sZS5sb2coYCR7cHJlZml4fTogJHtmb3JtYXQobmV3IERhdGUoKSwgJ3l5eXktTU0tZGQgaGg6bW06c3MnKX1gKTsgLy8gZXNsaW50LWRpc2FibGUtbGluZVxuICAvLyB0c2xpbnQ6ZGlzYWJsZS1uZXh0LWxpbmU6IG5vLWNvbnNvbGVcbiAgY29uc29sZS5sb2coY2FsYygpKTsgLy8gZXNsaW50LWRpc2FibGUtbGluZVxufTtcblxuZGVmYXVsdEZ1bmMoJ3RpbWVTdGFtcDonKTtcbiJdfQ=="
99+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LXRzeC50c3giXSwibmFtZXMiOlsiZGVmYXVsdEZ1bmMiLCJwcmVmaXgiLCJjb25zb2xlIiwibG9nIiwiRGF0ZSJdLCJtYXBwaW5ncyI6Ijs7QUFBQTs7QUFDQTs7QUFFQSxJQUFNQSxXQUFXLEdBQUcsU0FBZEEsV0FBYyxDQUFDQyxNQUFELEVBQW9CO0FBQ3RDQyxFQUFBQSxPQUFPLENBQUNDLEdBQVIsV0FBZUYsTUFBZixlQUEwQixxQkFBTyxJQUFJRyxJQUFKLEVBQVAsRUFBbUIscUJBQW5CLENBQTFCO0FBQ0FGLEVBQUFBLE9BQU8sQ0FBQ0MsR0FBUixDQUFZLG9CQUFaO0FBQ0QsQ0FIRDs7QUFLQUgsV0FBVyxDQUFDLFlBQUQsQ0FBWCIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZvcm1hdCB9IGZyb20gJ2RhdGUtZm5zJztcbmltcG9ydCB7IGNhbGMgfSBmcm9tICcuL3NyYy9jYWxjLXRzeCc7XG5cbmNvbnN0IGRlZmF1bHRGdW5jID0gKHByZWZpeDogc3RyaW5nKSA9PiB7XG4gIGNvbnNvbGUubG9nKGAke3ByZWZpeH06ICR7Zm9ybWF0KG5ldyBEYXRlKCksICd5eXl5LU1NLWRkIGhoOm1tOnNzJyl9YCk7XG4gIGNvbnNvbGUubG9nKGNhbGMoKSk7XG59O1xuXG5kZWZhdWx0RnVuYygndGltZVN0YW1wOicpO1xuIl19"
103100
`;
104101

105102
exports[`nino compile compile correctly 13`] = `
@@ -224,15 +221,12 @@ exports[`nino compile compile correctly 29`] = `
224221
import { calc } from './src/calc-tsx';
225222
226223
var defaultFunc = function defaultFunc(prefix) {
227-
// tslint:disable-next-line: no-console
228-
console.log(\\"\\".concat(prefix, \\": \\").concat(format(new Date(), 'yyyy-MM-dd hh:mm:ss'))); // eslint-disable-line
229-
// tslint:disable-next-line: no-console
230-
231-
console.log(calc()); // eslint-disable-line
224+
console.log(\\"\\".concat(prefix, \\": \\").concat(format(new Date(), 'yyyy-MM-dd hh:mm:ss')));
225+
console.log(calc());
232226
};
233227
234228
defaultFunc('timeStamp:');
235-
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LXRzeC50c3giXSwibmFtZXMiOlsiZm9ybWF0IiwiY2FsYyIsImRlZmF1bHRGdW5jIiwicHJlZml4IiwiY29uc29sZSIsImxvZyIsIkRhdGUiXSwibWFwcGluZ3MiOiJBQUFBLFNBQVNBLE1BQVQsUUFBdUIsVUFBdkI7QUFDQSxTQUFTQyxJQUFULFFBQXFCLGdCQUFyQjs7QUFFQSxJQUFNQyxXQUFXLEdBQUcsU0FBZEEsV0FBYyxDQUFDQyxNQUFELEVBQW9CO0FBQ3RDO0FBQ0FDLEVBQUFBLE9BQU8sQ0FBQ0MsR0FBUixXQUFlRixNQUFmLGVBQTBCSCxNQUFNLENBQUMsSUFBSU0sSUFBSixFQUFELEVBQWEscUJBQWIsQ0FBaEMsR0FGc0MsQ0FFa0M7QUFDeEU7O0FBQ0FGLEVBQUFBLE9BQU8sQ0FBQ0MsR0FBUixDQUFZSixJQUFJLEVBQWhCLEVBSnNDLENBSWpCO0FBQ3RCLENBTEQ7O0FBT0FDLFdBQVcsQ0FBQyxZQUFELENBQVgiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmb3JtYXQgfSBmcm9tICdkYXRlLWZucyc7XG5pbXBvcnQgeyBjYWxjIH0gZnJvbSAnLi9zcmMvY2FsYy10c3gnO1xuXG5jb25zdCBkZWZhdWx0RnVuYyA9IChwcmVmaXg6IHN0cmluZykgPT4ge1xuICAvLyB0c2xpbnQ6ZGlzYWJsZS1uZXh0LWxpbmU6IG5vLWNvbnNvbGVcbiAgY29uc29sZS5sb2coYCR7cHJlZml4fTogJHtmb3JtYXQobmV3IERhdGUoKSwgJ3l5eXktTU0tZGQgaGg6bW06c3MnKX1gKTsgLy8gZXNsaW50LWRpc2FibGUtbGluZVxuICAvLyB0c2xpbnQ6ZGlzYWJsZS1uZXh0LWxpbmU6IG5vLWNvbnNvbGVcbiAgY29uc29sZS5sb2coY2FsYygpKTsgLy8gZXNsaW50LWRpc2FibGUtbGluZVxufTtcblxuZGVmYXVsdEZ1bmMoJ3RpbWVTdGFtcDonKTtcbiJdfQ=="
229+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LXRzeC50c3giXSwibmFtZXMiOlsiZm9ybWF0IiwiY2FsYyIsImRlZmF1bHRGdW5jIiwicHJlZml4IiwiY29uc29sZSIsImxvZyIsIkRhdGUiXSwibWFwcGluZ3MiOiJBQUFBLFNBQVNBLE1BQVQsUUFBdUIsVUFBdkI7QUFDQSxTQUFTQyxJQUFULFFBQXFCLGdCQUFyQjs7QUFFQSxJQUFNQyxXQUFXLEdBQUcsU0FBZEEsV0FBYyxDQUFDQyxNQUFELEVBQW9CO0FBQ3RDQyxFQUFBQSxPQUFPLENBQUNDLEdBQVIsV0FBZUYsTUFBZixlQUEwQkgsTUFBTSxDQUFDLElBQUlNLElBQUosRUFBRCxFQUFhLHFCQUFiLENBQWhDO0FBQ0FGLEVBQUFBLE9BQU8sQ0FBQ0MsR0FBUixDQUFZSixJQUFJLEVBQWhCO0FBQ0QsQ0FIRDs7QUFLQUMsV0FBVyxDQUFDLFlBQUQsQ0FBWCIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZvcm1hdCB9IGZyb20gJ2RhdGUtZm5zJztcbmltcG9ydCB7IGNhbGMgfSBmcm9tICcuL3NyYy9jYWxjLXRzeCc7XG5cbmNvbnN0IGRlZmF1bHRGdW5jID0gKHByZWZpeDogc3RyaW5nKSA9PiB7XG4gIGNvbnNvbGUubG9nKGAke3ByZWZpeH06ICR7Zm9ybWF0KG5ldyBEYXRlKCksICd5eXl5LU1NLWRkIGhoOm1tOnNzJyl9YCk7XG4gIGNvbnNvbGUubG9nKGNhbGMoKSk7XG59O1xuXG5kZWZhdWx0RnVuYygndGltZVN0YW1wOicpO1xuIl19"
236230
`;
237231

238232
exports[`nino compile compile correctly 30`] = `

src/compile/__tests__/compile.test.ts

+1-9
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,12 @@ const outputFilePaths = [
2626
const getContent = (paths: string[]) => fs.readFileSync(joinWithRootPath(paths)).toString();
2727

2828
describe('nino compile', () => {
29-
beforeAll(() => {
30-
jest.resetModules();
31-
jest.setTimeout(30000);
32-
});
33-
34-
afterAll(() => {
35-
jest.setTimeout(5000);
36-
});
37-
3829
it('compile correctly', done => {
3930
compile({ entry: 'cases/compile' }, () => {
4031
for (const dir of outputDirPaths) {
4132
for (const file of outputFilePaths) {
4233
expect(getContent([dir, file])).toMatchSnapshot();
34+
jest.useRealTimers();
4335
}
4436
}
4537
done();

src/compile/index.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,12 @@ export const compile = async (program: any, callback?: () => void) => {
4848
const { entry = 'src', libOutput = 'lib', esOutput = 'es' } = program;
4949

5050
trace(`少女边清理着名为 ${libOutput}/${esOutput} 的钱箱,边回顾着即将结束的多年单身生活`);
51-
setTimeout(() => {
52-
trace('...顺带又感慨了下自己一平如洗的身板');
53-
}, 2000);
51+
await new Promise(resolve => {
52+
setTimeout(() => {
53+
trace('...顺带又感慨了下自己一平如洗的身板');
54+
resolve(null);
55+
}, 2000);
56+
});
5457

5558
const entryFiles: any = await walkSync(joinWithRootPath(entry));
5659
await copyRestFilesToTsc(entry, libOutput);

src/go/__tests__/go.test.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ describe('nino go', () => {
1010
port: 9099,
1111
};
1212

13-
it('custom config file', () => {
13+
it('custom config file', done => {
14+
jest.useFakeTimers('legacy');
1415
const config = getDefaultConfig({
1516
...defaultOptions,
1617
config: 'cases/nino.go.js',
@@ -22,5 +23,6 @@ describe('nino go', () => {
2223
noInfo: true,
2324
port: 9098,
2425
});
26+
done();
2527
});
2628
});

src/jest/setup.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'core-js/stable';
22
import 'regenerator-runtime/runtime';
33
import * as Enzyme from 'enzyme';
4-
import Adapter = require('enzyme-adapter-react-16');
4+
import * as Adapter from '@wojtekmaj/enzyme-adapter-react-17';
55

66
const g = global as any;
77
g.requestAnimationFrame =
@@ -10,4 +10,4 @@ g.requestAnimationFrame =
1010
setTimeout(callback, 0);
1111
};
1212

13-
Enzyme.configure({ adapter: new Adapter() });
13+
Enzyme.configure({ adapter: new (Adapter as any)() });

tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"sourceMap": true,
1313
"declaration": true,
1414
"outDir": "dist",
15-
"resolveJsonModule": true
15+
"resolveJsonModule": true,
16+
"allowSyntheticDefaultImports": true
1617
},
1718
"exclude": ["dist", "es", "lib", "cases"],
1819
"typings": "./typings.d.ts"

0 commit comments

Comments
 (0)