Skip to content

feat: support platforms that ship with project #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 18, 2019
Merged

feat: support platforms that ship with project #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dbc371
Project can also have platforms
grabbou Apr 18, 2019
4ee2643
strip unknown
grabbou Apr 18, 2019
039c343
Remove stripUnknown and prefer allowUnknown on one level only
grabbou Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/src/tools/config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function loadConfig(projectRoot: string = process.cwd()): ConfigT {
get assets() {
return findAssets(projectRoot, userConfig.assets);
},
platforms: {},
platforms: userConfig.platforms,
haste: {
providesModuleNodeModules: [],
platforms: [],
Expand Down
12 changes: 11 additions & 1 deletion packages/cli/src/tools/config/schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,13 @@ export const dependencyConfig = t
projectConfig: t.func(),
linkConfig: t.func(),
}),
).default(),
).default({}),
commands: t
.array()
.items(command)
.default([]),
})
.unknown(true)
.default();

/**
Expand Down Expand Up @@ -170,5 +171,14 @@ export const projectConfig = t
.array()
.items(command)
.default([]),
platforms: map(
t.string(),
t.object({
dependencyConfig: t.func(),
projectConfig: t.func(),
linkConfig: t.func(),
}),
).default({}),
})
.unknown(true)
.default();
4 changes: 2 additions & 2 deletions types/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ export type UserDependencyConfigT = {
*/
export type UserConfigT = {
/**
* Shares some structure with ConfigT, except that haste, root, platforms
* Shares some structure with ConfigT, except that haste and root
* are calculated and can't be defined
*/
...$Diff<ConfigT, {haste: any, root: any, platforms: any}>,
...$Diff<ConfigT, {haste: any, root: any}>,
reactNativePath: ?string,

// Additional project settings
Expand Down