Fix places CSS load error
This commit is contained in:
parent
15a43637b6
commit
e2b7d6e18d
18
ui/build.mjs
18
ui/build.mjs
|
@ -26,7 +26,8 @@ const defineEnv = ENVIRONMENT_VARIABLES.reduce((acc, key) => {
|
||||||
}, {})
|
}, {})
|
||||||
|
|
||||||
const esbuildOptions = {
|
const esbuildOptions = {
|
||||||
entryPoints: ['src/index.tsx'],
|
entryPoints: ['src/index.tsx', 'mapbox-gl/dist/mapbox-gl.css'],
|
||||||
|
entryNames: '[name]',
|
||||||
plugins: [
|
plugins: [
|
||||||
babel({
|
babel({
|
||||||
filter: /photoview\/ui\/src\/.*\.(js|tsx?)$/,
|
filter: /photoview\/ui\/src\/.*\.(js|tsx?)$/,
|
||||||
|
@ -51,6 +52,13 @@ const esbuildOptions = {
|
||||||
},
|
},
|
||||||
define: defineEnv,
|
define: defineEnv,
|
||||||
incremental: watchMode,
|
incremental: watchMode,
|
||||||
|
watch: {
|
||||||
|
onRebuild(err) {
|
||||||
|
if (err == null) {
|
||||||
|
bs.reload()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
fs.emptyDirSync('dist/')
|
fs.emptyDirSync('dist/')
|
||||||
|
@ -60,7 +68,7 @@ fs.copyFileSync('src/favicon.ico', 'dist/favicon.ico')
|
||||||
fs.copySync('src/assets/', 'dist/assets/')
|
fs.copySync('src/assets/', 'dist/assets/')
|
||||||
|
|
||||||
if (watchMode) {
|
if (watchMode) {
|
||||||
let builderPromise = esbuild.build(esbuildOptions)
|
esbuild.build(esbuildOptions)
|
||||||
|
|
||||||
bs.init({
|
bs.init({
|
||||||
server: {
|
server: {
|
||||||
|
@ -70,12 +78,6 @@ if (watchMode) {
|
||||||
port: 1234,
|
port: 1234,
|
||||||
open: false,
|
open: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
bs.watch('src/**/*.@(js|tsx|ts)').on('change', async args => {
|
|
||||||
console.log('reloading', args)
|
|
||||||
builderPromise = (await builderPromise).rebuild()
|
|
||||||
// bs.reload(args)
|
|
||||||
})
|
|
||||||
} else {
|
} else {
|
||||||
const build = async () => {
|
const build = async () => {
|
||||||
await esbuild.build(esbuildOptions)
|
await esbuild.build(esbuildOptions)
|
||||||
|
|
|
@ -7,9 +7,6 @@ import styled from 'styled-components'
|
||||||
import Layout from '../../Layout'
|
import Layout from '../../Layout'
|
||||||
import { makeUpdateMarkers } from './mapboxHelperFunctions'
|
import { makeUpdateMarkers } from './mapboxHelperFunctions'
|
||||||
import MapPresentMarker from './MapPresentMarker'
|
import MapPresentMarker from './MapPresentMarker'
|
||||||
|
|
||||||
// Will be bundled to dist/src/Pages/PlacesPage/PlacesPage.css
|
|
||||||
import 'mapbox-gl/dist/mapbox-gl.css'
|
|
||||||
import { urlPresentModeSetupHook } from '../../components/photoGallery/photoGalleryReducer'
|
import { urlPresentModeSetupHook } from '../../components/photoGallery/photoGalleryReducer'
|
||||||
import { placesReducer } from './placesReducer'
|
import { placesReducer } from './placesReducer'
|
||||||
|
|
||||||
|
@ -148,7 +145,7 @@ const MapPage = () => {
|
||||||
return (
|
return (
|
||||||
<Layout title="Places">
|
<Layout title="Places">
|
||||||
<Helmet>
|
<Helmet>
|
||||||
<link rel="stylesheet" href="/src/Pages/PlacesPage/PlacesPage.css" />
|
<link rel="stylesheet" href="/mapbox-gl.css" />
|
||||||
</Helmet>
|
</Helmet>
|
||||||
<MapWrapper>
|
<MapWrapper>
|
||||||
<MapContainer ref={mapContainer}></MapContainer>
|
<MapContainer ref={mapContainer}></MapContainer>
|
||||||
|
|
Loading…
Reference in New Issue