Skip to content
Snippets Groups Projects
Commit f19809d2 authored by Sebastien DUMETZ's avatar Sebastien DUMETZ
Browse files

change assets paths and include new build into server hot reload

parent 611b5305
No related branches found
No related tags found
No related merge requests found
......@@ -166,16 +166,18 @@ export default async function createServer(config = defaultConfig) :Promise<expr
const {default: webpack} = await import("webpack");
const {default: middleware} = await import("webpack-dev-middleware");
//@ts-ignore
const {default: config} = await import("../ui/webpack.config.js");
const compiler = webpack(config());
const {default: configGenerator} = await import("../ui/webpack.config.js");
const compiler = webpack(configGenerator());
const webpackInstance = middleware(compiler as any, {});
app.use(webpackInstance);
app.use("/dist", webpackInstance);
await new Promise(resolve=> webpackInstance.waitUntilValid(resolve));
}else{
// static file server
app.use("/", express.static(config.dist_dir));
app.use("/dist", express.static(config.dist_dir));
}
app.use("/", express.static(config.assets_dir));
app.use("/libs", (await import("./routes/libs/index.js")).default);
......
<voyager-explorer resourceroot="/" root="/scenes/{{scene}}/" referrer="{{referrer}}" lang="{{lang}}"></voyager-explorer>
<script type="text/javascript" src="/js/explorer.js"></script>
<voyager-explorer resourceroot="/dist/" root="/scenes/{{scene}}/" referrer="{{referrer}}" lang="{{lang}}"></voyager-explorer>
<script type="text/javascript" src="/dist/js/voyager-explorer.min.js"></script>
<ecorpus-main></ecorpus-main>
<script src="/js/corpus.js"></script>
\ No newline at end of file
<script src="/dist/js/corpus.js"></script>
\ No newline at end of file
......@@ -16,12 +16,12 @@
<title>{{title}}</title>
<link rel="shortcut icon" type="image/png" href="/images/logo-ecorpus.png"/>
<link rel="shortcut icon" type="image/png" href="/dist/favicon.png"/>
<style>
body { background: #303030; }
</style>
<link rel="stylesheet" href="/css/corpus.css">
<link rel="stylesheet" href="/dist/css/corpus.css">
</head>
<body>
......
<voyager-story resourceRoot="/" root="/scenes/{{scene}}/" referrer="{{referrer}}" lang="{{lang}}" mode="{{mode}}"></voyager-story>
<script type="text/javascript" src="/js/story.js"></script>
<link rel="stylesheet" href="/css/story.css">
\ No newline at end of file
<voyager-story resourceRoot="/dist/" root="/scenes/{{scene}}/" referrer="{{referrer}}" lang="{{lang}}" mode="{{mode}}"></voyager-story>
<script type="text/javascript" src="/dist/js/voyager-story.min.js"></script>
<link rel="stylesheet" href="/dist/css/voyager-story.min.css">
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment