From 7c60735d14c17196c5eff2104432af5ceeda6e23 Mon Sep 17 00:00:00 2001 From: Igor Randjelovic Date: Tue, 16 Mar 2021 17:37:57 +0100 Subject: [PATCH] chore: cleanup background handling --- apps/automated/.npmrc | 1 + apps/toolbox/.npmrc | 1 + apps/toolbox/package.json | 6 +- apps/toolbox/src/main-page.xml | 1 + apps/toolbox/src/pages/css-playground.ts | 41 +++++++++++++ apps/toolbox/src/pages/css-playground.xml | 19 ++++++ apps/toolbox/src/pages/root-layout.ts | 3 +- apps/ui/.npmrc | 1 + apps/ui/src/css/text-shadow-page.ts | 4 +- apps/ui/src/css/text-shadow-page.xml | 2 +- .../platforms/android/widgets-release.aar | Bin 219791 -> 219757 bytes packages/core/ui/styling/background-common.ts | 24 ++++++++ .../core/ui/styling/background.android.ts | 17 ++++-- packages/core/ui/styling/background.d.ts | 1 + packages/core/ui/styling/background.ios.ts | 13 ++++- packages/core/ui/text-base/index.android.ts | 8 ++- packages/core/ui/text-base/index.ios.ts | 17 +++--- .../lib/android/org.nativescript.widgets.d.ts | 1 - .../java/org/nativescript/widgets/Utils.java | 55 +++++++++++------- packages/webpack/jasmine-config/reporter.ts | 2 + packages/webpack/package.json | 8 +-- 21 files changed, 174 insertions(+), 51 deletions(-) create mode 100644 apps/automated/.npmrc create mode 100644 apps/toolbox/.npmrc create mode 100644 apps/toolbox/src/pages/css-playground.ts create mode 100644 apps/toolbox/src/pages/css-playground.xml create mode 100644 apps/ui/.npmrc diff --git a/apps/automated/.npmrc b/apps/automated/.npmrc new file mode 100644 index 000000000..521a9f7c0 --- /dev/null +++ b/apps/automated/.npmrc @@ -0,0 +1 @@ +legacy-peer-deps=true diff --git a/apps/toolbox/.npmrc b/apps/toolbox/.npmrc new file mode 100644 index 000000000..521a9f7c0 --- /dev/null +++ b/apps/toolbox/.npmrc @@ -0,0 +1 @@ +legacy-peer-deps=true diff --git a/apps/toolbox/package.json b/apps/toolbox/package.json index b48c530fa..179f3f333 100644 --- a/apps/toolbox/package.json +++ b/apps/toolbox/package.json @@ -7,13 +7,13 @@ "url": "https://github.com/NativeScript/NativeScript.git" }, "dependencies": { - "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core", - "@nativescript/core": "file:../../packages/core" + "@nativescript/core": "file:../../packages/core", + "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core" }, "devDependencies": { "@nativescript/android": "7.0.1", "@nativescript/ios": "7.2.0", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", - "typescript": "file:../../node_modules/typescript" + "typescript": "4.0.7" } } diff --git a/apps/toolbox/src/main-page.xml b/apps/toolbox/src/main-page.xml index c5a28ba84..4701aa24a 100644 --- a/apps/toolbox/src/main-page.xml +++ b/apps/toolbox/src/main-page.xml @@ -10,6 +10,7 @@