diff --git a/packages/core/application/application-common.ts b/packages/core/application/application-common.ts index d27dee9c5..208fbfd6d 100644 --- a/packages/core/application/application-common.ts +++ b/packages/core/application/application-common.ts @@ -1,8 +1,5 @@ // Require globals first so that snapshot takes __extends function. -const nsGlobals = require('../globals'); -if (!global.NativeScriptHasInitGlobal) { - nsGlobals.initGlobal(); -} +import '../globals'; // Types import { AndroidApplication, iOSApplication } from '.'; diff --git a/packages/core/bundle-entry-points.ts b/packages/core/bundle-entry-points.ts index be990c714..ea5bfda33 100644 --- a/packages/core/bundle-entry-points.ts +++ b/packages/core/bundle-entry-points.ts @@ -1,5 +1,5 @@ -const g = require('./globals'); -g.initGlobal(); +// using import is important to ensure webpack keep it in order +import './globals'; // Register "dynamically" loaded module that need to be resolved by the // XML/component builders. diff --git a/packages/core/globals/index.ts b/packages/core/globals/index.ts index d47733635..a5771d05f 100644 --- a/packages/core/globals/index.ts +++ b/packages/core/globals/index.ts @@ -360,4 +360,4 @@ export function initGlobal() { } if (!global.NativeScriptHasInitGlobal) { initGlobal(); -} +} \ No newline at end of file diff --git a/packages/core/index.ts b/packages/core/index.ts index 68f03d56b..8be55e07c 100644 --- a/packages/core/index.ts +++ b/packages/core/index.ts @@ -1,7 +1,6 @@ /// // Init globals first (use require to ensure it's always at the top) -const nsGlobals = require('./globals'); -nsGlobals.initGlobal(); +import '../globals'; export { iOSApplication, AndroidApplication } from './application'; export type { ApplicationEventData, LaunchEventData, OrientationChangedEventData, UnhandledErrorEventData, DiscardedErrorEventData, CssChangedEventData, LoadAppCSSEventData, AndroidActivityEventData, AndroidActivityBundleEventData, AndroidActivityRequestPermissionsEventData, AndroidActivityResultEventData, AndroidActivityNewIntentEventData, AndroidActivityBackPressedEventData, SystemAppearanceChangedEventData } from './application'; diff --git a/packages/core/inspector_modules.ios.ts b/packages/core/inspector_modules.ios.ts index 5bc188a5a..18deeeebf 100644 --- a/packages/core/inspector_modules.ios.ts +++ b/packages/core/inspector_modules.ios.ts @@ -1,8 +1,5 @@ console.log('Loading inspector modules...'); -import { initGlobal } from './globals'; -if (!global.NativeScriptHasInitGlobal) { - initGlobal(); -} +import './globals'; require('./debugger/webinspector-network'); require('./debugger/webinspector-dom'); require('./debugger/webinspector-css'); diff --git a/packages/core/ui/frame/activity.android.ts b/packages/core/ui/frame/activity.android.ts index 746ec118c..6c7fdead1 100644 --- a/packages/core/ui/frame/activity.android.ts +++ b/packages/core/ui/frame/activity.android.ts @@ -1,12 +1,7 @@ +import '../../globals'; import { setActivityCallbacks, AndroidActivityCallbacks } from '.'; -// use requires to ensure import order -const globals = require('../../globals'); const appModule = require('../../application'); -if (global.__snapshot) { - globals.initGlobal(); -} - /** * NOTE: We cannot use NativeClass here because this is used in appComponents in webpack.config * Whereby it bypasses the decorator transformation, hence pure es5 style written here diff --git a/packages/webpack/bundle-config-loader.ts b/packages/webpack/bundle-config-loader.ts index df0af080b..8e5412a8c 100644 --- a/packages/webpack/bundle-config-loader.ts +++ b/packages/webpack/bundle-config-loader.ts @@ -52,7 +52,7 @@ const loader: loader.Loader = function (source, map) { } source = ` - require("${sourceModule}/bundle-entry-points"); + import "${sourceModule}/bundle-entry-points"; ${source} `;