javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into tab-styles-fixes

Browse Source
This commit is contained in:
Alexander Vakrilov
2020-02-05 16:26:39 +02:00
committed by GitHub
parent 2dd3bb203a 9d59fc031f
commit 2a5b1f4e12
6 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/generate-barrel-dts.sh
View File

@@ -13,6 +13,8 @@ DIST=dist;
ROOT_DIR=$(cd `dirname $0` && pwd)/..; ROOT_DIR=$(cd `dirname $0` && pwd)/..;
cd "$ROOT_DIR" cd "$ROOT_DIR"
# Aways execute npx tsc from repo root to use the local typescript
npx tsc -v
npx tsc -p nativescript-core/tsconfig.barrels.json npx tsc -p nativescript-core/tsconfig.barrels.json
FROM="temp/dts-out" FROM="temp/dts-out"

9
build/pack-compat.sh
View File

@@ -11,12 +11,15 @@ set -e
## Pack tns-core-modules ## Pack tns-core-modules
( (
cd "dist/tns-core-modules"
echo 'Run tsc ...' # Aways execute npx tsc from repo root to use the local typescript
npx tsc echo 'TypeScript transpile...'
npx tsc -v
npx tsc -p "dist/tns-core-modules"
echo 'NPM packing ...' echo 'NPM packing ...'
cd "dist/tns-core-modules"
TGZ="$(npm pack)" TGZ="$(npm pack)"
mv "$TGZ" "../$TGZ" mv "$TGZ" "../$TGZ"
) )

7
build/prepare-core.sh
View File

@@ -65,11 +65,14 @@ mkdir -p "$DIST"
npx ncp README.md "$DIST"/"$PACKAGE"/README.md npx ncp README.md "$DIST"/"$PACKAGE"/README.md
( (
echo 'TypeScript transpile...'
cd "$DIST/$PACKAGE" cd "$DIST/$PACKAGE"
npm install npm install
npx tsc
) )
# Aways execute npx tsc from repo root to use the local typescript
echo 'TypeScript transpile...'
npx tsc -v
npx tsc -p "$DIST/$PACKAGE"
echo "Clearing typescript definitions from private APIs..." echo "Clearing typescript definitions from private APIs..."
npx ts-node --project ./build/tsconfig.json build/clear-private-definitions "$DIST/$PACKAGE" npx ts-node --project ./build/tsconfig.json build/clear-private-definitions "$DIST/$PACKAGE"

2
nativescript-core/ui/frame/fragment.transitions.android.ts
View File

@@ -145,7 +145,7 @@ export function _setAndroidFragmentTransitions(
if (currentFragmentNeedsDifferentAnimation) { if (currentFragmentNeedsDifferentAnimation) {
setupCurrentFragmentExplodeTransition(navigationTransition, currentEntry); setupCurrentFragmentExplodeTransition(navigationTransition, currentEntry);
} }
} else if (name === "flip") { } else if (name.indexOf("flip") === 0) {
const direction = name.substr("flip".length) || "right"; //Extract the direction from the string const direction = name.substr("flip".length) || "right"; //Extract the direction from the string
const flipTransition = new FlipTransition(direction, navigationTransition.duration, navigationTransition.curve); const flipTransition = new FlipTransition(direction, navigationTransition.duration, navigationTransition.curve);

2
package.json
View File

@@ -36,7 +36,7 @@
"tslint": "^5.4.3", "tslint": "^5.4.3",
"typedoc": "^0.13.0", "typedoc": "^0.13.0",
"typedoc-plugin-external-module-name": "git://github.com/PanayotCankov/typedoc-plugin-external-module-name.git#with-js", "typedoc-plugin-external-module-name": "git://github.com/PanayotCankov/typedoc-plugin-external-module-name.git#with-js",
"typescript": "^3.1.6" "typescript": "^3.7.5"
}, },
"scripts": { "scripts": {
"setup": "npm run build-core && npm run build-compat && npm run setup-link", "setup": "npm run build-core && npm run build-compat && npm run setup-link",

2
tns-platform-declarations/package.json
View File

@@ -32,6 +32,6 @@
}, },
"homepage": "https://github.com/NativeScript/NativeScript#readme", "homepage": "https://github.com/NativeScript/NativeScript#readme",
"devDependencies": { "devDependencies": {
"typescript": "^3.1.6" "typescript": "^3.7.5"
} }
} }