diff --git a/build/generate-barrel-dts.sh b/build/generate-barrel-dts.sh index 36e711e0d..03df87383 100755 --- a/build/generate-barrel-dts.sh +++ b/build/generate-barrel-dts.sh @@ -13,6 +13,8 @@ DIST=dist; ROOT_DIR=$(cd `dirname $0` && pwd)/..; 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 FROM="temp/dts-out" diff --git a/build/pack-compat.sh b/build/pack-compat.sh index aec8378c2..538aec46f 100755 --- a/build/pack-compat.sh +++ b/build/pack-compat.sh @@ -11,12 +11,15 @@ set -e ## Pack tns-core-modules ( - cd "dist/tns-core-modules" - echo 'Run tsc ...' - npx tsc + # Aways execute npx tsc from repo root to use the local typescript + echo 'TypeScript transpile...' + npx tsc -v + npx tsc -p "dist/tns-core-modules" + echo 'NPM packing ...' + cd "dist/tns-core-modules" TGZ="$(npm pack)" mv "$TGZ" "../$TGZ" ) \ No newline at end of file diff --git a/build/prepare-core.sh b/build/prepare-core.sh index f564093c1..041b2d541 100755 --- a/build/prepare-core.sh +++ b/build/prepare-core.sh @@ -65,11 +65,14 @@ mkdir -p "$DIST" npx ncp README.md "$DIST"/"$PACKAGE"/README.md ( - echo 'TypeScript transpile...' cd "$DIST/$PACKAGE" 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..." npx ts-node --project ./build/tsconfig.json build/clear-private-definitions "$DIST/$PACKAGE" diff --git a/nativescript-core/ui/frame/fragment.transitions.android.ts b/nativescript-core/ui/frame/fragment.transitions.android.ts index 6b024cd47..879c4d4a1 100644 --- a/nativescript-core/ui/frame/fragment.transitions.android.ts +++ b/nativescript-core/ui/frame/fragment.transitions.android.ts @@ -145,7 +145,7 @@ export function _setAndroidFragmentTransitions( if (currentFragmentNeedsDifferentAnimation) { 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 flipTransition = new FlipTransition(direction, navigationTransition.duration, navigationTransition.curve); diff --git a/package.json b/package.json index 72ecee0d9..ad760437e 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "tslint": "^5.4.3", "typedoc": "^0.13.0", "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": { "setup": "npm run build-core && npm run build-compat && npm run setup-link", diff --git a/tns-platform-declarations/package.json b/tns-platform-declarations/package.json index db262bbba..0cde27773 100644 --- a/tns-platform-declarations/package.json +++ b/tns-platform-declarations/package.json @@ -32,6 +32,6 @@ }, "homepage": "https://github.com/NativeScript/NativeScript#readme", "devDependencies": { - "typescript": "^3.1.6" + "typescript": "^3.7.5" } }