games/factorio-blueprint-editor
games/factorio-blueprint-editor
1
0
Fork 0
mirror of https://github.com/teoxoy/factorio-blueprint-editor.git synced 2024-11-28 08:39:10 +02:00
Code Issues Releases Activity

use pluginReplace for env variables

Browse Source
This commit is contained in:
teoxoy 2021-01-19 21:54:14 +01:00
parent 400d95f297
commit 54006ac798
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/editor/src/Editor.ts
View File

@ -15,7 +15,7 @@ import { initActions, registerAction } from './actions'
export class Editor { export class Editor {
public async init(canvas: HTMLCanvasElement): Promise<void> { public async init(canvas: HTMLCanvasElement): Promise<void> {
await Promise.all([ await Promise.all([
fetch(`${G.STATIC_URL}data.json`) fetch('__STATIC_URL__/data.json')
.then(res => res.text()) .then(res => res.text())
.then(modules => loadData(modules)), .then(modules => loadData(modules)),
BasisLoader.loadTranscoder(basisTranscoderJS, basisTranscoderWASM), BasisLoader.loadTranscoder(basisTranscoderJS, basisTranscoderWASM),

5
packages/editor/src/common/globals.ts
View File

@ -39,7 +39,7 @@ function getBT(path: string): Promise<PIXI.BaseTexture> {
} }
function getTexture(path: string, x = 0, y = 0, w = 0, h = 0): PIXI.Texture { function getTexture(path: string, x = 0, y = 0, w = 0, h = 0): PIXI.Texture {
const key = `${STATIC_URL}${path.replace('.png', '.basis')}` const key = `__STATIC_URL__/${path.replace('.png', '.basis')}`
const KK = `${key}-${x}-${y}-${w}-${h}` const KK = `${key}-${x}-${y}-${w}-${h}`
let t = textureCache.get(KK) let t = textureCache.get(KK)
if (t) return t if (t) return t
@ -60,10 +60,7 @@ function getTexture(path: string, x = 0, y = 0, w = 0, h = 0): PIXI.Texture {
return t return t
} }
const STATIC_URL = 'data/'
export default { export default {
STATIC_URL,
debug, debug,
hr, hr,
BPC, BPC,

2
packages/editor/src/core/bpString.ts
View File

@ -147,7 +147,7 @@ function getBlueprintOrBookFromSource(source: string): Promise<Blueprint | Book>
reject(e) reject(e)
} }
}).then((url: URL) => { }).then((url: URL) => {
const corsProxy = 'https://api.allorigins.win/raw?url=' const corsProxy = '__CORS_PROXY_URL__'
console.log(`Loading data from: ${url}`) console.log(`Loading data from: ${url}`)
const pathParts = url.pathname.slice(1).split('/') const pathParts = url.pathname.slice(1).split('/')

10
packages/website/tools/fuse.ts
View File

@ -1,5 +1,5 @@
import { join } from 'path' import { join } from 'path'
import { fusebox, sparky, pluginLink } from 'fuse-box' import { fusebox, sparky, pluginLink, pluginReplace } from 'fuse-box'
import { IDevServerProps } from 'fuse-box/devServer/devServerProps' import { IDevServerProps } from 'fuse-box/devServer/devServerProps'
import { Context as FuseBoxContext } from 'fuse-box/core/context' import { Context as FuseBoxContext } from 'fuse-box/core/context'
import { wrapContents } from 'fuse-box/plugins/pluginStrings' import { wrapContents } from 'fuse-box/plugins/pluginStrings'
@ -37,6 +37,14 @@ class Context {
plugins: [ plugins: [
this.luaPlugin, this.luaPlugin,
pluginLink(/basis_transcoder\.(js|wasm)$/, { useDefault: true }), pluginLink(/basis_transcoder\.(js|wasm)$/, { useDefault: true }),
pluginReplace({
__CORS_PROXY_URL__: runServer
? 'https://api.allorigins.win/raw?url='
: '/corsproxy?url=',
__STATIC_URL__: runServer
? '/data'
: 'https://static-fbe.teoxoy.com/file/factorio-blueprint-editor',
}),
], ],
cache: { enabled: runServer, strategy: 'memory' }, cache: { enabled: runServer, strategy: 'memory' },
hmr: { plugin: p('./hmr.ts') }, hmr: { plugin: p('./hmr.ts') },