diff --git a/apps/automated/package.json b/apps/automated/package.json index 82765a114..d9bd699f3 100644 --- a/apps/automated/package.json +++ b/apps/automated/package.json @@ -17,7 +17,7 @@ "@nativescript/android": "7.0.1", "@nativescript/ios": "7.2.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", - "typescript": "~4.0.0" + "typescript": "4.1.4" }, "gitHead": "c06800e52ee1a184ea2dffd12a6702aaa43be4e3", "readme": "NativeScript Application" diff --git a/apps/toolbox/package.json b/apps/toolbox/package.json index 6908ae7aa..d329073ad 100644 --- a/apps/toolbox/package.json +++ b/apps/toolbox/package.json @@ -14,6 +14,6 @@ "@nativescript/android": "7.0.1", "@nativescript/ios": "7.2.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", - "typescript": "~4.0.0" + "typescript": "4.1.4" } } diff --git a/apps/ui/package.json b/apps/ui/package.json index 36ea59cd5..05c1ee9ba 100644 --- a/apps/ui/package.json +++ b/apps/ui/package.json @@ -14,7 +14,7 @@ "@nativescript/android": "7.0.1", "@nativescript/ios": "7.2.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", - "typescript": "~4.0.0" + "typescript": "4.1.4" }, "gitHead": "8ab7726d1ee9991706069c1359c552e67ee0d1a4", "readme": "NativeScript Application", diff --git a/apps/ui/src/css/text-shadow-page.ts b/apps/ui/src/css/text-shadow-page.ts index 99fb5d8fc..28b809862 100644 --- a/apps/ui/src/css/text-shadow-page.ts +++ b/apps/ui/src/css/text-shadow-page.ts @@ -1,4 +1,4 @@ -import { EventData, TextBase } from '@nativescript/core'; +import { EventData, TextBase, parseCSSShadow } from '@nativescript/core'; // prettier-ignore const possibleValues = [ @@ -22,10 +22,10 @@ export function buttonTap(args: EventData) { let newIndex = currentIndex++ % possibleValues.length; let newValue = possibleValues[newIndex]; - lbl.textShadow = newValue; - btn.textShadow = newValue; - textField.textShadow = newValue; - textView.textShadow = newValue; + lbl.textShadow = parseCSSShadow(newValue); + btn.textShadow = parseCSSShadow(newValue); + textField.textShadow = parseCSSShadow(newValue); + textView.textShadow = parseCSSShadow(newValue); if (lbl.text === 'Change text') { lbl.text = btn.text = textField.text = textView.text = 'Text changed'; diff --git a/apps/ui/src/fonts-tests/all-fonts-page.ts b/apps/ui/src/fonts-tests/all-fonts-page.ts index 0913acc9f..6e9fd9c00 100644 --- a/apps/ui/src/fonts-tests/all-fonts-page.ts +++ b/apps/ui/src/fonts-tests/all-fonts-page.ts @@ -3,7 +3,7 @@ import { Page, NavigatedData } from '@nativescript/core/ui/page'; import { StackLayout } from '@nativescript/core/ui/layouts/stack-layout'; import { ScrollView } from '@nativescript/core/ui/scroll-view'; import { Label } from '@nativescript/core/ui/label'; -import { Enums } from '@nativescript/core'; +import { CoreTypes } from '@nativescript/core'; import * as typeUtils from '@nativescript/core/utils/types'; import { Color } from '@nativescript/core/color'; import { isIOS } from '@nativescript/core/platform'; diff --git a/apps/ui/src/image-view/mode-matrix-page.ts b/apps/ui/src/image-view/mode-matrix-page.ts index 0f6ed79c8..3c8fd998f 100644 --- a/apps/ui/src/image-view/mode-matrix-page.ts +++ b/apps/ui/src/image-view/mode-matrix-page.ts @@ -1,4 +1,4 @@ -import { Image, Enums } from '@nativescript/core'; +import { Image, CoreTypes } from '@nativescript/core'; import { GridLayout } from '@nativescript/core/ui/layouts/grid-layout'; import { Color } from '@nativescript/core/color'; import * as imageSource from '@nativescript/core/image-source'; diff --git a/apps/ui/src/image-view/stretch-modes-page.ts b/apps/ui/src/image-view/stretch-modes-page.ts index 85c2184eb..a18e2fed0 100644 --- a/apps/ui/src/image-view/stretch-modes-page.ts +++ b/apps/ui/src/image-view/stretch-modes-page.ts @@ -1,4 +1,4 @@ -import { Image, Enums } from '@nativescript/core'; +import { Image, CoreTypes } from '@nativescript/core'; import { Label } from '@nativescript/core/ui/label'; import { LayoutBase } from '@nativescript/core/ui/layouts/layout-base'; diff --git a/apps/ui/src/layouts-percent/stack-page.ts b/apps/ui/src/layouts-percent/stack-page.ts index 4098247fb..1d465a60f 100644 --- a/apps/ui/src/layouts-percent/stack-page.ts +++ b/apps/ui/src/layouts-percent/stack-page.ts @@ -1,4 +1,4 @@ -import { Enums } from '@nativescript/core'; +import { CoreTypes } from '@nativescript/core'; import * as pageModule from '@nativescript/core/ui/page'; import * as model from './myview'; diff --git a/apps/ui/src/layouts-percent/wrap-page.ts b/apps/ui/src/layouts-percent/wrap-page.ts index 9ff311b3f..5914f5e8f 100644 --- a/apps/ui/src/layouts-percent/wrap-page.ts +++ b/apps/ui/src/layouts-percent/wrap-page.ts @@ -1,4 +1,4 @@ -import { Enums } from '@nativescript/core'; +import { CoreTypes } from '@nativescript/core'; import * as pageModule from '@nativescript/core/ui/page'; import * as model from './myview'; diff --git a/apps/ui/src/layouts/stack-page.ts b/apps/ui/src/layouts/stack-page.ts index f1e7ded8a..66fb86d42 100644 --- a/apps/ui/src/layouts/stack-page.ts +++ b/apps/ui/src/layouts/stack-page.ts @@ -1,4 +1,4 @@ -import { Enums } from '@nativescript/core'; +import { CoreTypes } from '@nativescript/core'; import * as pageModule from '@nativescript/core/ui/page'; import * as model from './myview'; diff --git a/apps/ui/src/layouts/wrap-page.ts b/apps/ui/src/layouts/wrap-page.ts index d8f1a33d5..5aa7b853d 100644 --- a/apps/ui/src/layouts/wrap-page.ts +++ b/apps/ui/src/layouts/wrap-page.ts @@ -1,4 +1,4 @@ -import { Enums } from '@nativescript/core'; +import { CoreTypes } from '@nativescript/core'; import * as pageModule from '@nativescript/core/ui/page'; import * as model from './myview'; diff --git a/package.json b/package.json index 71473069e..ee222d61b 100644 --- a/package.json +++ b/package.json @@ -20,30 +20,30 @@ "nativescript-theme-core": "^1.0.4" }, "devDependencies": { - "@nativescript/eslint-plugin": "0.0.1", + "@nativescript/eslint-plugin": "~0.0.4", "@nativescript/hook": "^2.0.0", - "@nrwl/cli": "11.5.2", - "@nrwl/eslint-plugin-nx": "11.5.2", - "@nrwl/jest": "11.5.2", - "@nrwl/node": "11.5.2", - "@nrwl/tao": "11.5.2", - "@nrwl/workspace": "11.5.2", + "@nrwl/cli": "12.0.8", + "@nrwl/eslint-plugin-nx": "12.0.8", + "@nrwl/jest": "12.0.8", + "@nrwl/node": "12.0.8", + "@nrwl/tao": "12.0.8", + "@nrwl/workspace": "12.0.8", "@nstudio/focus": "~11.1.0", "@nstudio/nps-i": "~1.1.0", "@prettier/plugin-xml": "^0.13.1", "@types/chai": "^4.2.11", "@types/jest": "~26.0.8", "@types/mocha": "^7.0.2", - "@types/node": "12.12.38", - "@typescript-eslint/eslint-plugin": "~4.16.0", - "@typescript-eslint/parser": "~4.16.0", + "@types/node": "14.14.33", + "@typescript-eslint/eslint-plugin": "4.19.0", + "@typescript-eslint/parser": "4.19.0", "chai": "^4.2.0", "conventional-changelog-cli": "^2.1.1", "copyfiles": "^2.4.0", "css": "^3.0.0", "css-tree": "^1.0.0-alpha.39", - "dotenv": "~8.2.0", - "eslint": "~7.21.0", + "dotenv": "8.2.0", + "eslint": "7.22.0", "eslint-config-prettier": "8.1.0", "eslint-plugin-prettier": "^3.3.1", "gonzales": "^1.0.7", @@ -66,7 +66,7 @@ "ts-node": "9.1.1", "ts-patch": "^1.3.0", "tslint": "6.1.3", - "typescript": "~4.0.3", + "typescript": "4.1.4", "webpack": "~4.44.1", "webpack-cli": "~3.3.12" }, diff --git a/packages/core/file-system/index.ts b/packages/core/file-system/index.ts index 487ec4e8c..574682378 100644 --- a/packages/core/file-system/index.ts +++ b/packages/core/file-system/index.ts @@ -74,7 +74,7 @@ export class FileSystemEntity { this.removeSync(localError); if (!hasError) { - resolve(); + resolve(true); } }); } @@ -108,7 +108,7 @@ export class FileSystemEntity { this.renameSync(newName, localError); if (!hasError) { - resolve(); + resolve(true); } }); } @@ -357,7 +357,7 @@ export class File extends FileSystemEntity { .writeTextAsync(this.path, content, encoding) .then( () => { - resolve(); + resolve(true); this._locked = false; }, (error) => { @@ -434,7 +434,7 @@ export class Folder extends FileSystemEntity { this.clearSync(onError); if (!hasError) { - resolve(); + resolve(true); } }); } diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 30a04d118..b8697e184 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -99,6 +99,6 @@ "nyc": "^15.1.0", "proxyquire": "~2.1.0", "source-map-support": "^0.5.13", - "typescript": "~4.0.0" + "typescript": "4.1.4" } }