miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

feat(react-native): upgrade react-native to 0.71.1 (#14584)

Browse Source
This commit is contained in:
Emily Xiong 2023-01-25 13:28:32 -05:00 committed by GitHub
parent e0198f3dfc
commit 41fc2ebbed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
62 changed files with 492 additions and 1160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/generated/packages/react-native/executors/run-ios.json
View File

@ -38,8 +38,14 @@
"simulator": { "simulator": {
"type": "string", "type": "string",
"description": "Explicitly set simulator to use. Optionally include iOS version between parenthesis at the end to match an exact version: `iPhone X (12.1)`.", "description": "Explicitly set simulator to use. Optionally include iOS version between parenthesis at the end to match an exact version: `iPhone X (12.1)`.",
"default": "iPhone 13", "default": "iPhone 14",
"examples": ["iPhone 13", "iPhone X"], "examples": [
"iPhone 14",
"iPhone 13",
"iPhone 12",
"iPhone 11",
"iPhone X"
],
"x-priority": "important" "x-priority": "important"
}, },
"device": { "device": {
@ -84,7 +90,7 @@
"default": true "default": true
} }
}, },
"examplesFile": "`project.json`:\n\n```json\n{\n \"name\": \"mobile\",\n //...\n \"targets\": {\n //...\n \"run-ios\": {\n \"executor\": \"@nrwl/react-native:run-ios\",\n \"options\": {}\n }\n }\n}\n```\n\n```bash\nnx run mobile:run-ios\n```\n\n## Examples\n\n{% tabs %}\n{% tab label=\"Run on a simulator\" %}\nTo see all the avaiable simulators, run command:\n\n```bash\nxcrun simctl list\n```\n\nThe `simulator` option allows you to launch your iOS app in a specific simulator:\n\n```json\n \"run-ios\": {\n \"executor\": \"@nrwl/react-native:run-ios\",\n \"options\": {\n \"simulator\": \"iPhone 13 Pro\"\n }\n }\n```\n\n{% /tab %}\n{% tab label=\"Run on a device\" %}\nThe `device` option allows you to launch your iOS app in a specific device.\n\n```json\n \"run-ios\": {\n \"executor\": \"@nrwl/react-native:run-ios\",\n \"options\": {\n \"device\": \"deviceName\"\n }\n }\n```\n\n{% /tab %}\n{% tab label=\"Run the Debug/Release app\" %}\nThe `xcodeConfiguration` option allows to specify the xcode configuartion, such as `Debug` or `Release`.\n\n```json\n \"run-ios\": {\n \"executor\": \"@nrwl/react-native:run-ios\",\n \"options\": {\n \"xcodeConfiguration\": \"Release\"\n }\n }\n```\n\n{% /tab %}\n{% /tabs %}\n\n---\n" "examplesFile": "`project.json`:\n\n```json\n{\n \"name\": \"mobile\",\n //...\n \"targets\": {\n //...\n \"run-ios\": {\n \"executor\": \"@nrwl/react-native:run-ios\",\n \"options\": {}\n }\n }\n}\n```\n\n```bash\nnx run mobile:run-ios\n```\n\n## Examples\n\n{% tabs %}\n{% tab label=\"Run on a simulator\" %}\nTo see all the avaiable simulators, run command:\n\n```bash\nxcrun simctl list\n```\n\nThe `simulator` option allows you to launch your iOS app in a specific simulator:\n\n```json\n \"run-ios\": {\n \"executor\": \"@nrwl/react-native:run-ios\",\n \"options\": {\n \"simulator\": \"iPhone 14 Pro\"\n }\n }\n```\n\n{% /tab %}\n{% tab label=\"Run on a device\" %}\nThe `device` option allows you to launch your iOS app in a specific device.\n\n```json\n \"run-ios\": {\n \"executor\": \"@nrwl/react-native:run-ios\",\n \"options\": {\n \"device\": \"deviceName\"\n }\n }\n```\n\n{% /tab %}\n{% tab label=\"Run the Debug/Release app\" %}\nThe `xcodeConfiguration` option allows to specify the xcode configuartion, such as `Debug` or `Release`.\n\n```json\n \"run-ios\": {\n \"executor\": \"@nrwl/react-native:run-ios\",\n \"options\": {\n \"xcodeConfiguration\": \"Release\"\n }\n }\n```\n\n{% /tab %}\n{% /tabs %}\n\n---\n"
}, },
"description": "Runs iOS application.", "description": "Runs iOS application.",
"aliases": [], "aliases": [],

14
e2e/react-native/src/react-native.test.ts
View File

@ -23,11 +23,11 @@ describe('react native', () => {
const componentName = uniq('component'); const componentName = uniq('component');
runCLI( runCLI(
`generate @nrwl/react-native:application ${appName} --install=false` `generate @nrwl/react-native:application ${appName} --install=false --no-interactive`
); );
runCLI(`generate @nrwl/react-native:library ${libName}`); runCLI(`generate @nrwl/react-native:library ${libName} --no-interactive`);
runCLI( runCLI(
`generate @nrwl/react-native:component ${componentName} --project=${libName} --export` `generate @nrwl/react-native:component ${componentName} --project=${libName} --export --no-interactive`
); );
updateFile(`apps/${appName}/src/app/App.tsx`, (content) => { updateFile(`apps/${appName}/src/app/App.tsx`, (content) => {
@ -70,7 +70,7 @@ describe('react native', () => {
it('should create storybook with application', async () => { it('should create storybook with application', async () => {
const appName = uniq('my-app'); const appName = uniq('my-app');
runCLI( runCLI(
`generate @nrwl/react-native:application ${appName} --install=false` `generate @nrwl/react-native:application ${appName} --install=false --no-interactive`
); );
runCLI( runCLI(
`generate @nrwl/react-native:storybook-configuration ${appName} --generateStories --no-interactive` `generate @nrwl/react-native:storybook-configuration ${appName} --generateStories --no-interactive`
@ -99,7 +99,7 @@ describe('react native', () => {
it('should upgrade native for application', async () => { it('should upgrade native for application', async () => {
const appName = uniq('my-app'); const appName = uniq('my-app');
runCLI( runCLI(
`generate @nrwl/react-native:application ${appName} --install=false` `generate @nrwl/react-native:application ${appName} --install=false --no-interactive`
); );
expect(() => expect(() =>
@ -114,7 +114,7 @@ describe('react native', () => {
const componentName = uniq('component'); const componentName = uniq('component');
runCLI( runCLI(
`generate @nrwl/react-native:library ${libName} --buildable --publishable --importPath=${proj}/${libName}` `generate @nrwl/react-native:library ${libName} --buildable --publishable --importPath=${proj}/${libName} --no-interactive`
); );
runCLI( runCLI(
`generate @nrwl/react-native:component ${componentName} --project=${libName} --export` `generate @nrwl/react-native:component ${componentName} --project=${libName} --export`
@ -129,7 +129,7 @@ describe('react native', () => {
it('sync npm dependencies for autolink', async () => { it('sync npm dependencies for autolink', async () => {
const appName = uniq('my-app'); const appName = uniq('my-app');
runCLI( runCLI(
`generate @nrwl/react-native:application ${appName} --install=false` `generate @nrwl/react-native:application ${appName} --install=false --no-interactive`
); );
// Add npm package with native modules // Add npm package with native modules
updateFile(join('package.json'), (content) => { updateFile(join('package.json'), (content) => {

2
package.json
View File

@ -185,7 +185,7 @@
"lockfile-lint": "^4.7.6", "lockfile-lint": "^4.7.6",
"magic-string": "~0.26.2", "magic-string": "~0.26.2",
"memfs": "^3.0.1", "memfs": "^3.0.1",
"metro-resolver": "^0.73.3", "metro-resolver": "^0.74.1",
"mini-css-extract-plugin": "~2.4.7", "mini-css-extract-plugin": "~2.4.7",
"minimatch": "3.0.5", "minimatch": "3.0.5",
"next-sitemap": "^3.1.10", "next-sitemap": "^3.1.10",

9
packages/detox/migrations.json
View File

@ -183,6 +183,15 @@
"alwaysAddToPackageJson": false "alwaysAddToPackageJson": false
} }
} }
},
"15.6.2": {
"version": "15.6.2-beta.0",
"packages": {
"detox": {
"version": "20.1.1",
"alwaysAddToPackageJson": false
}
}
} }
} }
} }

2
packages/detox/package.json
View File

@ -32,7 +32,7 @@
"@nrwl/workspace": "file:../workspace" "@nrwl/workspace": "file:../workspace"
}, },
"peerDependencies": { "peerDependencies": {
"detox": "^20.0.3" "detox": "^20.1.1"
}, },
"builders": "./executors.json", "builders": "./executors.json",
"ng-update": { "ng-update": {

20
packages/detox/src/generators/application/application.spec.ts
View File

@ -60,14 +60,14 @@ describe('detox application generator', () => {
binaryPath: binaryPath:
'../../my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app', '../../my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
build: build:
"cd ../../my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.release': { 'ios.release': {
binaryPath: binaryPath:
'../../my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app', '../../my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
build: build:
"cd ../../my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });
@ -134,14 +134,14 @@ describe('detox application generator', () => {
binaryPath: binaryPath:
'../../../my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyDirMyApp.app', '../../../my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyDirMyApp.app',
build: build:
"cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.release': { 'ios.release': {
binaryPath: binaryPath:
'../../../my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyDirMyApp.app', '../../../my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyDirMyApp.app',
build: build:
"cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });
@ -208,14 +208,14 @@ describe('detox application generator', () => {
binaryPath: binaryPath:
'../../../my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyDirMyApp.app', '../../../my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyDirMyApp.app',
build: build:
"cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.release': { 'ios.release': {
binaryPath: binaryPath:
'../../../my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyDirMyApp.app', '../../../my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyDirMyApp.app',
build: build:
"cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });
@ -281,14 +281,14 @@ describe('detox application generator', () => {
binaryPath: binaryPath:
'../../../my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyDirMyApp.app', '../../../my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyDirMyApp.app',
build: build:
"cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.release': { 'ios.release': {
binaryPath: binaryPath:
'../../../my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyDirMyApp.app', '../../../my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyDirMyApp.app',
build: build:
"cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });
@ -365,7 +365,7 @@ describe('detox application generator', () => {
binaryPath: binaryPath:
'../../../my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyDirMyApp.app', '../../../my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyDirMyApp.app',
build: build:
"cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.eas': { 'ios.eas': {
@ -384,7 +384,7 @@ describe('detox application generator', () => {
binaryPath: binaryPath:
'../../../my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyDirMyApp.app', '../../../my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyDirMyApp.app',
build: build:
"cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../my-dir/my-app/ios && xcodebuild -workspace MyDirMyApp.xcworkspace -scheme MyDirMyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });

6
packages/detox/src/generators/application/files/app/.detoxrc.json.template
View File

@ -4,12 +4,12 @@
"apps": { "apps": {
"ios.debug": { "ios.debug": {
"type": "ios.app", "type": "ios.app",
"build": "cd <%= offsetFromRoot %><%= appRoot %>/ios && xcodebuild -workspace <%= appClassName %>.xcworkspace -scheme <%= appClassName %> -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "build": "cd <%= offsetFromRoot %><%= appRoot %>/ios && xcodebuild -workspace <%= appClassName %>.xcworkspace -scheme <%= appClassName %> -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
"binaryPath": "<%= offsetFromRoot %><%= appRoot %>/ios/build/Build/Products/Debug-iphonesimulator/<%= appClassName %>.app" "binaryPath": "<%= offsetFromRoot %><%= appRoot %>/ios/build/Build/Products/Debug-iphonesimulator/<%= appClassName %>.app"
}, },
"ios.release": { "ios.release": {
"type": "ios.app", "type": "ios.app",
"build": "cd <%= offsetFromRoot %><%= appRoot %>/ios && xcodebuild -workspace <%= appClassName %>.xcworkspace -scheme <%= appClassName %> -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "build": "cd <%= offsetFromRoot %><%= appRoot %>/ios && xcodebuild -workspace <%= appClassName %>.xcworkspace -scheme <%= appClassName %> -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
"binaryPath": "<%= offsetFromRoot %><%= appRoot %>/ios/build/Build/Products/Release-iphonesimulator/<%= appClassName %>.app" "binaryPath": "<%= offsetFromRoot %><%= appRoot %>/ios/build/Build/Products/Release-iphonesimulator/<%= appClassName %>.app"
}, },
<% if (framework === 'expo') { %> <% if (framework === 'expo') { %>
@ -51,7 +51,7 @@
"simulator": { "simulator": {
"type": "ios.simulator", "type": "ios.simulator",
"device": { "device": {
"type": "iPhone 13" "type": "iPhone 14"
} }
}, },
"emulator": { "emulator": {

24
packages/detox/src/generators/application/files/app/environment.js.template
View File

@ -1,24 +0,0 @@
// setup from https://github.com/wix/Detox/blob/master/docs/Guide.Jest.md#e2eenvironmentjs
const {
DetoxCircusEnvironment,
SpecReporter,
WorkerAssignReporter,
} = require('detox/runners/jest-circus');
class CustomDetoxEnvironment extends DetoxCircusEnvironment {
constructor(config, context) {
super(config, context);
// Can be safely removed, if you are content with the default value (=300000ms)
this.initTimeout = 300000;
// This takes care of generating status logs on a per-spec basis. By default, Jest only reports at file-level.
// This is strictly optional.
this.registerListeners({
SpecReporter,
WorkerAssignReporter,
});
}
}
module.exports = CustomDetoxEnvironment;

9
packages/detox/src/generators/application/files/app/jest.config.json.template
View File

@ -1,9 +1,12 @@
{ {
"preset": "<%= offsetFromRoot %>jest.preset", "preset": "<%= offsetFromRoot %>jest.preset",
"testEnvironment": "./environment",
"testRunner": "jest-circus/runner",
"testTimeout": 120000, "testTimeout": 120000,
"reporters": ["detox/runners/jest/streamlineReporter"], "maxWorkers": 1,
"globalSetup": "detox/runners/jest/globalSetup",
"globalTeardown": "detox/runners/jest/globalTeardown",
"reporters": ["detox/runners/jest/reporter"],
"testEnvironment": "detox/runners/jest/testEnvironment",
"verbose": true,
"setupFilesAfterEnv": ["<rootDir>/test-setup.ts"], "setupFilesAfterEnv": ["<rootDir>/test-setup.ts"],
"transform": { "transform": {
"^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "@nrwl/react/plugins/jest", "^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "@nrwl/react/plugins/jest",

2
packages/detox/src/utils/versions.ts
View File

@ -1,4 +1,4 @@
export const nxVersion = require('../../package.json').version; export const nxVersion = require('../../package.json').version;
export const detoxVersion = '20.0.3'; export const detoxVersion = '20.1.1';
export const testingLibraryJestDom = '5.16.5'; export const testingLibraryJestDom = '5.16.5';

2
packages/expo/package.json
View File

@ -36,7 +36,7 @@
"chalk": "^4.1.0", "chalk": "^4.1.0",
"enhanced-resolve": "^5.8.3", "enhanced-resolve": "^5.8.3",
"fs-extra": "^11.1.0", "fs-extra": "^11.1.0",
"metro-resolver": "^0.73.3", "metro-resolver": "^0.74.1",
"node-fetch": "^2.6.7", "node-fetch": "^2.6.7",
"tar-fs": "^2.1.1", "tar-fs": "^2.1.1",
"tsconfig-paths": "^4.1.2", "tsconfig-paths": "^4.1.2",

26
packages/expo/plugins/metro-resolver.ts
View File

@ -26,6 +26,13 @@ export function getResolveRequest(extensions: string[]) {
const { resolveRequest, ...context } = _context; const { resolveRequest, ...context } = _context;
const resolvedPath = const resolvedPath =
resolveRequestFromContext(
resolveRequest,
_context,
realModuleName,
platform,
debug
) ||
defaultMetroResolver(context, realModuleName, platform, debug) || defaultMetroResolver(context, realModuleName, platform, debug) ||
tsconfigPathsResolver( tsconfigPathsResolver(
context, context,
@ -42,6 +49,25 @@ export function getResolveRequest(extensions: string[]) {
}; };
} }
function resolveRequestFromContext(
resolveRequest: Function,
context: any,
realModuleName: string,
platform: string,
debug: boolean
) {
try {
return resolveRequest(context, realModuleName, platform);
} catch {
if (debug)
console.log(
chalk.cyan(
`[Nx] Unable to resolve with default resolveRequest: ${realModuleName}`
)
);
}
}
/** /**
* This function try to resolve path using metro's default resolver * This function try to resolve path using metro's default resolver
* @returns path if resolved, else undefined * @returns path if resolved, else undefined

12
packages/expo/src/generators/application/application.spec.ts
View File

@ -144,7 +144,7 @@ describe('app', () => {
binaryPath: binaryPath:
'../../../apps/my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app', '../../../apps/my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
build: build:
"cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.eas': { 'ios.eas': {
@ -163,7 +163,7 @@ describe('app', () => {
binaryPath: binaryPath:
'../../../apps/my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app', '../../../apps/my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
build: build:
"cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });
@ -219,7 +219,7 @@ describe('app', () => {
binaryPath: binaryPath:
'../../apps/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app', '../../apps/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
build: build:
"cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.eas': { 'ios.eas': {
@ -238,7 +238,7 @@ describe('app', () => {
binaryPath: binaryPath:
'../../apps/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app', '../../apps/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
build: build:
"cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });
@ -295,7 +295,7 @@ describe('app', () => {
binaryPath: binaryPath:
'../../apps/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app', '../../apps/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
build: build:
"cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.eas': { 'ios.eas': {
@ -314,7 +314,7 @@ describe('app', () => {
binaryPath: binaryPath:
'../../apps/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app', '../../apps/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
build: build:
"cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });

2
packages/expo/src/utils/versions.ts
View File

@ -22,7 +22,7 @@ export const reactNativeWebVersion = '~0.18.10';
export const reactNativeSvgTransformerVersion = '1.0.0'; export const reactNativeSvgTransformerVersion = '1.0.0';
export const reactNativeSvgVersion = '13.4.0'; export const reactNativeSvgVersion = '13.4.0';
export const metroVersion = '0.73.3'; export const metroVersion = '0.74.1';
export const testingLibraryReactNativeVersion = '11.5.0'; export const testingLibraryReactNativeVersion = '11.5.0';
export const testingLibraryJestNativeVersion = '5.3.0'; export const testingLibraryJestNativeVersion = '5.3.0';

2
packages/react-native/docs/run-ios-examples.md
View File

@ -34,7 +34,7 @@ The `simulator` option allows you to launch your iOS app in a specific simulator
"run-ios": { "run-ios": {
"executor": "@nrwl/react-native:run-ios", "executor": "@nrwl/react-native:run-ios",
"options": { "options": {
"simulator": "iPhone 13 Pro" "simulator": "iPhone 14 Pro"
} }
} }
``` ```

77
packages/react-native/migrations.json
View File

@ -1109,6 +1109,83 @@
"alwaysAddToPackageJson": false "alwaysAddToPackageJson": false
} }
} }
},
"15.6.2": {
"version": "15.6.2-beta.0",
"packages": {
"react-native": {
"version": "0.71.1",
"alwaysAddToPackageJson": false
},
"@types/react-native": {
"version": "0.71.0",
"alwaysAddToPackageJson": false
},
"metro-resolver": {
"version": "0.74.1",
"alwaysAddToPackageJson": false
},
"metro-babel-register": {
"version": "0.74.1",
"alwaysAddToPackageJson": false
},
"metro-config": {
"version": "0.74.1",
"alwaysAddToPackageJson": false
},
"metro-react-native-babel-preset": {
"version": "0.74.1",
"alwaysAddToPackageJson": false
},
"metro-react-native-babel-transformer": {
"version": "0.74.1",
"alwaysAddToPackageJson": false
},
"react-native-config": {
"version": "1.4.12",
"alwaysAddToPackageJson": false
},
"@testing-library/jest-native": {
"version": "5.4.1",
"alwaysAddToPackageJson": false
},
"react-native-svg": {
"version": "13.7.0",
"alwaysAddToPackageJson": false
},
"@babel/runtime": {
"version": "7.20.7",
"alwaysAddToPackageJson": false
},
"@react-native-community/cli": {
"version": "10.1.3",
"alwaysAddToPackageJson": false
},
"@react-native-community/cli-platform-android": {
"version": "10.1.3",
"alwaysAddToPackageJson": false
},
"@react-native-community/cli-platform-ios": {
"version": "10.1.1",
"alwaysAddToPackageJson": false
},
"@types/node": {
"version": "18.11.18",
"alwaysAddToPackageJson": false
},
"react": {
"version": "18.2.0",
"alwaysAddToPackageJson": false
},
"react-dom": {
"version": "18.2.0",
"alwaysAddToPackageJson": false
},
"react-test-renderer": {
"version": "18.2.0",
"alwaysAddToPackageJson": false
}
}
} }
} }
} }

4
packages/react-native/package.json
View File

@ -36,13 +36,13 @@
"enhanced-resolve": "^5.8.3", "enhanced-resolve": "^5.8.3",
"fs-extra": "^11.1.0", "fs-extra": "^11.1.0",
"ignore": "^5.0.4", "ignore": "^5.0.4",
"metro-resolver": "^0.73.3", "metro-resolver": "^0.74.1",
"minimatch": "3.0.5", "minimatch": "3.0.5",
"node-fetch": "^2.6.7", "node-fetch": "^2.6.7",
"tsconfig-paths": "^4.1.2" "tsconfig-paths": "^4.1.2"
}, },
"peerDependencies": { "peerDependencies": {
"react-native": "^0.70.6" "react-native": "^0.71.1"
}, },
"builders": "./executors.json", "builders": "./executors.json",
"ng-update": { "ng-update": {

36
packages/react-native/plugins/metro-resolver.ts
View File

@ -19,22 +19,29 @@ export function getResolveRequest(extensions: string[]) {
realModuleName: string, realModuleName: string,
platform: string | null platform: string | null
) { ) {
const DEBUG = process.env.NX_REACT_NATIVE_DEBUG === 'true'; const debug = process.env.NX_REACT_NATIVE_DEBUG === 'true';
if (DEBUG) console.log(chalk.cyan(`[Nx] Resolving: ${realModuleName}`)); if (debug) console.log(chalk.cyan(`[Nx] Resolving: ${realModuleName}`));
const { resolveRequest, ...context } = _context; const { resolveRequest, ...context } = _context;
const resolvedPath = const resolvedPath =
defaultMetroResolver(context, realModuleName, platform, DEBUG) || resolveRequestFromContext(
resolveRequest,
_context,
realModuleName,
platform,
debug
) ||
defaultMetroResolver(context, realModuleName, platform, debug) ||
tsconfigPathsResolver( tsconfigPathsResolver(
context, context,
extensions, extensions,
realModuleName, realModuleName,
platform, platform,
DEBUG debug
) || ) ||
pnpmResolver(extensions, context, realModuleName, DEBUG); pnpmResolver(extensions, context, realModuleName, debug);
if (resolvedPath) { if (resolvedPath) {
return resolvedPath; return resolvedPath;
} }
@ -42,6 +49,25 @@ export function getResolveRequest(extensions: string[]) {
}; };
} }
function resolveRequestFromContext(
resolveRequest: Function,
context: any,
realModuleName: string,
platform: string,
debug: boolean
) {
try {
return resolveRequest(context, realModuleName, platform);
} catch {
if (debug)
console.log(
chalk.cyan(
`[Nx] Unable to resolve with default resolveRequest: ${realModuleName}`
)
);
}
}
/** /**
* This function try to resolve path using metro's default resolver * This function try to resolve path using metro's default resolver
* @returns path if resolved, else undefined * @returns path if resolved, else undefined

5
packages/react-native/src/executors/build-android/build-android.impl.ts
View File

@ -2,8 +2,8 @@ import { ExecutorContext } from '@nrwl/devkit';
import { join } from 'path'; import { join } from 'path';
import { ensureNodeModulesSymlink } from '../../utils/ensure-node-modules-symlink'; import { ensureNodeModulesSymlink } from '../../utils/ensure-node-modules-symlink';
import { ChildProcess, spawn } from 'child_process'; import { ChildProcess, spawn } from 'child_process';
import { chmodSync } from 'fs';
import { ReactNativeBuildOptions } from './schema'; import { ReactNativeBuildOptions } from './schema';
import { chmodAndroidGradlewFiles } from '../../utils/chmod-android-gradle-files';
export interface ReactNativeBuildOutput { export interface ReactNativeBuildOutput {
success: boolean; success: boolean;
} }
@ -17,8 +17,7 @@ export default async function* buildAndroidExecutor(
const projectRoot = const projectRoot =
context.projectsConfigurations.projects[context.projectName].root; context.projectsConfigurations.projects[context.projectName].root;
ensureNodeModulesSymlink(context.root, projectRoot); ensureNodeModulesSymlink(context.root, projectRoot);
chmodSync(join(projectRoot, 'android', 'gradlew'), 0o775); chmodAndroidGradlewFiles(join(projectRoot, 'android'));
chmodSync(join(projectRoot, 'android', 'gradlew.bat'), 0o775);
try { try {
await runCliBuild(context.root, projectRoot, options); await runCliBuild(context.root, projectRoot, options);

4
packages/react-native/src/executors/run-android/run-android.impl.ts
View File

@ -10,6 +10,7 @@ import {
import { chmodSync } from 'fs'; import { chmodSync } from 'fs';
import { ReactNativeRunAndroidOptions } from './schema'; import { ReactNativeRunAndroidOptions } from './schema';
import { runCliStart } from '../start/start.impl'; import { runCliStart } from '../start/start.impl';
import { chmodAndroidGradlewFiles } from '../../utils/chmod-android-gradle-files';
export interface ReactNativeRunAndroidOutput { export interface ReactNativeRunAndroidOutput {
success: boolean; success: boolean;
@ -24,8 +25,7 @@ export default async function* runAndroidExecutor(
const projectRoot = const projectRoot =
context.projectsConfigurations.projects[context.projectName].root; context.projectsConfigurations.projects[context.projectName].root;
ensureNodeModulesSymlink(context.root, projectRoot); ensureNodeModulesSymlink(context.root, projectRoot);
chmodSync(join(context.root, projectRoot, 'android', 'gradlew'), 0o775); chmodAndroidGradlewFiles(join(projectRoot, 'android'));
chmodSync(join(context.root, projectRoot, 'android', 'gradlew.bat'), 0o775);
if (options.sync) { if (options.sync) {
displayNewlyAddedDepsMessage( displayNewlyAddedDepsMessage(

10
packages/react-native/src/executors/run-ios/schema.json
View File

@ -35,8 +35,14 @@
"simulator": { "simulator": {
"type": "string", "type": "string",
"description": "Explicitly set simulator to use. Optionally include iOS version between parenthesis at the end to match an exact version: `iPhone X (12.1)`.", "description": "Explicitly set simulator to use. Optionally include iOS version between parenthesis at the end to match an exact version: `iPhone X (12.1)`.",
"default": "iPhone 13", "default": "iPhone 14",
"examples": ["iPhone 13", "iPhone X"], "examples": [
"iPhone 14",
"iPhone 13",
"iPhone 12",
"iPhone 11",
"iPhone X"
],
"x-priority": "important" "x-priority": "important"
}, },
"device": { "device": {

8
packages/react-native/src/generators/application/application.spec.ts
View File

@ -120,14 +120,14 @@ describe('app', () => {
binaryPath: binaryPath:
'../../../apps/my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app', '../../../apps/my-dir/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
build: build:
"cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.release': { 'ios.release': {
binaryPath: binaryPath:
'../../../apps/my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app', '../../../apps/my-dir/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
build: build:
"cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../../apps/my-dir/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });
@ -168,14 +168,14 @@ describe('app', () => {
binaryPath: binaryPath:
'../../apps/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app', '../../apps/my-app/ios/build/Build/Products/Debug-iphonesimulator/MyApp.app',
build: build:
"cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
'ios.release': { 'ios.release': {
binaryPath: binaryPath:
'../../apps/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app', '../../apps/my-app/ios/build/Build/Products/Release-iphonesimulator/MyApp.app',
build: build:
"cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -derivedDataPath ./build -quiet", "cd ../../apps/my-app/ios && xcodebuild -workspace MyApp.xcworkspace -scheme MyApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' -derivedDataPath ./build -quiet",
type: 'ios.app', type: 'ios.app',
}, },
}); });

28
packages/react-native/src/generators/application/application.ts
View File

@ -1,10 +1,5 @@
import { join } from 'path';
import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
import { Schema } from './schema';
import { runPodInstall } from '../../utils/pod-install-task';
import { runChmod } from '../../utils/chmod-task';
import { runSymlink } from '../../utils/symlink-task';
import { addLinting } from '../../utils/add-linting';
import { addJest } from '../../utils/add-jest';
import { import {
convertNxGenerator, convertNxGenerator,
Tree, Tree,
@ -12,12 +7,19 @@ import {
GeneratorCallback, GeneratorCallback,
joinPathFragments, joinPathFragments,
} from '@nrwl/devkit'; } from '@nrwl/devkit';
import { runPodInstall } from '../../utils/pod-install-task';
import { runSymlink } from '../../utils/symlink-task';
import { addLinting } from '../../utils/add-linting';
import { addJest } from '../../utils/add-jest';
import { chmodAndroidGradlewFilesTask } from '../../utils/chmod-android-gradle-files';
import { normalizeOptions } from './lib/normalize-options'; import { normalizeOptions } from './lib/normalize-options';
import initGenerator from '../init/init'; import initGenerator from '../init/init';
import { join } from 'path';
import { addProject } from './lib/add-project'; import { addProject } from './lib/add-project';
import { createApplicationFiles } from './lib/create-application-files'; import { createApplicationFiles } from './lib/create-application-files';
import { addDetox } from './lib/add-detox'; import { addDetox } from './lib/add-detox';
import { Schema } from './schema';
export async function reactNativeApplicationGenerator( export async function reactNativeApplicationGenerator(
host: Tree, host: Tree,
@ -51,13 +53,8 @@ export async function reactNativeApplicationGenerator(
join(host.root, options.iosProjectRoot), join(host.root, options.iosProjectRoot),
options.install options.install
); );
const chmodTaskGradlew = runChmod( const chmodTaskGradlew = chmodAndroidGradlewFilesTask(
join(host.root, options.androidProjectRoot, 'gradlew'), join(host.root, options.androidProjectRoot)
0o775
);
const chmodTaskGradlewBat = runChmod(
join(host.root, options.androidProjectRoot, 'gradlew.bat'),
0o775
); );
if (!options.skipFormat) { if (!options.skipFormat) {
@ -71,8 +68,7 @@ export async function reactNativeApplicationGenerator(
detoxTask, detoxTask,
symlinkTask, symlinkTask,
podInstallTask, podInstallTask,
chmodTaskGradlew, chmodTaskGradlew
chmodTaskGradlewBat
); );
} }

1
packages/react-native/src/generators/application/files/app/.ruby-version Normal file
View File

@ -0,0 +1 @@
2.7.6

6
packages/react-native/src/generators/application/files/app/Gemfile.template Normal file
View File

@ -0,0 +1,6 @@
source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby File.read(File.join(__dir__, '.ruby-version')).strip
gem 'cocoapods', '~> 1.11', '>= 1.11.3'

55
packages/react-native/src/generators/application/files/app/android/app/_BUCK.template
View File

@ -1,55 +0,0 @@
# To learn about Buck see [Docs](https://buckbuild.com/).
# To run your application with Buck:
# - install Buck
# - `npm start` - to start the packager
# - `cd android`
# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
# - `buck install -r android/app` - compile, install and run application
#
load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
lib_deps = []
create_aar_targets(glob(["libs/*.aar"]))
create_jar_targets(glob(["libs/*.jar"]))
android_library(
name = "all-libs",
exported_deps = lib_deps,
)
android_library(
name = "app-code",
srcs = glob([
"src/main/java/**/*.java",
]),
deps = [
":all-libs",
":build_config",
":res",
],
)
android_build_config(
name = "build_config",
package = "com.<%= lowerCaseName %>",
)
android_resource(
name = "res",
package = "com.<%= lowerCaseName %>",
res = "src/main/res",
)
android_binary(
name = "app",
keystore = "//android/keystores:debug",
manifest = "src/main/AndroidManifest.xml",
package_type = "debug",
deps = [
":app-code",
],
)

284
packages/react-native/src/generators/application/files/app/android/app/build.gradle.template
View File

@ -1,131 +1,89 @@
apply plugin: "com.android.application" apply plugin: "com.android.application"
apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
apply plugin: "com.facebook.react"
import com.android.build.OutputFile import com.android.build.OutputFile
import org.apache.tools.ant.taskdefs.condition.Os
/** /**
* The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets * This is the configuration block to customize your React Native Android app.
* and bundleReleaseJsAndAssets). * By default you don't need to apply any configuration, just uncomment the lines you need.
* These basically call `react-native bundle` with the correct arguments during the Android build
* cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
* bundle directly from the development server. Below you can see all the possible configurations
* and their defaults. If you decide to add a configuration block, make sure to add it before the
* `apply from: "../../node_modules/react-native/react.gradle"` line.
*
* project.ext.react = [
* // the name of the generated asset file containing your JS bundle
* bundleAssetName: "index.android.bundle",
*
* // the entry file for bundle generation. If none specified and
* // "index.android.js" exists, it will be used. Otherwise "index.js" is
* // default. Can be overridden with ENTRY_FILE environment variable.
* entryFile: "index.android.js",
*
* // https://reactnative.dev/docs/performance#enable-the-ram-format
* bundleCommand: "ram-bundle",
*
* // whether to bundle JS and assets in debug mode
* bundleInDebug: false,
*
* // whether to bundle JS and assets in release mode
* bundleInRelease: true,
*
* // whether to bundle JS and assets in another build variant (if configured).
* // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
* // The configuration property can be in the following formats
* // 'bundleIn${productFlavor}${buildType}'
* // 'bundleIn${buildType}'
* // bundleInFreeDebug: true,
* // bundleInPaidRelease: true,
* // bundleInBeta: true,
*
* // whether to disable dev mode in custom build variants (by default only disabled in release)
* // for example: to disable dev mode in the staging build type (if configured)
* devDisabledInStaging: true,
* // The configuration property can be in the following formats
* // 'devDisabledIn${productFlavor}${buildType}'
* // 'devDisabledIn${buildType}'
*
* // the root of your project, i.e. where "package.json" lives
* root: "../../",
*
* // where to put the JS bundle asset in debug mode
* jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
*
* // where to put the JS bundle asset in release mode
* jsBundleDirRelease: "$buildDir/intermediates/assets/release",
*
* // where to put drawable resources / React Native assets, e.g. the ones you use via
* // require('./image.png')), in debug mode
* resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
*
* // where to put drawable resources / React Native assets, e.g. the ones you use via
* // require('./image.png')), in release mode
* resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
*
* // by default the gradle tasks are skipped if none of the JS files or assets change; this means
* // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
* // date; if you have any other folders that you want to ignore for performance reasons (gradle
* // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
* // for example, you might want to remove it from here.
* inputExcludes: ["android/**", "ios/**"],
*
* // override which node gets called and with what additional arguments
* nodeExecutableAndArgs: ["node"],
*
* // supply additional arguments to the packager
* extraPackagerArgs: []
* ]
*/ */
react {
/* Folders */
// The root of your project, i.e. where "package.json" lives. Default is '..'
// root = file("../")
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
// reactNativeDir = file("../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
// codegenDir = file("../node_modules/react-native-codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
// cliFile = file("../node_modules/react-native/cli.js")
project.ext.react = [ /* Variants */
// the entry file for bundle generation // The list of variants to that are debuggable. For those we're going to
entryFile: "<%= entryFile %>", // skip the bundling of the JS bundle and the assets. By default is just 'debug'.
enableHermes: true, // clean and rebuild if changing // If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
] // debuggableVariants = ["liteDebug", "prodDebug"]
apply from: "../../node_modules/react-native/react.gradle" /* Bundling */
// A list containing the node command and its flags. Default is just 'node'.
// nodeExecutableAndArgs = ["node"]
//
// The command to run when bundling. By default is 'bundle'
// bundleCommand = "ram-bundle"
//
// The path to the CLI configuration file. Default is empty.
// bundleConfig = file(../rn-cli.config.js)
//
// The name of the generated asset file containing your JS bundle
// bundleAssetName = "MyApplication.android.bundle"
//
// The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
// entryFile = file("../js/MyApplication.android.js")
//
// A list of extra flags to pass to the 'bundle' commands.
// See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
// extraPackagerArgs = []
/* Hermes Commands */
// The hermes compiler command to run. By default it is 'hermesc'
// hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
//
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
// hermesFlags = ["-O", "-output-source-map"]
entryFile = file("../../<%= entryFile %>")
}
/** /**
* Set this to true to create two separate APKs instead of one: * Set this to true to create four separate APKs instead of one,
* - An APK that only works on ARM devices * one for each native architecture. This is useful if you don't
* - An APK that only works on x86 devices * use App Bundles (https://developer.android.com/guide/app-bundle/)
* The advantage is the size of the APK is reduced by about 4MB. * and want to have separate APKs to upload to the Play Store.
* Upload all the APKs to the Play Store and people will download
* the correct one based on the CPU architecture of their device.
*/ */
def enableSeparateBuildPerCPUArchitecture = false def enableSeparateBuildPerCPUArchitecture = false
/** /**
* Run Proguard to shrink the Java bytecode in release builds. * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
*/ */
def enableProguardInReleaseBuilds = false def enableProguardInReleaseBuilds = false
/** /**
* The preferred build flavor of JavaScriptCore. * The preferred build flavor of JavaScriptCore (JSC)
* *
* For example, to use the international variant, you can use: * For example, to use the international variant, you can use:
* `def jscFlavor = 'org.webkit:android-jsc-intl:+'` * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
* *
* The international variant includes ICU i18n library and necessary data * The international variant includes ICU i18n library and necessary data
* allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
* give correct results when using with locales other than en-US. Note that * give correct results when using with locales other than en-US. Note that
* this variant is about 6MiB larger per architecture than default. * this variant is about 6MiB larger per architecture than default.
*/ */
def jscFlavor = 'org.webkit:android-jsc:+' def jscFlavor = 'org.webkit:android-jsc:+'
/** /**
* Whether to enable the Hermes VM. * Private function to get the list of Native Architectures you want to build.
* * This reads the value from reactNativeArchitectures in your gradle.properties
* This should be set on project.ext.react and that value will be read here. If it is not set * file and works together with the --active-arch-only flag of react-native run-android.
* on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
* and the benefits of using Hermes will therefore be sharply reduced.
*/
def enableHermes = project.ext.react.get("enableHermes", false);
/**
* Architectures to build native code for.
*/ */
def reactNativeArchitectures() { def reactNativeArchitectures() {
def value = project.getProperties().get("reactNativeArchitectures") def value = project.getProperties().get("reactNativeArchitectures")
@ -137,77 +95,17 @@ android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
namespace "com.<%= lowerCaseName %>"
defaultConfig { defaultConfig {
applicationId "com.<%= lowerCaseName %>" applicationId "com.<%= lowerCaseName %>"
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
<% if (e2eTestRunner === 'detox') { %> <% if (e2eTestRunner === 'detox') { %>
testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type testBuildType System.getProperty('testBuildType', 'debug')
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
missingDimensionStrategy 'detox', 'full'
<% } %> <% } %>
if (isNewArchitectureEnabled()) {
// We configure the CMake build only if you decide to opt-in for the New Architecture.
externalNativeBuild {
cmake {
arguments "-DPROJECT_BUILD_DIR=$buildDir",
"-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
"-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
"-DNODE_MODULES_DIR=$rootDir/../node_modules",
"-DANDROID_STL=c++_shared"
}
}
if (!enableSeparateBuildPerCPUArchitecture) {
ndk {
abiFilters (*reactNativeArchitectures())
}
}
}
}
if (isNewArchitectureEnabled()) {
// We configure the NDK build only if you decide to opt-in for the New Architecture.
externalNativeBuild {
cmake {
path "$projectDir/src/main/jni/CMakeLists.txt"
}
}
def reactAndroidProjectDir = project(':ReactAndroid').projectDir
def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
into("$buildDir/react-ndk/exported")
}
def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
into("$buildDir/react-ndk/exported")
}
afterEvaluate {
// If you wish to add a custom TurboModule or component locally,
// you should uncomment this line.
// preBuild.dependsOn("generateCodegenArtifactsFromSchema")
preDebugBuild.dependsOn(packageReactNdkDebugLibs)
preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
// Due to a bug inside AGP, we have to explicitly set a dependency
// between configureCMakeDebug* tasks and the preBuild tasks.
// This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild)
configureCMakeDebug.dependsOn(preDebugBuild)
reactNativeArchitectures().each { architecture ->
tasks.findByName("configureCMakeDebug[${architecture}]")?.configure {
dependsOn("preDebugBuild")
}
tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure {
dependsOn("preReleaseBuild")
}
}
}
} }
splits { splits {
@ -237,7 +135,6 @@ android {
minifyEnabled enableProguardInReleaseBuilds minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
<% if (e2eTestRunner === 'detox') { %> <% if (e2eTestRunner === 'detox') { %>
// Detox-specific additions to pro-guard
proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro" proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
<% } %> <% } %>
} }
@ -261,70 +158,27 @@ android {
} }
dependencies { dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"]) <% if (e2eTestRunner === 'detox') { %>
androidTestImplementation('com.wix:detox:+')
//noinspection GradleDynamicVersion implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "com.facebook.react:react-native:+" // From node_modules <% } %>
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
implementation project(':react-native-config') implementation project(':react-native-config')
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
exclude group:'com.facebook.fbjni'
}
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
exclude group:'com.facebook.flipper'
exclude group:'com.squareup.okhttp3', module:'okhttp' exclude group:'com.squareup.okhttp3', module:'okhttp'
} }
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") { debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
exclude group:'com.facebook.flipper' if (hermesEnabled.toBoolean()) {
} implementation("com.facebook.react:hermes-android")
if (enableHermes) {
//noinspection GradleDynamicVersion
implementation("com.facebook.react:hermes-engine:+") { // From node_modules
exclude group:'com.facebook.fbjni'
}
} else { } else {
implementation jscFlavor implementation jscFlavor
} }
<% if (e2eTestRunner === 'detox') { %>
androidTestImplementation(project(path: ":detox"))
<% } %>
}
if (isNewArchitectureEnabled()) {
// If new architecture is enabled, we let you build RN from source
// Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
// This will be applied to all the imported transtitive dependency.
configurations.all {
resolutionStrategy.dependencySubstitution {
substitute(module("com.facebook.react:react-native"))
.using(project(":ReactAndroid"))
.because("On New Architecture we're building React Native from source")
substitute(module("com.facebook.react:hermes-engine"))
.using(project(":ReactAndroid:hermes-engine"))
.because("On New Architecture we're building Hermes from source")
}
}
}
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) {
from configurations.implementation
into 'libs'
} }
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
def isNewArchitectureEnabled() {
// To opt-in for the New Architecture, you can either:
// - Set `newArchEnabled` to true inside the `gradle.properties` file
// - Invoke gradle with `-newArchEnabled=true`
// - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
}

19
packages/react-native/src/generators/application/files/app/android/app/build_defs.bzl
View File

@ -1,19 +0,0 @@
"""Helper definitions to glob .aar and .jar targets"""
def create_aar_targets(aarfiles):
for aarfile in aarfiles:
name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
lib_deps.append(":" + name)
android_prebuilt_aar(
name = name,
aar = aarfile,
)
def create_jar_targets(jarfiles):
for jarfile in jarfiles:
name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
lib_deps.append(":" + name)
prebuilt_jar(
name = name,
binary_jar = jarfile,
)

10
packages/react-native/src/generators/application/files/app/android/app/src/androidTest/java/com/__lowerCaseName__/DetoxTest.java.template
View File

@ -15,21 +15,15 @@ import androidx.test.rule.ActivityTestRule;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@LargeTest @LargeTest
public class DetoxTest { public class DetoxTest {
// Replace 'MainActivity' with the value of android:name entry in @Rule // (2)
// <activity> in AndroidManifest.xml
@Rule
public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class, false, false); public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class, false, false);
@Test @Test
public void runDetoxTests() { public void runDetoxTests() {
// This is optional - in case you've decided to integrate TestButler
// See https://github.com/wix/Detox/blob/master/docs/Introduction.Android.md#8-test-butler-support-optional
// TestButlerProbe.assertReadyIfInstalled();
DetoxConfig detoxConfig = new DetoxConfig(); DetoxConfig detoxConfig = new DetoxConfig();
detoxConfig.idlePolicyConfig.masterTimeoutSec = 90; detoxConfig.idlePolicyConfig.masterTimeoutSec = 90;
detoxConfig.idlePolicyConfig.idleResourceTimeoutSec = 60; detoxConfig.idlePolicyConfig.idleResourceTimeoutSec = 60;
detoxConfig.rnContextLoadTimeoutSec = (com.<%= lowerCaseName %>.BuildConfig.DEBUG ? 180 : 60); detoxConfig.rnContextLoadTimeoutSec = (BuildConfig.DEBUG ? 180 : 60);
Detox.runTests(mActivityRule, detoxConfig); Detox.runTests(mActivityRule, detoxConfig);
} }

6
packages/react-native/src/generators/application/files/app/android/app/src/debug/java/com/__lowerCaseName__/ReactNativeFlipper.java.template
View File

@ -17,7 +17,6 @@ import com.facebook.flipper.plugins.inspector.DescriptorMapping;
import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin; import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor; import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin; import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin; import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
import com.facebook.react.ReactInstanceEventListener; import com.facebook.react.ReactInstanceEventListener;
import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactInstanceManager;
@ -25,13 +24,16 @@ import com.facebook.react.bridge.ReactContext;
import com.facebook.react.modules.network.NetworkingModule; import com.facebook.react.modules.network.NetworkingModule;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
/**
* Class responsible of loading Flipper inside your React Native application. This is the debug
* flavor of it. Here you can add your own plugins and customize the Flipper setup.
*/
public class ReactNativeFlipper { public class ReactNativeFlipper {
public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) { public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
if (FlipperUtils.shouldEnableFlipper(context)) { if (FlipperUtils.shouldEnableFlipper(context)) {
final FlipperClient client = AndroidFlipperClient.getInstance(context); final FlipperClient client = AndroidFlipperClient.getInstance(context);
client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults())); client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
client.addPlugin(new ReactFlipperPlugin());
client.addPlugin(new DatabasesFlipperPlugin(context)); client.addPlugin(new DatabasesFlipperPlugin(context));
client.addPlugin(new SharedPreferencesFlipperPlugin(context)); client.addPlugin(new SharedPreferencesFlipperPlugin(context));
client.addPlugin(CrashReporterPlugin.getInstance()); client.addPlugin(CrashReporterPlugin.getInstance());

6
packages/react-native/src/generators/application/files/app/android/app/src/main/AndroidManifest.xml.template
View File

@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android">
package="com.<%= lowerCaseName %>">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
@ -9,7 +8,8 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false" android:allowBackup="false"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme"
android:networkSecurityConfig="@xml/network_security_config">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"

39
packages/react-native/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/MainActivity.java.template
View File

@ -2,7 +2,8 @@ package com.<%= lowerCaseName %>;
import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivity;
import com.facebook.react.ReactActivityDelegate; import com.facebook.react.ReactActivityDelegate;
import com.facebook.react.ReactRootView; import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
import com.facebook.react.defaults.DefaultReactActivityDelegate;
public class MainActivity extends ReactActivity { public class MainActivity extends ReactActivity {
@ -16,33 +17,19 @@ public class MainActivity extends ReactActivity {
} }
/** /**
* Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
* you can specify the renderer you wish to use - the new renderer (Fabric) or the old renderer * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
* (Paper). * (aka React 18) with two boolean flags.
*/ */
@Override @Override
protected ReactActivityDelegate createReactActivityDelegate() { protected ReactActivityDelegate createReactActivityDelegate() {
return new MainActivityDelegate(this, getMainComponentName()); return new DefaultReactActivityDelegate(
} this,
getMainComponentName(),
public static class MainActivityDelegate extends ReactActivityDelegate { // If you opted-in for the New Architecture, we enable the Fabric Renderer.
public MainActivityDelegate(ReactActivity activity, String mainComponentName) { DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
super(activity, mainComponentName); // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18).
} DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
);
@Override
protected ReactRootView createRootView() {
ReactRootView reactRootView = new ReactRootView(getContext());
// If you opted-in for the New Architecture, we enable the Fabric Renderer.
reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
return reactRootView;
}
@Override
protected boolean isConcurrentRootEnabled() {
// If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18).
// More on this on https://reactjs.org/blog/2022/03/29/react-v18.html
return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
}
} }
} }

67
packages/react-native/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/MainApplication.java.template
View File

@ -1,23 +1,20 @@
package com.<%= lowerCaseName %>; package com.<%= lowerCaseName %>;
import android.app.Application; import android.app.Application;
import android.content.Context;
import com.facebook.react.PackageList; import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication; import com.facebook.react.ReactApplication;
import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage; import com.facebook.react.ReactPackage;
import com.facebook.react.config.ReactFeatureFlags; import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
import com.facebook.react.defaults.DefaultReactNativeHost;
import com.facebook.soloader.SoLoader; import com.facebook.soloader.SoLoader;
import com.<%= lowerCaseName %>.newarchitecture.MainApplicationReactNativeHost;
import java.lang.reflect.InvocationTargetException;
import java.util.List; import java.util.List;
import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
public class MainApplication extends Application implements ReactApplication { public class MainApplication extends Application implements ReactApplication {
private final ReactNativeHost mReactNativeHost = private final ReactNativeHost mReactNativeHost =
new ReactNativeHost(this) { new DefaultReactNativeHost(this) {
@Override @Override
public boolean getUseDeveloperSupport() { public boolean getUseDeveloperSupport() {
return BuildConfig.DEBUG; return BuildConfig.DEBUG;
@ -36,57 +33,31 @@ public class MainApplication extends Application implements ReactApplication {
protected String getJSMainModuleName() { protected String getJSMainModuleName() {
return "<%= entryFile %>"; return "<%= entryFile %>";
} }
};
private final ReactNativeHost mNewArchitectureNativeHost = @Override
new MainApplicationReactNativeHost(this); protected boolean isNewArchEnabled() {
return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
}
@Override
protected Boolean isHermesEnabled() {
return BuildConfig.IS_HERMES_ENABLED;
}
};
@Override @Override
public ReactNativeHost getReactNativeHost() { public ReactNativeHost getReactNativeHost() {
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { return mReactNativeHost;
return mNewArchitectureNativeHost;
} else {
return mReactNativeHost;
}
} }
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
// If you opted-in for the New Architecture, we enable the TurboModule system
ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
SoLoader.init(this, /* native exopackage */ false); SoLoader.init(this, /* native exopackage */ false);
initializeFlipper(this, getReactNativeHost().getReactInstanceManager()); if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
} // If you opted-in for the New Architecture, we load the native entry point for this app.
DefaultNewArchitectureEntryPoint.load();
/**
* Loads Flipper in React Native templates. Call this in the onCreate method with something like
* initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
*
* @param context
* @param reactInstanceManager
*/
private static void initializeFlipper(
Context context, ReactInstanceManager reactInstanceManager) {
if (BuildConfig.DEBUG) {
try {
/*
We use reflection here to pick up the class that initializes Flipper,
since Flipper library is not available in release mode
*/
Class<?> aClass = Class.forName("com.<%= lowerCaseName %>.ReactNativeFlipper");
aClass
.getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
.invoke(null, context, reactInstanceManager);
} catch (ClassNotFoundException e) {
e.printStackTrace();
} catch (NoSuchMethodException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
}
} }
ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
} }
} }

116
packages/react-native/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/newarchitecture/MainApplicationReactNativeHost.java.template
View File

@ -1,116 +0,0 @@
package com.<%= lowerCaseName %>.newarchitecture;
import android.app.Application;
import androidx.annotation.NonNull;
import com.facebook.react.PackageList;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
import com.facebook.react.bridge.JSIModulePackage;
import com.facebook.react.bridge.JSIModuleProvider;
import com.facebook.react.bridge.JSIModuleSpec;
import com.facebook.react.bridge.JSIModuleType;
import com.facebook.react.bridge.JavaScriptContextHolder;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.UIManager;
import com.facebook.react.fabric.ComponentFactory;
import com.facebook.react.fabric.CoreComponentsRegistry;
import com.facebook.react.fabric.FabricJSIModuleProvider;
import com.facebook.react.fabric.ReactNativeConfig;
import com.facebook.react.uimanager.ViewManagerRegistry;
import com.<%= lowerCaseName %>.BuildConfig;
import com.<%= lowerCaseName %>.newarchitecture.components.MainComponentsRegistry;
import com.<%= lowerCaseName %>.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
import java.util.ArrayList;
import java.util.List;
/**
* A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both
* TurboModule delegates and the Fabric Renderer.
*
* <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
* `newArchEnabled` property). Is ignored otherwise.
*/
public class MainApplicationReactNativeHost extends ReactNativeHost {
public MainApplicationReactNativeHost(Application application) {
super(application);
}
@Override
public boolean getUseDeveloperSupport() {
return BuildConfig.DEBUG;
}
@Override
protected List<ReactPackage> getPackages() {
List<ReactPackage> packages = new PackageList(this).getPackages();
// Packages that cannot be autolinked yet can be added manually here, for example:
// packages.add(new MyReactNativePackage());
// TurboModules must also be loaded here providing a valid TurboReactPackage implementation:
// packages.add(new TurboReactPackage() { ... });
// If you have custom Fabric Components, their ViewManagers should also be loaded here
// inside a ReactPackage.
return packages;
}
@Override
protected String getJSMainModuleName() {
return "<%= entryFile %>";
}
@NonNull
@Override
protected ReactPackageTurboModuleManagerDelegate.Builder
getReactPackageTurboModuleManagerDelegateBuilder() {
// Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary
// for the new architecture and to use TurboModules correctly.
return new MainApplicationTurboModuleManagerDelegate.Builder();
}
@Override
protected JSIModulePackage getJSIModulePackage() {
return new JSIModulePackage() {
@Override
public List<JSIModuleSpec> getJSIModules(
final ReactApplicationContext reactApplicationContext,
final JavaScriptContextHolder jsContext) {
final List<JSIModuleSpec> specs = new ArrayList<>();
// Here we provide a new JSIModuleSpec that will be responsible of providing the
// custom Fabric Components.
specs.add(
new JSIModuleSpec() {
@Override
public JSIModuleType getJSIModuleType() {
return JSIModuleType.UIManager;
}
@Override
public JSIModuleProvider<UIManager> getJSIModuleProvider() {
final ComponentFactory componentFactory = new ComponentFactory();
CoreComponentsRegistry.register(componentFactory);
// Here we register a Components Registry.
// The one that is generated with the template contains no components
// and just provides you the one from React Native core.
MainComponentsRegistry.register(componentFactory);
final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
ViewManagerRegistry viewManagerRegistry =
new ViewManagerRegistry(
reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
return new FabricJSIModuleProvider(
reactApplicationContext,
componentFactory,
ReactNativeConfig.DEFAULT_CONFIG,
viewManagerRegistry);
}
});
return specs;
}
};
}
}

36
packages/react-native/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/newarchitecture/components/MainComponentsRegistry.java.template
View File

@ -1,36 +0,0 @@
package com.<%= lowerCaseName %>.newarchitecture.components;
import com.facebook.jni.HybridData;
import com.facebook.proguard.annotations.DoNotStrip;
import com.facebook.react.fabric.ComponentFactory;
import com.facebook.soloader.SoLoader;
/**
* Class responsible to load the custom Fabric Components. This class has native methods and needs a
* corresponding C++ implementation/header file to work correctly (already placed inside the jni/
* folder for you).
*
* <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
* `newArchEnabled` property). Is ignored otherwise.
*/
@DoNotStrip
public class MainComponentsRegistry {
static {
SoLoader.loadLibrary("fabricjni");
}
@DoNotStrip private final HybridData mHybridData;
@DoNotStrip
private native HybridData initHybrid(ComponentFactory componentFactory);
@DoNotStrip
private MainComponentsRegistry(ComponentFactory componentFactory) {
mHybridData = initHybrid(componentFactory);
}
@DoNotStrip
public static MainComponentsRegistry register(ComponentFactory componentFactory) {
return new MainComponentsRegistry(componentFactory);
}
}

48
packages/react-native/src/generators/application/files/app/android/app/src/main/java/com/__lowerCaseName__/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java.template
View File

@ -1,48 +0,0 @@
package com.<%= lowerCaseName %>.newarchitecture.modules;
import com.facebook.jni.HybridData;
import com.facebook.react.ReactPackage;
import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.soloader.SoLoader;
import java.util.List;
/**
* Class responsible to load the TurboModules. This class has native methods and needs a
* corresponding C++ implementation/header file to work correctly (already placed inside the jni/
* folder for you).
*
* <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
* `newArchEnabled` property). Is ignored otherwise.
*/
public class MainApplicationTurboModuleManagerDelegate
extends ReactPackageTurboModuleManagerDelegate {
private static volatile boolean sIsSoLibraryLoaded;
protected MainApplicationTurboModuleManagerDelegate(
ReactApplicationContext reactApplicationContext, List<ReactPackage> packages) {
super(reactApplicationContext, packages);
}
protected native HybridData initHybrid();
native boolean canCreateTurboModule(String moduleName);
public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
protected MainApplicationTurboModuleManagerDelegate build(
ReactApplicationContext context, List<ReactPackage> packages) {
return new MainApplicationTurboModuleManagerDelegate(context, packages);
}
}
@Override
protected synchronized void maybeLoadOtherSoLibraries() {
if (!sIsSoLibraryLoaded) {
// If you change the name of your application .so file in the Android.mk file,
// make sure you update the name here as well.
SoLoader.loadLibrary("<%= lowerCaseName %>_appmodules");
sIsSoLibraryLoaded = true;
}
}
}

6
packages/react-native/src/generators/application/files/app/android/app/src/main/jni/CMakeLists.txt.template
View File

@ -1,6 +0,0 @@
cmake_minimum_required(VERSION 3.13)
# Define the library name here.
project(<%= lowerCaseName %>_appmodules)
# This file includes all the necessary to let you build your application with the New Architecture.
include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)

32
packages/react-native/src/generators/application/files/app/android/app/src/main/jni/MainApplicationModuleProvider.cpp
View File

@ -1,32 +0,0 @@
#include "MainApplicationModuleProvider.h"
#include <rncli.h>
#include <rncore.h>
namespace facebook {
namespace react {
std::shared_ptr<TurboModule> MainApplicationModuleProvider(
const std::string &moduleName,
const JavaTurboModule::InitParams &params) {
// Here you can provide your own module provider for TurboModules coming from
// either your application or from external libraries. The approach to follow
// is similar to the following (for a library called `samplelibrary`:
//
// auto module = samplelibrary_ModuleProvider(moduleName, params);
// if (module != nullptr) {
// return module;
// }
// return rncore_ModuleProvider(moduleName, params);
// Module providers autolinked by RN CLI
auto rncli_module = rncli_ModuleProvider(moduleName, params);
if (rncli_module != nullptr) {
return rncli_module;
}
return rncore_ModuleProvider(moduleName, params);
}
} // namespace react
} // namespace facebook

16
packages/react-native/src/generators/application/files/app/android/app/src/main/jni/MainApplicationModuleProvider.h
View File

@ -1,16 +0,0 @@
#pragma once
#include <memory>
#include <string>
#include <ReactCommon/JavaTurboModule.h>
namespace facebook {
namespace react {
std::shared_ptr<TurboModule> MainApplicationModuleProvider(
const std::string &moduleName,
const JavaTurboModule::InitParams &params);
} // namespace react
} // namespace facebook

45
packages/react-native/src/generators/application/files/app/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp
View File

@ -1,45 +0,0 @@
#include "MainApplicationTurboModuleManagerDelegate.h"
#include "MainApplicationModuleProvider.h"
namespace facebook {
namespace react {
jni::local_ref<MainApplicationTurboModuleManagerDelegate::jhybriddata>
MainApplicationTurboModuleManagerDelegate::initHybrid(
jni::alias_ref<jhybridobject>) {
return makeCxxInstance();
}
void MainApplicationTurboModuleManagerDelegate::registerNatives() {
registerHybrid({
makeNativeMethod(
"initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
makeNativeMethod(
"canCreateTurboModule",
MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
});
}
std::shared_ptr<TurboModule>
MainApplicationTurboModuleManagerDelegate::getTurboModule(
const std::string &name,
const std::shared_ptr<CallInvoker> &jsInvoker) {
// Not implemented yet: provide pure-C++ NativeModules here.
return nullptr;
}
std::shared_ptr<TurboModule>
MainApplicationTurboModuleManagerDelegate::getTurboModule(
const std::string &name,
const JavaTurboModule::InitParams &params) {
return MainApplicationModuleProvider(name, params);
}
bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
const std::string &name) {
return getTurboModule(name, nullptr) != nullptr ||
getTurboModule(name, {.moduleName = name}) != nullptr;
}
} // namespace react
} // namespace facebook

38
packages/react-native/src/generators/application/files/app/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h.template
View File

@ -1,38 +0,0 @@
#include <memory>
#include <string>
#include <ReactCommon/TurboModuleManagerDelegate.h>
#include <fbjni/fbjni.h>
namespace facebook {
namespace react {
class MainApplicationTurboModuleManagerDelegate
: public jni::HybridClass<
MainApplicationTurboModuleManagerDelegate,
TurboModuleManagerDelegate> {
public:
// Adapt it to the package you used for your Java class.
static constexpr auto kJavaDescriptor =
"Lcom/<%= lowerCaseName %>/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
static void registerNatives();
std::shared_ptr<TurboModule> getTurboModule(
const std::string &name,
const std::shared_ptr<CallInvoker> &jsInvoker) override;
std::shared_ptr<TurboModule> getTurboModule(
const std::string &name,
const JavaTurboModule::InitParams &params) override;
/**
* Test-only method. Allows user to verify whether a TurboModule can be
* created by instances of this class.
*/
bool canCreateTurboModule(const std::string &name);
};
} // namespace react
} // namespace facebook

65
packages/react-native/src/generators/application/files/app/android/app/src/main/jni/MainComponentsRegistry.cpp
View File

@ -1,65 +0,0 @@
#include "MainComponentsRegistry.h"
#include <CoreComponentsRegistry.h>
#include <fbjni/fbjni.h>
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
#include <react/renderer/components/rncore/ComponentDescriptors.h>
#include <rncli.h>
namespace facebook {
namespace react {
MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
std::shared_ptr<ComponentDescriptorProviderRegistry const>
MainComponentsRegistry::sharedProviderRegistry() {
auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
// Autolinked providers registered by RN CLI
rncli_registerProviders(providerRegistry);
// Custom Fabric Components go here. You can register custom
// components coming from your App or from 3rd party libraries here.
//
// providerRegistry->add(concreteComponentDescriptorProvider<
// AocViewerComponentDescriptor>());
return providerRegistry;
}
jni::local_ref<MainComponentsRegistry::jhybriddata>
MainComponentsRegistry::initHybrid(
jni::alias_ref<jclass>,
ComponentFactory *delegate) {
auto instance = makeCxxInstance(delegate);
auto buildRegistryFunction =
[](EventDispatcher::Weak const &eventDispatcher,
ContextContainer::Shared const &contextContainer)
-> ComponentDescriptorRegistry::Shared {
auto registry = MainComponentsRegistry::sharedProviderRegistry()
->createComponentDescriptorRegistry(
{eventDispatcher, contextContainer});
auto mutableRegistry =
std::const_pointer_cast<ComponentDescriptorRegistry>(registry);
mutableRegistry->setFallbackComponentDescriptor(
std::make_shared<UnimplementedNativeViewComponentDescriptor>(
ComponentDescriptorParameters{
eventDispatcher, contextContainer, nullptr}));
return registry;
};
delegate->buildRegistryFunction = buildRegistryFunction;
return instance;
}
void MainComponentsRegistry::registerNatives() {
registerHybrid({
makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
});
}
} // namespace react
} // namespace facebook

32
packages/react-native/src/generators/application/files/app/android/app/src/main/jni/MainComponentsRegistry.h.template
View File

@ -1,32 +0,0 @@
#pragma once
#include <ComponentFactory.h>
#include <fbjni/fbjni.h>
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
namespace facebook {
namespace react {
class MainComponentsRegistry
: public facebook::jni::HybridClass<MainComponentsRegistry> {
public:
// Adapt it to the package you used for your Java class.
constexpr static auto kJavaDescriptor =
"Lcom/<%= lowerCaseName %>/newarchitecture/components/MainComponentsRegistry;";
static void registerNatives();
MainComponentsRegistry(ComponentFactory *delegate);
private:
static std::shared_ptr<ComponentDescriptorProviderRegistry const>
sharedProviderRegistry();
static jni::local_ref<jhybriddata> initHybrid(
jni::alias_ref<jclass>,
ComponentFactory *delegate);
};
} // namespace react
} // namespace facebook

11
packages/react-native/src/generators/application/files/app/android/app/src/main/jni/OnLoad.cpp
View File

@ -1,11 +0,0 @@
#include <fbjni/fbjni.h>
#include "MainApplicationTurboModuleManagerDelegate.h"
#include "MainComponentsRegistry.h"
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
return facebook::jni::initialize(vm, [] {
facebook::react::MainApplicationTurboModuleManagerDelegate::
registerNatives();
facebook::react::MainComponentsRegistry::registerNatives();
});
}

20
packages/react-native/src/generators/application/files/app/android/app/src/release/java/com/__lowerCaseName__/ReactNativeFlipper.java.template Normal file
View File

@ -0,0 +1,20 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* <p>This source code is licensed under the MIT license found in the LICENSE file in the root
* directory of this source tree.
*/
package com.<%= lowerCaseName %>;
import android.content.Context;
import com.facebook.react.ReactInstanceManager;
/**
* Class responsible of loading Flipper inside your React Native application. This is the release
* flavor of it so it's empty as we don't want to load Flipper.
*/
public class ReactNativeFlipper {
public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
// Do nothing as we don't want to initialize Flipper on Release.
}
}

49
packages/react-native/src/generators/application/files/app/android/build.gradle.template
View File

@ -2,56 +2,33 @@
buildscript { buildscript {
ext { ext {
buildToolsVersion = "31.0.0" buildToolsVersion = "33.0.0"
minSdkVersion = 21 minSdkVersion = 21
compileSdkVersion = 31 compileSdkVersion = 33
targetSdkVersion = 31 targetSdkVersion = 33
<% if (e2eTestRunner === 'detox') { %> kotlinVersion = "1.7.21"
kotlinVersion = '1.7.10'
<% } %>
if (System.properties['os.arch'] == "aarch64") { // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
// For M1 Users we need to use the NDK 24 which added support for aarch64 ndkVersion = "23.1.7779620"
ndkVersion = "24.0.8215888"
} else {
// Otherwise we default to the side-by-side NDK version from AGP.
ndkVersion = "21.4.7075529"
}
} }
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:7.2.1") classpath("com.android.tools.build:gradle:7.3.1")
classpath("com.facebook.react:react-native-gradle-plugin") classpath("com.facebook.react:react-native-gradle-plugin")
classpath("de.undercouch:gradle-download-task:5.0.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
<% if (e2eTestRunner === 'detox') { %>
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
<% } %>
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
} }
} }
allprojects { allprojects {
repositories { repositories {
<% if (e2eTestRunner === 'detox') { %>
maven { maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm // https://wix.github.io/Detox/docs/introduction/project-setup
url("$rootDir/../node_modules/react-native/android") url("$rootDir/../node_modules/detox/Detox-android")
} }
maven { <% } %>
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}
mavenCentral {
// We don't want to fetch react-native from Maven Central as there are
// older versions over there.
content {
excludeGroup "com.facebook.react"
}
}
google()
maven { url 'https://www.jitpack.io' }
} }
} }

4
packages/react-native/src/generators/application/files/app/android/gradle.properties
View File

@ -38,3 +38,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
# to write custom TurboModules/Fabric components OR use libraries that # to write custom TurboModules/Fabric components OR use libraries that
# are providing them. # are providing them.
newArchEnabled=false newArchEnabled=false
# Use this property to enable or disable the Hermes JS engine.
# If set to false, you will be using JSC instead.
hermesEnabled=true

19
packages/react-native/src/generators/application/files/app/android/settings.gradle.template
View File

@ -1,22 +1,7 @@
rootProject.name = '<%= className %>' rootProject.name = '<%= className %>'
include ':react-native-config' include ':react-native-config'
project(':react-native-config').projectDir = new File(rootProject.projectDir, '../../../node_modules/react-native-config/android') project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
<% if (e2eTestRunner === 'detox') { %>
include ':detox'
project(':detox').projectDir = new File(rootProject.projectDir, '../node_modules/detox/android/detox')
<% } %>
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle");
applyNativeModulesSettingsGradle(settings)
include ':app' include ':app'
includeBuild('../node_modules/react-native-gradle-plugin') includeBuild('../node_modules/react-native-gradle-plugin')
if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
include(":ReactAndroid")
project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
include(":ReactAndroid:hermes-engine")
project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
}

26
packages/react-native/src/generators/application/files/app/ios/Podfile.template
View File

@ -2,8 +2,25 @@ require_relative '<%= offsetFromRoot %>../node_modules/react-native/scripts/reac
require_relative '<%= offsetFromRoot %>../node_modules/@react-native-community/cli-platform-ios/native_modules' require_relative '<%= offsetFromRoot %>../node_modules/@react-native-community/cli-platform-ios/native_modules'
require_relative '<%= offsetFromRoot %>../node_modules/@nrwl/react-native/nx_post_install' require_relative '<%= offsetFromRoot %>../node_modules/@nrwl/react-native/nx_post_install'
platform :ios, '12.4' platform :ios, min_ios_version_supported
install! 'cocoapods', :deterministic_uuids => false prepare_react_native_project!
# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
#
# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
# ```js
# module.exports = {
# dependencies: {
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
# ```
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
use_frameworks! :linkage => linkage.to_sym
end
target '<%= className %>' do target '<%= className %>' do
config = use_native_modules! config = use_native_modules!
@ -16,14 +33,13 @@ target '<%= className %>' do
# Hermes is now enabled by default. Disable by setting this flag to false. # Hermes is now enabled by default. Disable by setting this flag to false.
# Upcoming versions of React Native may rely on get_default_flags(), but # Upcoming versions of React Native may rely on get_default_flags(), but
# we make it explicit here to aid in the React Native upgrade process. # we make it explicit here to aid in the React Native upgrade process.
# disabled hermes due to issue https://github.com/facebook/react-native/issues/34599 https://github.com/facebook/react-native/issues/34608 :hermes_enabled => flags[:hermes_enabled],
:hermes_enabled => false,
:fabric_enabled => flags[:fabric_enabled], :fabric_enabled => flags[:fabric_enabled],
# Enables Flipper. # Enables Flipper.
# #
# Note that if you have use_frameworks! enabled, Flipper will not work and # Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable the next line. # you should disable the next line.
:flipper_configuration => FlipperConfiguration.enabled, :flipper_configuration => flipper_config,
# An absolute path to your application root. # An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.." :app_path => "#{Pod::Config.instance.installation_root}/.."
) )

6
packages/react-native/src/generators/application/files/app/ios/__className__.xcodeproj/project.pbxproj.template
View File

@ -492,6 +492,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
@ -517,6 +518,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
@ -562,7 +564,7 @@
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
@ -633,7 +635,7 @@
COPY_PHASE_STRIP = YES; COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO; ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

8
packages/react-native/src/generators/application/files/app/ios/__className__.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

10
packages/react-native/src/generators/application/files/app/ios/__className__.xcworkspace/xcshareddata/contents.xcworkspacedata generated Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:<%= className %>.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>

6
packages/react-native/src/generators/application/files/app/ios/__className__/AppDelegate.h
View File

@ -1,8 +1,6 @@
#import <React/RCTBridgeDelegate.h> #import <RCTAppDelegate.h>
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
@interface AppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate> @interface AppDelegate : RCTAppDelegate
@property (nonatomic, strong) UIWindow *window;
@end @end

121
packages/react-native/src/generators/application/files/app/ios/__className__/AppDelegate.mm.template
View File

@ -1,85 +1,17 @@
#import "AppDelegate.h" #import "AppDelegate.h"
#import <React/RCTBridge.h>
#import <React/RCTBundleURLProvider.h> #import <React/RCTBundleURLProvider.h>
#import <React/RCTRootView.h>
#import <React/RCTAppSetupUtils.h>
#if RCT_NEW_ARCH_ENABLED
#import <React/CoreModulesPlugins.h>
#import <React/RCTCxxBridgeDelegate.h>
#import <React/RCTFabricSurfaceHostingProxyRootView.h>
#import <React/RCTSurfacePresenter.h>
#import <React/RCTSurfacePresenterBridgeAdapter.h>
#import <ReactCommon/RCTTurboModuleManager.h>
#import <react/config/ReactNativeConfig.h>
static NSString *const kRNConcurrentRoot = @"concurrentRoot";
@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
RCTTurboModuleManager *_turboModuleManager;
RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
facebook::react::ContextContainer::Shared _contextContainer;
}
@end
#endif
@implementation AppDelegate @implementation AppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{ {
RCTAppSetupPrepareApp(application); self.moduleName = @"<%= className %>";
// You can add your custom initial props in the dictionary below.
// They will be passed down to the ViewController used by React Native.
self.initialProps = @{};
RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; return [super application:application didFinishLaunchingWithOptions:launchOptions];
#if RCT_NEW_ARCH_ENABLED
_contextContainer = std::make_shared<facebook::react::ContextContainer const>();
_reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
_contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
_bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
#endif
NSDictionary *initProps = [self prepareInitialProps];
UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"<%= className %>", initProps);
if (@available(iOS 13.0, *)) {
rootView.backgroundColor = [UIColor systemBackgroundColor];
} else {
rootView.backgroundColor = [UIColor whiteColor];
}
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
UIViewController *rootViewController = [UIViewController new];
rootViewController.view = rootView;
self.window.rootViewController = rootViewController;
[self.window makeKeyAndVisible];
return YES;
}
/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
///
/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`.
- (BOOL)concurrentRootEnabled
{
// Switch this bool to turn on and off the concurrent root
return true;
}
- (NSDictionary *)prepareInitialProps
{
NSMutableDictionary *initProps = [NSMutableDictionary new];
#ifdef RCT_NEW_ARCH_ENABLED
initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]);
#endif
return initProps;
} }
- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
@ -91,43 +23,14 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
#endif #endif
} }
#if RCT_NEW_ARCH_ENABLED /// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
///
#pragma mark - RCTCxxBridgeDelegate /// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge /// @return: `true` if the `concurrentRoot` feature is enabled. Otherwise, it returns `false`.
- (BOOL)concurrentRootEnabled
{ {
_turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge return true;
delegate:self
jsInvoker:bridge.jsCallInvoker];
return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
} }
#pragma mark RCTTurboModuleManagerDelegate
- (Class)getModuleClassFromName:(const char *)name
{
return RCTCoreModulesClassProvider(name);
}
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
{
return nullptr;
}
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
initParams:
(const facebook::react::ObjCTurboModule::InitParams &)params
{
return nullptr;
}
- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
{
return RCTAppSetupDefaultModuleFromClass(moduleClass);
}
#endif
@end @end

4
packages/react-native/src/generators/application/files/app/ios/__className__/Info.plist.template
View File

@ -17,11 +17,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0</string> <string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1</string> <string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>

3
packages/react-native/src/generators/init/init.ts
View File

@ -10,9 +10,9 @@ import {
import { Schema } from './schema'; import { Schema } from './schema';
import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
import { addBabelInputs } from '@nrwl/js/src/utils/add-babel-inputs'; import { addBabelInputs } from '@nrwl/js/src/utils/add-babel-inputs';
import { jestInitGenerator } from '@nrwl/jest'; import { jestInitGenerator } from '@nrwl/jest';
import { detoxInitGenerator } from '@nrwl/detox'; import { detoxInitGenerator } from '@nrwl/detox';
import { babelPresetReactVersion } from '@nrwl/react/src/utils/versions';
import { import {
babelRuntimeVersion, babelRuntimeVersion,
@ -101,6 +101,7 @@ export function updateDependencies(host: Tree) {
'react-native-config': reactNativeConfigVersion, 'react-native-config': reactNativeConfigVersion,
'@react-native-async-storage/async-storage': '@react-native-async-storage/async-storage':
reactNativeAsyncStorageAsyncStorageVersion, reactNativeAsyncStorageAsyncStorageVersion,
'@babel/preset-react': babelPresetReactVersion,
...(isPnpm ...(isPnpm
? { ? {
'metro-config': metroVersion, // metro-config is used by metro.config.js 'metro-config': metroVersion, // metro-config is used by metro.config.js

27
packages/react-native/src/generators/init/lib/gitignore-entries.ts
View File

@ -1,6 +1,11 @@
// template from https://github.com/facebook/react-native/blob/main/template/_gitignore
export const gitIgnoreEntriesForReactNative = ` export const gitIgnoreEntriesForReactNative = `
# React Native # React Native
# OSX
#
.DS_Store
# Xcode # Xcode
# #
build/ build/
@ -19,7 +24,7 @@ DerivedData
*.hmap *.hmap
*.ipa *.ipa
*.xcuserstate *.xcuserstate
**/ios/.xcode.env.local ios/.xcode.env.local
# Android/IntelliJ # Android/IntelliJ
# #
@ -29,20 +34,16 @@ build/
local.properties local.properties
*.iml *.iml
*.hprof *.hprof
.cxx/
*.keystore
!debug.keystore
# node.js # node.js
# #
.yarn/
node_modules/ node_modules/
npm-debug.log npm-debug.log
yarn-error.log yarn-error.log
# BUCK
buck-out/
\.buckd/
*.keystore
!debug.keystore
# fastlane # fastlane
# #
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
@ -59,6 +60,12 @@ buck-out/
*.jsbundle *.jsbundle
# Ruby / CocoaPods # Ruby / CocoaPods
**/ios/Pods/ /ios/Pods/
**/vendor/bundle/ /vendor/bundle/
# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*
# testing
/coverage
`; `;

22
packages/react-native/src/generators/upgrade-native/upgrade-native.ts
View File

@ -3,7 +3,6 @@
* It would replace the Android and iOS folder entirely. * It would replace the Android and iOS folder entirely.
*/ */
import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
import { UpgradeNativeConfigureSchema } from './schema';
import { import {
convertNxGenerator, convertNxGenerator,
Tree, Tree,
@ -11,12 +10,13 @@ import {
GeneratorCallback, GeneratorCallback,
readProjectConfiguration, readProjectConfiguration,
} from '@nrwl/devkit'; } from '@nrwl/devkit';
import { join } from 'path'; import { existsSync } from 'fs';
import { createNativeFiles } from './lib/create-native-files';
import { existsSync, removeSync } from 'fs-extra';
import { runPodInstall } from '../../utils/pod-install-task'; import { runPodInstall } from '../../utils/pod-install-task';
import { runChmod } from '../../utils/chmod-task'; import { chmodAndroidGradlewFilesTask } from '../../utils/chmod-android-gradle-files';
import { createNativeFiles } from './lib/create-native-files';
import { UpgradeNativeConfigureSchema } from './schema';
export async function reactNativeUpgradeNativeGenerator( export async function reactNativeUpgradeNativeGenerator(
host: Tree, host: Tree,
@ -44,17 +44,9 @@ export async function reactNativeUpgradeNativeGenerator(
createNativeFiles(host, schema, appProjectRoot); createNativeFiles(host, schema, appProjectRoot);
const podInstallTask = runPodInstall(iosProjectRoot, schema.install); const podInstallTask = runPodInstall(iosProjectRoot, schema.install);
const chmodTaskGradlew = runChmod(join(androidProjectRoot, 'gradlew'), 0o775); const chmodTaskGradlew = chmodAndroidGradlewFilesTask(androidProjectRoot);
const chmodTaskGradlewBat = runChmod(
join(androidProjectRoot, 'gradlew.bat'),
0o775
);
return runTasksInSerial( return runTasksInSerial(podInstallTask, chmodTaskGradlew);
podInstallTask,
chmodTaskGradlew,
chmodTaskGradlewBat
);
} }
export default reactNativeUpgradeNativeGenerator; export default reactNativeUpgradeNativeGenerator;

21
packages/react-native/src/utils/chmod-android-gradle-files.ts Normal file
View File

@ -0,0 +1,21 @@
import { GeneratorCallback, logger } from '@nrwl/devkit';
import { chmodSync } from 'fs';
import { join } from 'path';
export function chmodAndroidGradlewFiles(androidFolder: string) {
chmodSync(join(androidFolder, 'gradlew'), 0o775);
chmodSync(join(androidFolder, 'gradlew.bat'), 0o775);
}
export function chmodAndroidGradlewFilesTask(
androidFolder: string
): GeneratorCallback {
return () => {
logger.info(`chmod android gradlew files under ${androidFolder}`);
try {
chmodAndroidGradlewFiles(androidFolder);
} catch {
throw new Error(`chmod failed gradlew file under ${androidFolder}`);
}
};
}

16
packages/react-native/src/utils/chmod-task.ts
View File

@ -1,16 +0,0 @@
import { chmodSync } from 'fs';
import { GeneratorCallback, logger } from '@nrwl/devkit';
export function runChmod(
file: string,
mode: number | string
): GeneratorCallback {
return () => {
logger.info(`chmod ${mode} ${file}`);
try {
chmodSync(file, mode);
} catch {
throw new Error(`chmod failed for ${file}`);
}
};
}

28
packages/react-native/src/utils/versions.ts
View File

@ -1,30 +1,30 @@
export const nxVersion = require('../../package.json').version; export const nxVersion = require('../../package.json').version;
export const reactNativeVersion = '0.70.6'; export const reactNativeVersion = '0.71.1';
export const typesReactNativeVersion = '0.70.6'; export const typesReactNativeVersion = '0.71.0';
export const typesNodeVersion = '16.11.7'; export const typesNodeVersion = '18.11.18';
export const metroVersion = '0.73.3'; export const metroVersion = '0.74.1';
export const reactNativeCommunityCli = '9.3.2'; export const reactNativeCommunityCli = '10.1.3';
export const reactNativeCommunityCliIos = '9.3.0'; export const reactNativeCommunityCliIos = '10.1.1';
export const reactNativeCommunityCliAndroid = '9.3.1'; export const reactNativeCommunityCliAndroid = '10.1.3';
export const reactVersion = '18.1.0'; export const reactVersion = '18.2.0';
export const reactDomVersion = '18.1.0'; export const reactDomVersion = '18.2.0';
export const reactTestRendererVersion = '18.1.0'; export const reactTestRendererVersion = '18.2.0';
export const typesReactVersion = '18.0.26'; export const typesReactVersion = '18.0.26';
export const reactNativeConfigVersion = '1.4.11'; export const reactNativeConfigVersion = '1.4.12';
export const reactNativeAsyncStorageAsyncStorageVersion = '1.17.11'; export const reactNativeAsyncStorageAsyncStorageVersion = '1.17.11';
export const testingLibraryReactNativeVersion = '11.5.0'; export const testingLibraryReactNativeVersion = '11.5.0';
export const testingLibraryJestNativeVersion = '5.3.0'; export const testingLibraryJestNativeVersion = '5.4.1';
export const jestReactNativeVersion = '18.0.0'; export const jestReactNativeVersion = '18.0.0';
export const reactNativeSvgTransformerVersion = '1.0.0'; export const reactNativeSvgTransformerVersion = '1.0.0';
export const reactNativeSvgVersion = '13.6.0'; export const reactNativeSvgVersion = '13.7.0';
export const babelRuntimeVersion = '7.20.1'; export const babelRuntimeVersion = '7.20.7';

8
yarn.lock
View File

@ -17522,10 +17522,10 @@ methods@~1.1.2:
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
metro-resolver@^0.73.3: metro-resolver@^0.74.1:
version "0.73.3" version "0.74.1"
resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.73.3.tgz#dc21ca03c8aeb0bc05fe4e8c318791e213bde9d7" resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.74.1.tgz#62c1313bf8ff02b86d6cdd9294306d718970caac"
integrity sha512-XbiZ22MaFFchaErNfqeW9ZPPRpiQEIylhtlja9/5QzNgAcAWbfIGY0Ok39XyVyWjX4Ab8YAwQUeCqyO48ojzZQ== integrity sha512-1Ju7bvUnmy1lmsYwhujWsP4qxBVfVF7CkKiUCRolUbyZzGgymyVGXVN5yEnbXXNHgBAOlr4+2KKYjoXzhXBo4g==
dependencies: dependencies:
absolute-path "^0.0.0" absolute-path "^0.0.0"