Skip to content

Commit c200152

Browse files
edusperoniedusperoni
committed
chore: improve task flow for native core deps
1 parent a703d9a commit c200152

File tree

9 files changed

+81
-56
lines changed

9 files changed

+81
-56
lines changed

‎packages/core/project.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@
2424
"verbose": true
2525
}
2626
},
27+
"copy-native-deps": {
28+
"dependsOn": ["winter-cg:build", "ui-mobile-base:build"],
29+
"inputs": ["{workspaceRoot}/dist/packages/winter-cg/platforms/**/*", "{workspaceRoot}/dist/packages/ui-mobile-base/platforms/**/*"],
30+
"outputs": ["{projectRoot}/platforms/android/winter_cg-release.aar", "{projectRoot}/platforms/android/widgets-release.aar"],
31+
"executor": "nx:run-commands",
32+
"options": {
33+
"commands": ["cp -R dist/packages/winter-cg/platforms/* packages/core/platforms", "cp -R dist/packages/ui-mobile-base/platforms/* packages/core/platforms"],
34+
"cwd": ".",
35+
"parallel": false
36+
}
37+
},
2738
"build": {
2839
"executor": "nx:run-commands",
2940
"inputs": ["default", "^production"],

‎packages/ui-mobile-base/build.android.sh

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,34 @@ set -e
55

66
echo "Use dumb gradle terminal"
77
export TERM=dumb
8+
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
89

9-
rm -rf dist/package/platforms/android || true
10-
mkdir -p dist/package/platforms/android
10+
OUTDIR=$SCRIPT_DIR/../../dist/packages/ui-mobile-base
11+
12+
rm -rf $OUTDIR/platforms/android || true
13+
mkdir -p $OUTDIR/platforms/android
1114

1215
echo "Build android"
1316
cd android
1417
./gradlew --quiet assembleRelease
1518
cd ..
16-
cp android/widgets/build/outputs/aar/widgets-release.aar dist/package/platforms/android/widgets-release.aar
19+
cp android/widgets/build/outputs/aar/widgets-release.aar $OUTDIR/platforms/android/widgets-release.aar
1720

1821
if [ "$1" ]
1922
then
2023
echo "Suffix package.json's version with tag: $1"
21-
sed -i.bak 's/\(\"version\"\:[[:space:]]*\"[^\"]*\)\"/\1-'$1'"/g' ./dist/package/package.json
24+
sed -i.bak 's/\(\"version\"\:[[:space:]]*\"[^\"]*\)\"/\1-'$1'"/g' ./$OUTDIR/package.json
2225
fi
2326

2427
if [ "$SKIP_PACK" ]
2528
then
2629
echo "SKIP pack"
2730
else
2831
echo "Copy NPM artefacts"
29-
cp .npmignore LICENSE README.md package.json dist/package
32+
cp .npmignore LICENSE README.md package.json $OUTDIR
3033
echo "NPM pack"
31-
cd dist/package
32-
PACKAGE="$(npm pack)"
33-
cd ../..
34-
mv dist/package/$PACKAGE dist/$PACKAGE
34+
cd $OUTDIR
35+
cd ..
36+
PACKAGE="$(npm pack $OUTDIR)"
3537
echo "Output: dist/$PACKAGE"
3638
fi

‎packages/ui-mobile-base/build.ios.sh

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,39 @@ set -e
55

66
echo "Use dumb terminal"
77
export TERM=dumb
8+
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
89

9-
rm -rf dist/package/platforms/ios || true
10-
mkdir -p dist/package/platforms/ios
10+
OUTDIR=$SCRIPT_DIR/../../dist/packages/ui-mobile-base
11+
12+
rm -rf $OUTDIR/platforms/ios || true
13+
mkdir -p $OUTDIR/platforms/ios
1114

1215
echo "Build iOS"
1316

1417
cd ios
1518
./build.sh
1619
cd ..
17-
echo "Copy ios/TNSWidgets/build/*.xcframework dist/package/platforms/ios"
20+
echo "Copy ios/TNSWidgets/build/*.xcframework $OUTDIR/platforms/ios"
1821

19-
cp -R ios/TNSWidgets/build/TNSWidgets.xcframework dist/package/platforms/ios
22+
cp -R ios/TNSWidgets/build/TNSWidgets.xcframework $OUTDIR/platforms/ios
2023

21-
# cp ios/TNSWidgets/build/*.framework.dSYM.zip dist/package/platforms/ios
24+
# cp ios/TNSWidgets/build/*.framework.dSYM.zip $OUTDIR/platforms/ios
2225

2326
if [ "$1" ]
2427
then
2528
echo "Suffix package.json's version with tag: $1"
26-
sed -i.bak 's/\(\"version\"\:[[:space:]]*\"[^\"]*\)\"/\1-'$1'"/g' ./dist/package/package.json
29+
sed -i.bak 's/\(\"version\"\:[[:space:]]*\"[^\"]*\)\"/\1-'$1'"/g' $OUTDIR/package.json
2730
fi
2831

2932
if [ "$SKIP_PACK" ]
3033
then
3134
echo "SKIP pack"
3235
else
3336
echo "Copy NPM artifacts"
34-
cp .npmignore LICENSE README.md package.json dist/package
37+
cp .npmignore LICENSE README.md package.json $OUTDIR
3538
echo "NPM pack"
36-
cd dist/package
37-
PACKAGE="$(npm pack)"
38-
cd ../..
39-
mv dist/package/$PACKAGE dist/$PACKAGE
39+
cd $OUTDIR
40+
cd ..
41+
PACKAGE="$(npm pack $OUTDIR)"
4042
echo "Output: dist/$PACKAGE"
4143
fi

‎packages/ui-mobile-base/build.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@ set -e
66

77
echo "Use dumb gradle terminal"
88
export TERM=dumb
9+
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
10+
11+
OUTDIR=$SCRIPT_DIR/../../dist/packages/ui-mobile-base
912

1013
echo "Clean dist"
11-
rm -rf dist
14+
rm -rf $OUTDIR
1215

1316
export SKIP_PACK=true
1417
./build.android.sh
1518
./build.ios.sh
1619

1720
echo "Copy NPM artifacts"
18-
cp .npmignore README.md package.json dist/package
19-
cp ../../LICENSE dist/package
21+
cp .npmignore README.md package.json $OUTDIR
22+
cp ../../LICENSE $OUTDIR
2023

2124

2225
if [ "$1" ]
@@ -26,9 +29,7 @@ then
2629
fi
2730

2831
echo "NPM pack"
29-
cd dist/package
30-
PACKAGE="$(npm pack)"
31-
cd ../..
32-
mv dist/package/$PACKAGE dist/$PACKAGE
32+
cd $OUTDIR/..
33+
PACKAGE="$(npm pack $OUTDIR)"
3334
echo "Output: dist/$PACKAGE"
3435

‎packages/ui-mobile-base/project.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
"targets": {
88
"build": {
99
"executor": "nx:run-commands",
10+
"inputs": ["default", "!{projectRoot}/android/.gradle/**/*", "!{projectRoot}/android/*/build/**/*", "!{projectRoot}/ios/*/build/**/*"],
11+
"outputs": ["{workspaceRoot}/dist/packages/ui-mobile-base"],
1012
"options": {
11-
"commands": ["./build.sh", "cp -R dist/package/platforms/* ../../packages/core/platforms"],
13+
"commands": ["./build.sh"],
1214
"cwd": "packages/ui-mobile-base",
1315
"parallel": false
1416
}

‎packages/winter-cg/build.android.sh

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,34 @@ set -e
55

66
echo "Use dumb gradle terminal"
77
export TERM=dumb
8+
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
89

9-
rm -rf dist/package/platforms/android || true
10-
mkdir -p dist/package/platforms/android
10+
OUTDIR=$SCRIPT_DIR/../../dist/packages/winter-cg
11+
12+
rm -rf $OUTDIR/platforms/android || true
13+
mkdir -p $OUTDIR/platforms/android
1114

1215
echo "Build android"
1316
cd android
1417
./gradlew --quiet assembleRelease
1518
cd ..
16-
cp android/winter_cg/build/outputs/aar/winter_cg-release.aar dist/package/platforms/android/winter_cg-release.aar
19+
cp android/winter_cg/build/outputs/aar/winter_cg-release.aar $OUTDIR/platforms/android/winter_cg-release.aar
1720

1821
if [ "$1" ]
1922
then
2023
echo "Suffix package.json's version with tag: $1"
21-
sed -i.bak 's/\(\"version\"\:[[:space:]]*\"[^\"]*\)\"/\1-'$1'"/g' ./dist/package/package.json
24+
sed -i.bak 's/\(\"version\"\:[[:space:]]*\"[^\"]*\)\"/\1-'$1'"/g' ./$OUTDIR/package.json
2225
fi
2326

2427
if [ "$SKIP_PACK" ]
2528
then
2629
echo "SKIP pack"
2730
else
2831
echo "Copy NPM artefacts"
29-
cp .npmignore LICENSE README.md package.json dist/package
32+
cp .npmignore LICENSE README.md package.json $OUTDIR
3033
echo "NPM pack"
31-
cd dist/package
32-
PACKAGE="$(npm pack)"
33-
cd ../..
34-
mv dist/package/$PACKAGE dist/$PACKAGE
34+
cd $OUTDIR
35+
cd ..
36+
PACKAGE="$(npm pack $OUTDIR)"
3537
echo "Output: dist/$PACKAGE"
3638
fi

‎packages/winter-cg/build.ios.sh

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,39 @@ set -e
55

66
echo "Use dumb terminal"
77
export TERM=dumb
8+
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
89

9-
rm -rf dist/package/platforms/ios || true
10-
mkdir -p dist/package/platforms/ios
10+
OUTDIR=$SCRIPT_DIR/../../dist/packages/winter-cg
11+
12+
rm -rf $OUTDIR/platforms/ios || true
13+
mkdir -p $OUTDIR/platforms/ios
1114

1215
echo "Build iOS"
1316

1417
cd ios
1518
./build.sh
1619
cd ..
17-
echo "Copy ios/NSCWinterCG/build/*.xcframework dist/package/platforms/ios"
20+
echo "Copy ios/NSCWinterCG/build/*.xcframework $OUTDIR/platforms/ios"
1821

19-
cp -R ios/NSCWinterCG/build/NSCWinterCG.xcframework dist/package/platforms/ios
22+
cp -R ios/NSCWinterCG/build/NSCWinterCG.xcframework $OUTDIR/platforms/ios
2023

21-
# cp ios/NSCWinterCG/build/*.framework.dSYM.zip dist/package/platforms/ios
24+
# cp ios/NSCWinterCG/build/*.framework.dSYM.zip $OUTDIR/platforms/ios
2225

2326
if [ "$1" ]
2427
then
2528
echo "Suffix package.json's version with tag: $1"
26-
sed -i.bak 's/\(\"version\"\:[[:space:]]*\"[^\"]*\)\"/\1-'$1'"/g' ./dist/package/package.json
29+
sed -i.bak 's/\(\"version\"\:[[:space:]]*\"[^\"]*\)\"/\1-'$1'"/g' $OUTDIR/package.json
2730
fi
2831

2932
if [ "$SKIP_PACK" ]
3033
then
3134
echo "SKIP pack"
3235
else
3336
echo "Copy NPM artifacts"
34-
cp .npmignore LICENSE README.md package.json dist/package
37+
cp .npmignore LICENSE README.md package.json $OUTDIR
3538
echo "NPM pack"
36-
cd dist/package
37-
PACKAGE="$(npm pack)"
38-
cd ../..
39-
mv dist/package/$PACKAGE dist/$PACKAGE
39+
cd $OUTDIR
40+
cd ..
41+
PACKAGE="$(npm pack $OUTDIR)"
4042
echo "Output: dist/$PACKAGE"
4143
fi

‎packages/winter-cg/build.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@ set -e
66

77
echo "Use dumb gradle terminal"
88
export TERM=dumb
9+
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
10+
11+
OUTDIR=$SCRIPT_DIR/../../dist/packages/winter-cg
912

1013
echo "Clean dist"
11-
rm -rf dist
14+
rm -rf $OUTDIR
1215

1316
export SKIP_PACK=true
1417
./build.android.sh
1518
./build.ios.sh
1619

1720
echo "Copy NPM artifacts"
18-
cp .npmignore README.md package.json dist/package
19-
cp ../../LICENSE dist/package
21+
cp .npmignore README.md package.json $OUTDIR
22+
cp ../../LICENSE $OUTDIR
2023

2124

2225
if [ "$1" ]
@@ -26,9 +29,7 @@ then
2629
fi
2730

2831
echo "NPM pack"
29-
cd dist/package
30-
PACKAGE="$(npm pack)"
31-
cd ../..
32-
mv dist/package/$PACKAGE dist/$PACKAGE
32+
cd $OUTDIR/..
33+
PACKAGE="$(npm pack $OUTDIR)"
3334
echo "Output: dist/$PACKAGE"
3435

‎packages/winter-cg/project.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
"targets": {
88
"build": {
99
"executor": "nx:run-commands",
10+
"outputs": ["{workspaceRoot}/dist/packages/winter-cg"],
11+
"inputs": ["default", "!{projectRoot}/android/.gradle/**/*", "!{projectRoot}/android/*/build/**/*", "!{projectRoot}/ios/*/build/**/*"],
1012
"options": {
11-
"commands": ["./build.sh", "cp -R dist/package/platforms/* ../../packages/core/platforms"],
13+
"commands": ["./build.sh"],
1214
"cwd": "packages/winter-cg",
1315
"parallel": false
1416
}

0 commit comments

Comments
 (0)