Skip to content

Commit f54887b

Browse files
committed
update rollup, jest, and babel config files
1 parent 43006b5 commit f54887b

File tree

6 files changed

+12
-25
lines changed

6 files changed

+12
-25
lines changed

.test/custom-test-env.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import Environment from 'jest-environment-jsdom';
22

33
/**
4-
* A custom environment to set the TextEncoder that is
5-
* required by `react-dom/server` (renderToString function).
4+
* A custom environment to set the TextEncoder that is required by react-dom/server
65
*/
76
module.exports = class CustomTestEnvironment extends Environment {
87
async setup() {
98
await super.setup();
109
if (typeof this.global.TextEncoder === 'undefined') {
11-
const { TextEncoder } = require('util');
10+
const { TextEncoder } = await import('util');
1211
this.global.TextEncoder = TextEncoder;
1312
}
1413
}

babel.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = (api) => {
2-
const isNotTestEnv = !api.env('test');
3-
const targets = isNotTestEnv ? '> 0.25%, last 2 versions, not dead' : {node: 'current'};
2+
const isTest = api.env('test');
3+
const targets = isTest ? { node: 'current' } : undefined;
44

55
const presets = [
66
['@babel/preset-env', {targets, loose: true}],
@@ -15,8 +15,8 @@ module.exports = (api) => {
1515
ssr: true,
1616
pure: true,
1717
fileName: false,
18-
minify: isNotTestEnv,
19-
displayName: isNotTestEnv,
18+
minify: !isTest,
19+
displayName: !isTest,
2020
transpileTemplateLiterals: true,
2121
},
2222
],

jest.config.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
const { defaults } = require('jest-config');
2-
31
module.exports = {
2+
transform: {'\\.[jt]sx?$': 'babel-jest'},
43
testEnvironment: '<rootDir>/.test/custom-test-env.ts',
54
setupFilesAfterEnv: ['<rootDir>/.test/setup-tests.ts'],
65
testMatch: ['<rootDir>/__tests__/*?(*.)test.{ts,tsx}'],
7-
moduleFileExtensions: [...defaults.moduleFileExtensions, 'ts', 'tsx'],
86
testPathIgnorePatterns: ['/node_modules/', '/dist/', '/src/'],
9-
transform: {
10-
'\\.(ts|tsx)?$': 'babel-jest',
11-
},
12-
};
7+
};

package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@
4141
"engines": {
4242
"node": ">= 14"
4343
},
44-
"browserslist": [
45-
"> 0.25%",
46-
"last 2 versions",
47-
"not dead"
48-
],
4944
"devDependencies": {
5045
"@babel/cli": "^7.19.3",
5146
"@babel/core": "^7.20.5",

rollup.config.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const globals = {
1515

1616
const input = './src/index.ts';
1717
const name = 'ReactFunctionalSelect';
18-
const external = (id) => id.includes('@babel/runtime') || (!id.startsWith('.') && !path.isAbsolute(id));
18+
const external = (id) => !id.startsWith('\0') && !id.startsWith('.') && !path.isAbsolute(id);
1919

2020
/**
2121
* Replace Plugin config
@@ -37,9 +37,7 @@ const removeTestIdPlugin = replace({
3737
* Babel Plugin config (prevents use of root babel.config.js with babelrc and configFile as false)
3838
*/
3939
const babelPlugin = (useESModules) => {
40-
const targets = useESModules
41-
? { esmodules: true }
42-
: '> 0.25%, last 2 versions, not dead';
40+
const targets = useESModules ? { esmodules: true } : undefined;
4341

4442
return babel({
4543
babelrc: false,

src/Select.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ const Select = forwardRef<SelectRef, SelectProps>((
354354
}, [isMulti, menuOptions]);
355355

356356
const removeSelectedOption = useCallback((value?: string | number): void => {
357-
setSelectedOption((prev) => prev.filter((x) => x.value !== value));
357+
setSelectedOption((so) => so.filter((x) => x.value !== value));
358358
}, []);
359359

360360
const selectOption = useCallback((option: MenuOption): void => {
@@ -364,7 +364,7 @@ const Select = forwardRef<SelectRef, SelectProps>((
364364
isMulti && removeSelectedOption(option.value);
365365
} else {
366366
const { isSelected, isDisabled, ...selectedOpt } = option;
367-
setSelectedOption((prev) => !isMulti ? [selectedOpt] : [...prev, selectedOpt]);
367+
setSelectedOption((so) => !isMulti ? [selectedOpt] : [...so, selectedOpt]);
368368
}
369369

370370
const blurOrDefault = isBoolean(blurInputOnSelect) ? blurInputOnSelect : isTouchDevice();

0 commit comments

Comments
 (0)