Skip to content

Commit b86313f

Browse files
radko93thymikee
authored andcommitted
chore: assign TS migration (#709)
* chore: assign TS migration * Remove empty line * Use correct types * Add FlowFixMe comment
1 parent 66f5a51 commit b86313f

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

packages/cli/src/tools/assign.js renamed to packages/cli/src/tools/assign.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@
44
* Similar to Object.assign(), but it doesn't execute getters. This allows us to have
55
* lazy properties on an object and still be able to merge them together
66
*
7-
* @flow
87
*/
98
export default function assign(target: Object, ...sources: Object[]) {
109
sources.forEach(source => {
11-
let descriptors = Object.keys(source).reduce((acc, key) => {
12-
acc[key] = Object.getOwnPropertyDescriptor(source, key);
13-
return acc;
14-
}, {});
10+
let descriptors = Object.keys(source).reduce(
11+
(acc, key) => {
12+
const propertyDescriptor = Object.getOwnPropertyDescriptor(source, key);
13+
if (propertyDescriptor !== undefined) {
14+
acc[key] = propertyDescriptor;
15+
}
16+
return acc;
17+
},
18+
{} as PropertyDescriptorMap,
19+
);
1520
// by default, Object.assign copies enumerable Symbols too
1621
Object.getOwnPropertySymbols(source).forEach(sym => {
1722
let descriptor = Object.getOwnPropertyDescriptor(source, sym);

packages/cli/src/tools/config/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import type {
1919
UserConfigT,
2020
DependencyConfigT,
2121
} from 'types';
22+
// $FlowFixMe - converted to TS
2223
import assign from '../assign';
2324
// $FlowFixMe - converted to TS
2425
import merge from '../merge';
@@ -46,7 +47,7 @@ function getDependencyConfig(
4647
: platformConfig.dependencyConfig(
4748
root,
4849
/* $FlowFixMe - can't figure out which platform's dependency
49-
config to choose */
50+
config to choose */
5051
config.dependency.platforms[platform],
5152
);
5253
return dependency;

packages/cli/src/tools/isValidPackageName.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)