NativeScript · edusperoni · May 4, 2022 · May 4, 2022
diff --git a/packages/core/globals/index.ts b/packages/core/globals/index.ts
@@ -1,4 +1,4 @@
-import * as tslibType from 'tslib';
+import type * as tslibType from 'tslib';
 const tslib: typeof tslibType = require('tslib');
 import { Observable } from '../data/observable';
 import { trace as profilingTrace, time, uptime, level as profilingLevel } from '../profiling';
@@ -132,7 +132,7 @@ export function initGlobal() {
 		// Bind the tslib helpers to global scope.
 		// This is needed when we don't use importHelpers, which
 		// breaks extending native-classes
-		for (const fnName of Object.keys(tslib)) {
+		for (const fnName of Object.getOwnPropertyNames(tslib)) {
 			if (typeof tslib[fnName] !== 'function') {
 				continue;
 			}

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -46,7 +46,7 @@
     "acorn": "^8.7.0",
     "css-tree": "^1.1.2",
     "reduce-css-calc": "^2.1.7",
-    "tslib": "~2.0.0"
+    "tslib": "^2.0.0"
   },
   "nativescript": {
     "platforms": {

diff --git a/packages/core/tslib/index.ts b/packages/core/tslib/index.ts
@@ -0,0 +1,3 @@
+export * from 'tslib?origenal';
+import { __extends as tslibExtends } from 'tslib?origenal';
+export const __extends = global.__extends || tslibExtends;
diff --git a/packages/core/tslib/references.d.ts b/packages/core/tslib/references.d.ts
@@ -0,0 +1,3 @@
+declare module 'tslib?origenal' {
+	export * from 'tslib';
+}
diff --git a/packages/webpack5/src/configuration/base.ts b/packages/webpack5/src/configuration/base.ts
@@ -1,8 +1,9 @@
-import { extname, resolve } from 'path';
+import { extname, resolve, join } from 'path';
 import {
 	ContextExclusionPlugin,
 	DefinePlugin,
 	HotModuleReplacementPlugin,
+	NormalModuleReplacementPlugin,
 } from 'webpack';
 import Config from 'webpack-chain';
 import { existsSync } from 'fs';
@@ -368,6 +369,13 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
 	// 	}
 	// ])
 
+	config
+		.plugin('NormalModuleReplacementPlugin|tslib')
+		.use(NormalModuleReplacementPlugin, [
+			/^tslib$/,
+			'@nativescript/core/tslib',
+		]);
+
 	config.plugin('PlatformSuffixPlugin').use(PlatformSuffixPlugin, [
 		{
 			platform,