mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-19 06:10:56 +08:00
Merge branch 'master' of github.com:Akylas/NativeScript
# Conflicts: # package.json # packages/core/package.json # packages/core/ui/transition/slide-transition.android.ts
This commit is contained in:
Martin Guillon
130
package.json
130
package.json
@ -1,17 +1,17 @@
|
|||||||
{
|
{
|
||||||
"name": "nativescript",
|
"name": "nativescript",
|
||||||
"version": "8.0.1",
|
"version": "8.0.1",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"config": {
|
"config": {
|
||||||
"npm_alias": "npm"
|
"npm_alias": "npm"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"clean": "git clean -f -X -d",
|
"clean": "git clean -f -X -d",
|
||||||
"setup": "npm run clean && npm install",
|
"setup": "npm run clean && npm install",
|
||||||
"setup:yarn": "yarn run clean && yarn",
|
"setup:yarn": "yarn run clean && yarn",
|
||||||
"setup:pnpm": "pnpm run clean && pnpm install",
|
"setup:pnpm": "pnpm run clean && pnpm install",
|
||||||
"postinstall": "ts-patch install && husky install && nx run core:setup",
|
"postinstall": "ts-patch install && husky install && nx run core:setup",
|
||||||
"start": "nps",
|
"start": "nps",
|
||||||
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
|
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
|
||||||
"apps-automated:ios": "cd apps/automated && tns debug ios --no-hmr --emulator --env.testing",
|
"apps-automated:ios": "cd apps/automated && tns debug ios --no-hmr --emulator --env.testing",
|
||||||
"apps-automated:android": "cd apps/automated && tns debug android --no-hmr --emulator --env.testing",
|
"apps-automated:android": "cd apps/automated && tns debug android --no-hmr --emulator --env.testing",
|
||||||
@ -38,72 +38,72 @@
|
|||||||
"webpack:lint": "cd packages/webpack && eslint -c .eslintrc --ignore-pattern **/node_modules/** --ignore-pattern !packages/webpack/**",
|
"webpack:lint": "cd packages/webpack && eslint -c .eslintrc --ignore-pattern **/node_modules/** --ignore-pattern !packages/webpack/**",
|
||||||
"webpack:test": "cd packages/webpack && npm run tsc && npm run jasmine",
|
"webpack:test": "cd packages/webpack && npm run tsc && npm run jasmine",
|
||||||
"webpack:build": "cd packages/webpack npm run setup && mkdir -p ../../dist/packages && mv \"$(npm pack | tail -n 1)\" ../../dist/packages/nativescript-webpack.tgz"
|
"webpack:build": "cd packages/webpack npm run setup && mkdir -p ../../dist/packages && mv \"$(npm pack | tail -n 1)\" ../../dist/packages/nativescript-webpack.tgz"
|
||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/NativeScript/NativeScript.git"
|
"url": "https://github.com/NativeScript/NativeScript.git"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"nativescript-theme-core": "^1.0.4"
|
"nativescript-theme-core": "^1.0.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@nativescript/eslint-plugin": "0.0.1",
|
"@nativescript/eslint-plugin": "0.0.1",
|
||||||
"@nativescript/hook": "^2.0.0",
|
"@nativescript/hook": "^2.0.0",
|
||||||
"@nrwl/cli": "11.5.2",
|
"@nrwl/cli": "11.5.2",
|
||||||
"@nrwl/eslint-plugin-nx": "11.5.2",
|
"@nrwl/eslint-plugin-nx": "11.5.2",
|
||||||
"@nrwl/jest": "11.5.2",
|
"@nrwl/jest": "11.5.2",
|
||||||
"@nrwl/node": "11.5.2",
|
"@nrwl/node": "11.5.2",
|
||||||
"@nrwl/tao": "11.5.2",
|
"@nrwl/tao": "11.5.2",
|
||||||
"@nrwl/workspace": "11.5.2",
|
"@nrwl/workspace": "11.5.2",
|
||||||
"@nstudio/focus": "~11.1.0",
|
"@nstudio/focus": "~11.1.0",
|
||||||
"@nstudio/nps-i": "~1.1.0",
|
"@nstudio/nps-i": "~1.1.0",
|
||||||
"@prettier/plugin-xml": "^0.13.1",
|
"@prettier/plugin-xml": "^0.13.1",
|
||||||
"@types/chai": "^4.2.11",
|
"@types/chai": "^4.2.11",
|
||||||
"@types/jest": "~26.0.8",
|
"@types/jest": "~26.0.8",
|
||||||
"@types/mocha": "^7.0.2",
|
"@types/mocha": "^7.0.2",
|
||||||
"@types/node": "12.12.38",
|
"@types/node": "12.12.38",
|
||||||
"@typescript-eslint/eslint-plugin": "~4.16.0",
|
"@typescript-eslint/eslint-plugin": "~4.16.0",
|
||||||
"@typescript-eslint/parser": "~4.16.0",
|
"@typescript-eslint/parser": "~4.16.0",
|
||||||
"chai": "^4.2.0",
|
"chai": "^4.2.0",
|
||||||
"conventional-changelog-cli": "^2.1.1",
|
"conventional-changelog-cli": "^2.1.1",
|
||||||
"copyfiles": "^2.4.0",
|
"copyfiles": "^2.4.0",
|
||||||
"cpy-cli": "^3.1.1",
|
"cpy-cli": "^3.1.1",
|
||||||
"css": "^3.0.0",
|
"css": "^3.0.0",
|
||||||
"css-tree": "^1.0.0-alpha.39",
|
"css-tree": "^1.0.0-alpha.39",
|
||||||
"dotenv": "~8.2.0",
|
"dotenv": "~8.2.0",
|
||||||
"eslint": "~7.21.0",
|
"eslint": "~7.21.0",
|
||||||
"eslint-config-prettier": "8.1.0",
|
"eslint-config-prettier": "8.1.0",
|
||||||
"eslint-plugin-prettier": "^3.3.1",
|
"eslint-plugin-prettier": "^3.3.1",
|
||||||
"gonzales": "^1.0.7",
|
"gonzales": "^1.0.7",
|
||||||
"husky": "^5.1.3",
|
"husky": "^5.1.3",
|
||||||
"jest": "~26.2.2",
|
"jest": "~26.2.2",
|
||||||
"lint-staged": "^10.5.0",
|
"lint-staged": "^10.5.0",
|
||||||
"mocha": "^8.0.1",
|
"mocha": "^8.0.1",
|
||||||
"mocha-typescript": "^1.1.17",
|
"mocha-typescript": "^1.1.17",
|
||||||
"module-alias": "^2.2.2",
|
"module-alias": "^2.2.2",
|
||||||
"nativescript": "~7.2.0",
|
"nativescript": "~7.2.0",
|
||||||
"parse-css": "git+https://github.com/tabatkins/parse-css.git",
|
"parse-css": "git+https://github.com/tabatkins/parse-css.git",
|
||||||
"parserlib": "^1.1.1",
|
"parserlib": "^1.1.1",
|
||||||
"prettier": "~2.2.1",
|
"prettier": "~2.2.1",
|
||||||
"reduce-css-calc": "~2.1.7",
|
"reduce-css-calc": "~2.1.7",
|
||||||
"rimraf": "3.0.2",
|
"rimraf": "3.0.2",
|
||||||
"sass": "~1.32.8",
|
"sass": "~1.32.8",
|
||||||
"shady-css-parser": "^0.1.0",
|
"shady-css-parser": "^0.1.0",
|
||||||
"terser-webpack-plugin": "~3.0.6",
|
"terser-webpack-plugin": "~3.0.6",
|
||||||
"tree-kill": "^1.2.2",
|
"tree-kill": "^1.2.2",
|
||||||
"ts-jest": "26.4.0",
|
"ts-jest": "26.4.0",
|
||||||
"ts-node": "9.1.1",
|
"ts-node": "9.1.1",
|
||||||
"ts-patch": "^1.3.0",
|
"ts-patch": "^1.3.0",
|
||||||
"tslib": "2.1.0",
|
"tslib": "2.1.0",
|
||||||
"tslint": "6.1.3",
|
"tslint": "6.1.3",
|
||||||
"typescript": "~4.0.3",
|
"typescript": "~4.0.3",
|
||||||
"webpack": "~4.44.1",
|
"webpack": "~4.44.1",
|
||||||
"webpack-cli": "~3.3.12"
|
"webpack-cli": "~3.3.12"
|
||||||
},
|
},
|
||||||
"lint-staged": {
|
"lint-staged": {
|
||||||
"**/*": [
|
"**/*": [
|
||||||
"nx format:write --files"
|
"nx format:write --files"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -112,7 +112,6 @@ export class SlideTransition extends Transition {
|
|||||||
animator.setDuration(duration);
|
animator.setDuration(duration);
|
||||||
}
|
}
|
||||||
animator.setInterpolator(this.getCurve());
|
animator.setInterpolator(this.getCurve());
|
||||||
|
|
||||||
const animatorSet = new android.animation.AnimatorSet();
|
const animatorSet = new android.animation.AnimatorSet();
|
||||||
animatorSet.play(animator);
|
animatorSet.play(animator);
|
||||||
return animatorSet;
|
return animatorSet;
|
||||||
|
|||||||
Reference in New Issue
Block a user