From 68701d1b3c9665bf47039a2bedd8b0a440fa43b1 Mon Sep 17 00:00:00 2001 From: mochaaP Date: Tue, 21 Jun 2022 15:07:47 +0000 Subject: [PATCH] fix: export global with `Object.assign` --- resources/assets/src/index.tsx | 4 ++-- resources/assets/src/scripts/app.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/assets/src/index.tsx b/resources/assets/src/index.tsx index 45916772..ff932389 100644 --- a/resources/assets/src/index.tsx +++ b/resources/assets/src/index.tsx @@ -1,10 +1,10 @@ import * as React from 'react' import * as ReactDOM from 'react-dom' +import $ from 'jquery' import './scripts/app' import routes from './scripts/route' -window.React = React -window.ReactDOM = ReactDOM +Object.assign(window, { React, ReactDOM, $ }) if (blessing.route.startsWith('admin')) { const entry = document.querySelector('#launch-cli') diff --git a/resources/assets/src/scripts/app.ts b/resources/assets/src/scripts/app.ts index 0c7b5185..8476510e 100644 --- a/resources/assets/src/scripts/app.ts +++ b/resources/assets/src/scripts/app.ts @@ -1,5 +1,4 @@ import './init' // must be first -import $ from 'jquery' import 'admin-lte' import './extra' import './i18n'