Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions plugins/index.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
// @ts-check
const { withMod } = require("@expo/config-plugins");

/**
* @typedef {import("@expo/config-plugins").ExportedConfig} ExportedConfig
* @typedef {import("@expo/config-plugins").Mod} Mod
*/
/** @import { ExportedConfig, Mod } from "@expo/config-plugins"; */

/**
* Provides the `ReactNativeHost` file for modification.
Expand Down
10 changes: 6 additions & 4 deletions plugins/macos.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
const { withMod } = require("@expo/config-plugins");

/**
* @typedef {import("@expo/config-plugins").ExportedConfig} ExportedConfig
* @typedef {import("@expo/config-plugins").ExportedConfigWithProps} ExportedConfigWithProps
* @typedef {import("@expo/config-plugins").Mod} Mod
* @typedef {import("@expo/config-plugins").ModConfig} ModConfig
* @import {
* ExportedConfig,
* ExportedConfigWithProps,
* Mod,
* ModConfig,
* } from "@expo/config-plugins";
* @typedef {ExportedConfigWithProps & { macos?: { infoPlist?: Record<string, unknown> }}} ExportedConfigWithPropsMac
*/

Expand Down
7 changes: 2 additions & 5 deletions scripts/config-plugins/plugins/withInternal.mjs
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
// @ts-check
/**
* @typedef {import("../types.js").ProjectInfo} ProjectInfo
* @import { ConfigPlugin } from "@expo/config-plugins";
* @import { ProjectInfo } from "../types.js";
* @typedef {Omit<ProjectInfo, "appJsonPath">} Internals
*/
/**
* @template Props
* @typedef {import("@expo/config-plugins").ConfigPlugin<Internals>} ConfigPlugin
*/

/** @type {ConfigPlugin<Internals>} */
export const withInternal = (config, internals) => {
Expand Down
5 changes: 1 addition & 4 deletions scripts/configure-projects.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ const {
v,
} = require("./helpers");

/**
* @typedef {import("./types.js").ProjectConfig} ProjectConfig
* @typedef {import("./types.js").ProjectParams} ProjectParams
*/
/** @import { ProjectConfig, ProjectParams } from "./types.js"; */

/**
* Returns the version number of a React Native dependency.
Expand Down
4 changes: 2 additions & 2 deletions scripts/internal/generate-manifest.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { URL, fileURLToPath } from "node:url";
import { generateSchema } from "../schema.mjs";

/**
* @typedef {import("ajv").SchemaObject} SchemaObject
* @typedef {import("../types.js").Language} Language
* @import { SchemaObject } from "ajv";
* @import { Language } from "../types.js";
*/
const thisScript = fileURLToPath(import.meta.url);

Expand Down
2 changes: 1 addition & 1 deletion scripts/internal/generate-schema.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { URL, fileURLToPath } from "node:url";
import { isMain } from "../helpers.js";
import { generateSchema } from "../schema.mjs";

/** @typedef {import("../types.js").Docs} Docs */
/** @import { Docs } from "../types.js"; */

/** @type {(str: string) => string} */
const stripCarriageReturn =
Expand Down
2 changes: 1 addition & 1 deletion scripts/internal/set-react-version.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
} from "../helpers.js";
import { fetchPackageMetadata, npmRegistryBaseURL } from "../utils/npm.mjs";

/** @typedef {import("../types.js").Manifest} Manifest */
/** @import { Manifest } from "../types.js"; */
/**
* @template T
* @typedef {{ [P in keyof T]: Required<NonNullable<T[P]>> }} RequiredObject<T>
Expand Down
4 changes: 1 addition & 3 deletions scripts/testing/test-apple.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import { URL, fileURLToPath } from "node:url";
import { memo, readTextFile } from "../helpers.js";
import { $ } from "./test-e2e.mjs";

/**
* @typedef {import("../types.js").BuildConfig} BuildConfig
*/
/** @import { BuildConfig } from "../types.js"; */

export const getIOSSimulatorName = memo(() => {
const wdioConfig = new URL(
Expand Down
4 changes: 1 addition & 3 deletions scripts/testing/test-matrix.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ import { getIOSSimulatorName, installPods } from "./test-apple.mjs";
import { $, $$, test } from "./test-e2e.mjs";

/**
* @typedef {import("../types.js").BuildConfig} BuildConfig
* @typedef {import("../types.js").PlatformConfig} PlatformConfig
* @typedef {import("../types.js").TargetPlatform} TargetPlatform
* @import { BuildConfig, PlatformConfig, TargetPlatform } from "../types.js";
*/

const DEFAULT_PLATFORMS = ["android", "ios"];
Expand Down
8 changes: 1 addition & 7 deletions scripts/utils/parseargs.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@ import * as path from "node:path";
import { URL, fileURLToPath } from "node:url";
import * as util from "node:util";

/**
* @typedef {import("../types.js").Options} Options;
*/
/**
* @template {Options} O
* @typedef {import("../types.js").Args<O>} Args;
*/
/** @import { Args, Options } from "../types.js"; */

/**
* @template {Options} O
Expand Down
14 changes: 8 additions & 6 deletions windows/project.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ import {
import * as colors from "../scripts/utils/colors.mjs";

/**
* @typedef {import("../scripts/types.js").AppManifest} AppManifest
* @typedef {import("../scripts/types.js").AppxBundle} AppxBundle
* @typedef {import("../scripts/types.js").AssetItems} AssetItems;
* @typedef {import("../scripts/types.js").Assets} Assets;
* @typedef {import("../scripts/types.js").MSBuildProjectOptions} MSBuildProjectOptions;
* @typedef {import("../scripts/types.js").ProjectInfo} ProjectInfo;
* @import {
* AppManifest,
* AppxBundle,
* AssetItems,
* Assets,
* MSBuildProjectOptions,
* ProjectInfo,
* } from "../scripts/types.js";
*/

const uniqueFilterIdentifier = "e48dc53e-40b1-40cb-970a-f89935452892";
Expand Down
4 changes: 1 addition & 3 deletions windows/test-app.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ import { loadReactNativeConfig, projectInfo } from "./project.mjs";
import { configureForUWP } from "./uwp.mjs";
import { configureForWin32 } from "./win32.mjs";

/**
* @typedef {import("../scripts/types.js").MSBuildProjectOptions} MSBuildProjectOptions;
*/
/** @import { MSBuildProjectOptions } from "../scripts/types.js"; */

const templateView = {
packageGuidUpper: "{B44CEAD7-FBFF-4A17-95EB-FF5434BBD79D}", // .wapproj
Expand Down
148 changes: 72 additions & 76 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3891,119 +3891,115 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/eslint-plugin@npm:8.8.1":
version: 8.8.1
resolution: "@typescript-eslint/eslint-plugin@npm:8.8.1"
"@typescript-eslint/eslint-plugin@npm:8.19.0":
version: 8.19.0
resolution: "@typescript-eslint/eslint-plugin@npm:8.19.0"
dependencies:
"@eslint-community/regexpp": "npm:^4.10.0"
"@typescript-eslint/scope-manager": "npm:8.8.1"
"@typescript-eslint/type-utils": "npm:8.8.1"
"@typescript-eslint/utils": "npm:8.8.1"
"@typescript-eslint/visitor-keys": "npm:8.8.1"
"@typescript-eslint/scope-manager": "npm:8.19.0"
"@typescript-eslint/type-utils": "npm:8.19.0"
"@typescript-eslint/utils": "npm:8.19.0"
"@typescript-eslint/visitor-keys": "npm:8.19.0"
graphemer: "npm:^1.4.0"
ignore: "npm:^5.3.1"
natural-compare: "npm:^1.4.0"
ts-api-utils: "npm:^1.3.0"
peerDependencies:
"@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
eslint: ^8.57.0 || ^9.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/020a0a482202b34c6665a56ec5902e38ae1870b2600ec1b2092de352b23099dde553781ee8323974f63962ebe164a6304f0019e937afb5cf7854b0e0163ad1ca
typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/ceaa5063b68684b5608950b5e69f0caf1eadfc356cba82625240d6aae55f769faff599c38d35252dcb77a40d92e6fbf6d6264bc0c577d5c549da25061c3bd796
languageName: node
linkType: hard

"@typescript-eslint/parser@npm:8.8.1":
version: 8.8.1
resolution: "@typescript-eslint/parser@npm:8.8.1"
"@typescript-eslint/parser@npm:8.19.0":
version: 8.19.0
resolution: "@typescript-eslint/parser@npm:8.19.0"
dependencies:
"@typescript-eslint/scope-manager": "npm:8.8.1"
"@typescript-eslint/types": "npm:8.8.1"
"@typescript-eslint/typescript-estree": "npm:8.8.1"
"@typescript-eslint/visitor-keys": "npm:8.8.1"
"@typescript-eslint/scope-manager": "npm:8.19.0"
"@typescript-eslint/types": "npm:8.19.0"
"@typescript-eslint/typescript-estree": "npm:8.19.0"
"@typescript-eslint/visitor-keys": "npm:8.19.0"
debug: "npm:^4.3.4"
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/2afd147ccec6754316d6837d6108a5d822eb6071e1a7355073288c232530bc3e49901d3f08755ce02d497110c531f3b3658eb46d0ff875a69d4f360b5f938cb4
typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/064b0997963060490fc3f92c90cebc7c694f47a7657f7882ce9eb314786e0cf3e917bfccfad614d23038439d84e69a978bdc7054515b23201001dd427e524e64
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:8.8.1":
version: 8.8.1
resolution: "@typescript-eslint/scope-manager@npm:8.8.1"
"@typescript-eslint/scope-manager@npm:8.19.0":
version: 8.19.0
resolution: "@typescript-eslint/scope-manager@npm:8.19.0"
dependencies:
"@typescript-eslint/types": "npm:8.8.1"
"@typescript-eslint/visitor-keys": "npm:8.8.1"
checksum: 10c0/6f697baf087aedc3f0f228ff964fd108a9dd33fe4e5cc6c914be6367c324cee55629e099832668042bedfec8cdc72c6ef2ca960ee26966dbcc75753059a1352f
"@typescript-eslint/types": "npm:8.19.0"
"@typescript-eslint/visitor-keys": "npm:8.19.0"
checksum: 10c0/5052863d00db7ae939de27e91dc6c92df3c37a877e1ff44015ae9aa754d419b44d97d98b25fbb30a80dc58cf92606dad599e27f32b86d20c13b77ac12b4f2abc
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:8.8.1":
version: 8.8.1
resolution: "@typescript-eslint/type-utils@npm:8.8.1"
"@typescript-eslint/type-utils@npm:8.19.0":
version: 8.19.0
resolution: "@typescript-eslint/type-utils@npm:8.19.0"
dependencies:
"@typescript-eslint/typescript-estree": "npm:8.8.1"
"@typescript-eslint/utils": "npm:8.8.1"
"@typescript-eslint/typescript-estree": "npm:8.19.0"
"@typescript-eslint/utils": "npm:8.19.0"
debug: "npm:^4.3.4"
ts-api-utils: "npm:^1.3.0"
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/6edfc2b9fca5233dd922141f080377b677db1093ec3e702a3ab52d58f77b91c0fb69479d4d42f125536b8fc0ffa85c07c7de2f17cc4c6fa1df1226ec01e5608c
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/5a460b4d26fd68ded3567390cbac310500e94e9c69583fda3fb9930877663719e6831699bb6d85de6b940bcb7951a51ab1ef67c5fea8b76a13ea3a3783bbae28
languageName: node
linkType: hard

"@typescript-eslint/types@npm:8.8.1":
version: 8.8.1
resolution: "@typescript-eslint/types@npm:8.8.1"
checksum: 10c0/4b44857332a0b1bfafbeccb8be157f8266d9e226ac723f6af1272b9b670b49444423ddac733655163eb3b90e8c88393a68ab2d7f326f5775371eaf4b9ca31d7b
"@typescript-eslint/types@npm:8.19.0":
version: 8.19.0
resolution: "@typescript-eslint/types@npm:8.19.0"
checksum: 10c0/0062e7dce5f374e293c97f1f50fe450187f6b0eaf4971c818e18ef2f6baf4e9aa4e8605fba8d8fc464a504ee1130527b71ecb39d31687c31825942b9f569d902
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:8.8.1":
version: 8.8.1
resolution: "@typescript-eslint/typescript-estree@npm:8.8.1"
"@typescript-eslint/typescript-estree@npm:8.19.0":
version: 8.19.0
resolution: "@typescript-eslint/typescript-estree@npm:8.19.0"
dependencies:
"@typescript-eslint/types": "npm:8.8.1"
"@typescript-eslint/visitor-keys": "npm:8.8.1"
"@typescript-eslint/types": "npm:8.19.0"
"@typescript-eslint/visitor-keys": "npm:8.19.0"
debug: "npm:^4.3.4"
fast-glob: "npm:^3.3.2"
is-glob: "npm:^4.0.3"
minimatch: "npm:^9.0.4"
semver: "npm:^7.6.0"
ts-api-utils: "npm:^1.3.0"
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/e3b9bc1e925c07833237044271cdc9bd8bdba3e2143dcfc5bf3bf481c89731b666a6fad25333a4b1980ac2f4c6f5e6e42c71206f73f3704e319f6b3b67463a6a
peerDependencies:
typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/ff47004588e8ff585af740b3e0bda07dc52310dbfeb2317eb4a723935740cf0c1953fc9ba57f14cf192bcfe373c46be833ba29d3303df8b501181bb852c7b822
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:8.8.1":
version: 8.8.1
resolution: "@typescript-eslint/utils@npm:8.8.1"
"@typescript-eslint/utils@npm:8.19.0":
version: 8.19.0
resolution: "@typescript-eslint/utils@npm:8.19.0"
dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0"
"@typescript-eslint/scope-manager": "npm:8.8.1"
"@typescript-eslint/types": "npm:8.8.1"
"@typescript-eslint/typescript-estree": "npm:8.8.1"
"@typescript-eslint/scope-manager": "npm:8.19.0"
"@typescript-eslint/types": "npm:8.19.0"
"@typescript-eslint/typescript-estree": "npm:8.19.0"
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
checksum: 10c0/954a2e85ae56a3ebefb6e41fb33c59ffa886963860536e9729a35ecea55eefdc58858c7aa126048c4a61f4fd9997b4f7601e7884ed2b3e4e7a46c9e4617a9f29
typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/7731f7fb66d54491769ca68fd04728138ceb6b785778ad491f8e9b2147802fa0ff480e520f6ea5fb73c8484d13a2ed3e35d44635f5bf4cfbdb04c313154097a9
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:8.8.1":
version: 8.8.1
resolution: "@typescript-eslint/visitor-keys@npm:8.8.1"
"@typescript-eslint/visitor-keys@npm:8.19.0":
version: 8.19.0
resolution: "@typescript-eslint/visitor-keys@npm:8.19.0"
dependencies:
"@typescript-eslint/types": "npm:8.8.1"
eslint-visitor-keys: "npm:^3.4.3"
checksum: 10c0/6f917090b61277bd443aa851c532c4a9cc91ad57aedf185c5dff0c530f158cce84ef815833bd8deffa87f0bbf7a9f1abd1e02e30af2463c4e7f27c0c08f59080
"@typescript-eslint/types": "npm:8.19.0"
eslint-visitor-keys: "npm:^4.2.0"
checksum: 10c0/a293def05018bb2259506e23cd8f14349f4386d0e51231893fbddf96ef73c219d5f9fe17b82e3c104f5c23956dbd9b87af3cff5e84b887af243139a3b4bbbe0d
languageName: node
linkType: hard

Expand Down Expand Up @@ -7036,7 +7032,7 @@ __metadata:
languageName: node
linkType: hard

"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.3":
"eslint-visitor-keys@npm:^3.3.0":
version: 3.4.3
resolution: "eslint-visitor-keys@npm:3.4.3"
checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820
Expand Down Expand Up @@ -14070,26 +14066,26 @@ __metadata:
linkType: hard

"typescript-eslint@npm:^8.0.0":
version: 8.8.1
resolution: "typescript-eslint@npm:8.8.1"
version: 8.19.0
resolution: "typescript-eslint@npm:8.19.0"
dependencies:
"@typescript-eslint/eslint-plugin": "npm:8.8.1"
"@typescript-eslint/parser": "npm:8.8.1"
"@typescript-eslint/utils": "npm:8.8.1"
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/d6793697fce239ef8838ced6e1e59940c30579c8f62c49bc605fdeda9f3f7a5c24bfddd997b142f8c411859dc0b9985ecdae569814dd4f8e6775e1899d55e9cc
"@typescript-eslint/eslint-plugin": "npm:8.19.0"
"@typescript-eslint/parser": "npm:8.19.0"
"@typescript-eslint/utils": "npm:8.19.0"
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/87da630f50025b3ae943eac521809fef41ba4013b5c4206865c115b728684caa7b4c36ee561dd95af7eb4dc18ec1265b165b49d2db54e3d8fba0152bcb6c82f8
languageName: node
linkType: hard

"typescript@npm:^5.0.0":
version: 5.6.3
resolution: "typescript@npm:5.6.3"
version: 5.7.2
resolution: "typescript@npm:5.7.2"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10c0/44f61d3fb15c35359bc60399cb8127c30bae554cd555b8e2b46d68fa79d680354b83320ad419ff1b81a0bdf324197b29affe6cc28988cd6a74d4ac60c94f9799
checksum: 10c0/a873118b5201b2ef332127ef5c63fb9d9c155e6fdbe211cbd9d8e65877283797cca76546bad742eea36ed7efbe3424a30376818f79c7318512064e8625d61622
languageName: node
linkType: hard

Expand Down
Loading