Merge branch 'master' of github.com:NativeScript/NativeScript

# Conflicts:
#	package.json
#	packages/core/global-types.d.ts
#	packages/core/platforms/ios/Podfile
#	packages/core/ui/styling/background.android.ts
#	packages/core/ui/styling/style-scope.ts
#	packages/ui-mobile-base/ios/build.sh
This commit is contained in:
Martin Guillon
2021-02-08 10:09:12 +01:00
123 changed files with 2987 additions and 2093 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "@nativescript/webpack",
"version": "4.0.1",
"version": "4.1.0",
"main": "index",
"description": "Webpack plugin for NativeScript",
"homepage": "https://nativescript.org",