[v1.7.8] Merge pull request #275 from bridge-core/dev

bridge-core · Oct 2, 2020 · a88334c · a88334c
2 parents 286e391 + ece736a
commit a88334c
Show file tree

Hide file tree

Showing 301 changed files with 8,361 additions and 20,801 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,5 @@ npm-debug.log
 npm-debug.log.*
 thumbs.db
 !.gitkeep
+
+.env
diff --git a/FAQ.md b/FAQ.md
diff --git a/GETTING_STARTED.md b/GETTING_STARTED.md
diff --git a/app/index.ejs b/app/index.ejs
@@ -1,22 +1,27 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <meta charset="utf-8">
-    <title>bridge.</title>
-    <% if (htmlWebpackPlugin.options.nodeModules) { %>
-      <!-- Add `node_modules/` to global paths so `require` works properly in development -->
-      <script>
-        require("module").globalPaths.push("<%= htmlWebpackPlugin.options.nodeModules.replace(/\\/g, '\\\\') %>")
-      </script>
-    <% } %>
-  </head>
-  <body>
-    <div id="app"></div>
-    <!-- Set `__static` path to static files in production -->
-    <script>
-      if(process.env.NODE_ENV !== "development") window.__static = require("path").join(__dirname, "/static").replace(/\\/g, "\\\\")
-    </script>
+	<head>
+		<meta charset="utf-8" />
+		<title>bridge.</title>
+		<% if (htmlWebpackPlugin.options.nodeModules) { %>
+		<!-- Add `node_modules/` to global paths so `require` works properly in development -->
+		<script>
+			require('module').globalPaths.push(
+				"<%= htmlWebpackPlugin.options.nodeModules.replace(/\\/g, '\\\\') %>"
+			)
+		</script>
+		<% } %>
+	</head>
+	<body>
+		<div id="app"></div>
+		<!-- Set `__static` path to static files in production -->
+		<script>
+			if (process.env.NODE_ENV !== 'development')
+				window.__static = require('path')
+					.join(__dirname, '/static')
+					.replace(/\\/g, '\\\\')
+		</script>
 
-    <!-- webpack builds are automatically injected -->
-  </body>
+		<!-- webpack builds are automatically injected -->
+	</body>
 </html>
diff --git a/app/main/index.js b/app/main/index.js
@@ -1,21 +1,10 @@
-import {
-	app,
-	BrowserWindow,
-	ipcMain,
-	Menu
-} from 'electron'
+import { app, BrowserWindow, ipcMain, Menu } from 'electron'
 import './communicator'
 import './Discord'
-import {
-	BP_BASE_PATH
-} from '../shared/Paths'
-import {
-	join
-} from 'path'
+import { BP_BASE_PATH } from '../shared/Paths'
+import { join } from 'path'
 import fs from 'fs'
-import {
-	DATA_PATH
-} from '../shared/DefaultDir'
+import { DATA_PATH } from '../shared/DefaultDir'
 
 let SETTINGS = {}
 try {
@@ -29,6 +18,8 @@ if (process.env.NODE_ENV !== 'development') {
 	global.__static = require('path')
 		.join(__dirname, '/static')
 		.replace(/\\/g, '\\\\')
+} else {
+	require('dotenv').config()
 }
 
 if (SETTINGS.disable_hardware_acceleration) {
@@ -46,14 +37,15 @@ let mainWindow,
 		minHeight: 600,
 		show: false,
 		webPreferences: {
+			nodeIntegrationInWorker: false,
 			nodeIntegration: true,
 			webSecurity: false,
 		},
 	}
 const winURL =
-	process.env.NODE_ENV === 'development' ?
-	`http://localhost:9080` :
-	`file://${__dirname}/index.html`
+	process.env.NODE_ENV === 'development'
+		? `http://localhost:9080`
+		: `file://${__dirname}/index.html`
 
 function createWindow() {
 	/**
@@ -89,7 +81,7 @@ function createSplashScreen() {
 		frame: process.platform === 'darwin',
 		resizable: false,
 		webPreferences: {
-			nodeIntegration: true
+			nodeIntegration: true,
 		},
 	})
 
@@ -131,4 +123,4 @@ ipcMain.on('bridge:setOverlayIcon', (event, project) => {
 	} catch (e) {
 		mainWindow.setOverlayIcon(null, '')
 	}
-})
+})
diff --git a/app/renderer/src/AppCycle/fetchDeps.ts b/app/renderer/src/AppCycle/fetchDeps.ts
@@ -0,0 +1,33 @@
+import { promises as fs } from 'fs'
+import { join } from 'path'
+import { BRIDGE_DATA_PATH, DEPS_URLS } from '../constants'
+import Store from '../../store/index'
+
+export async function loadDependency(src: string) {
+	//In development mode, always use data from disk
+	if (process.env.NODE_ENV === 'development' && process.env.DEV_DATA_PATH)
+		return eval(
+			await (
+				await fs.readFile(join(process.env.DEV_DATA_PATH, src))
+			).toString('utf-8')
+		)
+
+	const script = await fetch(
+		join(DEPS_URLS(Store.state.Settings.remote_data_version), src)
+	)
+		.then(data => data.text())
+		.then(async script => {
+			try {
+				fs.mkdir(join(BRIDGE_DATA_PATH, 'cache'), { recursive: true })
+			} catch {}
+			fs.writeFile(join(BRIDGE_DATA_PATH, 'cache', src), script)
+			return script
+		})
+		.catch(async () => {
+			return await (
+				await fs.readFile(join(BRIDGE_DATA_PATH, 'cache', src))
+			).toString('utf-8')
+		})
+
+	return eval(script)
+}
diff --git a/app/renderer/src/AppCycle/startUp.ts b/app/renderer/src/AppCycle/startUp.ts
@@ -10,12 +10,20 @@ import './DropFile'
 import './ResizeWatcher'
 import './Errors'
 import Store from '../../store/index'
+import Provider from '../autoCompletions/Provider'
+import { loadDependency } from './fetchDeps'
 
 export default async function startUp() {
 	SETTINGS.setup()
 	// Start listening for online and offline events
 	CONNECTION.startListening()
 
+	//Setup auto-completions
+	Provider.loadAssets(
+		await loadDependency('auto-completions.js'),
+		await loadDependency('file-definitions.js')
+	)
+
 	setupDefaultMenus()
 	if (process.env.NODE_ENV !== 'development') {
 		let discordMsg = createNotification({

diff --git a/app/renderer/src/UI/Toolbar/Category/dev.ts b/app/renderer/src/UI/Toolbar/Category/dev.ts
@@ -6,6 +6,7 @@ import PluginLoader from '../../../plugins/PluginLoader'
 import Store from '../../../../store/index'
 import ThemeManager from '../../../editor/Themes/ThemeManager'
 import LoadingWindow from '../../../../windows/LoadingWindow'
+import { loadDependency } from '../../../AppCycle/fetchDeps'
 
 export const DevMenu: IAppMenu = {
 	displayName: 'Development',
@@ -34,7 +35,10 @@ export const DevMenu: IAppMenu = {
 				const lw = new LoadingWindow()
 
 				trigger('bridge:scriptRunner.resetCaches')
-				Provider.loadAssets()
+				Provider.loadAssets(
+					await loadDependency('auto-completions.js'),
+					await loadDependency('file-definitions.js')
+				)
 				ThemeManager.reloadDefaultThemes()
 				await PluginLoader.loadPlugins()