Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions .github/workflows/microsoft-test-react-native-macos-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ jobs:
run: yarn install

- name: Build community CLI plugin
run: yarn build
run: |
yarn build
# yarn build rewrites package.json exports; restore them
git checkout -- packages/*/package.json

- name: Build react-native-macos-init
working-directory: packages/react-native-macos-init
Expand All @@ -47,11 +50,21 @@ jobs:
npx --yes @react-native-community/cli init testcli --version ${{ steps.rn-version.outputs.version }}
working-directory: ${{ runner.temp }}

- name: Pack local react-native-macos
working-directory: packages/react-native
run: |
set -eox pipefail
# Use a tarball instead of a direct path to avoid symlinks
yarn pack -o ${{ runner.temp }}/react-native-macos.tgz

- name: Install local react-native-macos
working-directory: ${{ runner.temp }}/testcli
run: |
set -eox pipefail
npm install ${{ github.workspace }}/packages/react-native
npm install ${{ runner.temp }}/react-native-macos.tgz
# yarn pack strips execute bits from shell scripts.
# publishConfig.executableFiles could fix this but doesn't support globs.
find node_modules/react-native-macos/scripts -name '*.sh' -exec chmod +x {} +

- name: Apply macOS template
working-directory: ${{ runner.temp }}/testcli
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@
"rn-get-polyfills.js",
"scripts/replace-rncore-version.js",
"scripts/bundle.js",
"scripts/cocoapods",
"scripts/codegen",
"scripts/cocoapods/**",
"scripts/codegen/**",
"scripts/compose-source-maps.js",
"scripts/find-node-for-xcode.sh",
"scripts/generate-codegen-artifacts.js",
Expand All @@ -135,7 +135,7 @@
"scripts/xcode/ccache.conf",
"scripts/xcode/with-environment.sh",
"sdks/.hermesversion",
"sdks/hermes-engine",
"sdks/hermes-engine/**",
"sdks/hermesc",
"settings.gradle.kts",
"src",
Expand Down
5 changes: 0 additions & 5 deletions packages/react-native/react-native.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,8 @@ try {
// [macOS
let apple;
try {
const iosPath = require.resolve('@react-native-community/cli-platform-ios', {
paths: [process.cwd()],
});
// $FlowFixMe[untyped-import]
apple = findCommunityPlatformPackage(
'@react-native-community/cli-platform-apple',
iosPath,
);
} catch {
if (verbose) {
Expand Down
Loading