diff --git a/.gitignore b/.gitignore index c29b090ad0..d4301c9280 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ apps/**/*/*.map apps/**/*/platforms apps/**/*/webpack.*.js *.tgz +.npmrc # System Files .DS_Store diff --git a/apps/automated/package.json b/apps/automated/package.json index 414312b7d2..b4db4a536b 100644 --- a/apps/automated/package.json +++ b/apps/automated/package.json @@ -14,10 +14,10 @@ "nativescript-theme-core": "file:../../node_modules/nativescript-theme-core" }, "devDependencies": { - "@nativescript/android": "8.1.1", - "@nativescript/ios": "8.1.0", + "@nativescript/android": "alpha", + "@nativescript/ios": "alpha", "@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz", - "typescript": "4.3.5" + "typescript": "4.5.4" }, "gitHead": "c06800e52ee1a184ea2dffd12a6702aaa43be4e3", "readme": "NativeScript Application" diff --git a/apps/automated/src/color/color-tests.ts b/apps/automated/src/color/color-tests.ts index 5e8c455dfe..e229769854 100644 --- a/apps/automated/src/color/color-tests.ts +++ b/apps/automated/src/color/color-tests.ts @@ -72,6 +72,24 @@ export var test_rgb_Color_CSS = function () { TKUnit.assertEqual(color.argb, 0xffff6464, 'Color.argb not properly parsed'); }; +export var test_rgb_Color_CSS_lvl4 = function () { + var alpha = 0.5; + var expected = 0x80; + // + // ### Creating a Color from four RGB values + // ``` JavaScript + // Creates the color with 255 red, 100 green, 100 blue + var color = new Color(`rgb(255 100 100 / ${alpha})`); + // ``` + // + TKUnit.assertEqual(color.a, expected, 'Color.a not properly parsed'); + TKUnit.assertEqual(color.r, 255, 'Color.r not properly parsed'); + TKUnit.assertEqual(color.g, 100, 'Color.g not properly parsed'); + TKUnit.assertEqual(color.b, 100, 'Color.b not properly parsed'); + TKUnit.assertEqual(color.hex, '#FF646480', 'Color.hex not properly parsed'); + TKUnit.assertEqual(color.argb, 0x80ff6464, 'Color.argb not properly parsed'); +}; + export var test_rgba_Color_CSS = function () { var alpha = 0.5; var expected = 0x80; diff --git a/apps/automated/src/http/http-string-worker.ts b/apps/automated/src/http/http-string-worker.ts index a45ebb62d3..e18e5d6840 100644 --- a/apps/automated/src/http/http-string-worker.ts +++ b/apps/automated/src/http/http-string-worker.ts @@ -1,13 +1,13 @@ // todo: figure out why this worker is including the whole core and not just the Http module // ie. tree-shaking is not working as expected here. (same setup works in a separate app) -import { initGlobal } from '@nativescript/core/globals/index'; -initGlobal(); +// import { initGlobal } from '@nativescript/core/globals/index'; +// initGlobal(); -import { Http } from '@nativescript/core'; +import { getString } from '@nativescript/core/http'; declare var postMessage: any; -Http.getString('https://httpbin.org/get').then( +getString('https://httpbin.org/get').then( function (r) { postMessage(r); }, diff --git a/apps/automated/src/ui/core/bindable/bindable-tests.ts b/apps/automated/src/ui/core/bindable/bindable-tests.ts index 10e6b6edb3..c181c868a8 100644 --- a/apps/automated/src/ui/core/bindable/bindable-tests.ts +++ b/apps/automated/src/ui/core/bindable/bindable-tests.ts @@ -659,17 +659,19 @@ export function test_BindingConverterCalledEvenWithNullValue() { const testPropertyValue = null; const expectedValue = 'collapsed'; pageViewModel.set('testProperty', testPropertyValue); - appModule.getResources()['converter'] = function (value) { - if (value) { - return 'visible'; - } else { - return 'collapsed'; - } + appModule.getResources()['converter'] = { + toView: function (value) { + if (value) { + return 'visible'; + } else { + return 'collapsed'; + } + }, }; const testFunc = function (views: Array) { const testLabel =