Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: try to serve a static route before maping assets

Browse Source
This commit is contained in:
Sérgio Ramos 2018-05-09 10:34:49 +01:00
parent 831be94521
commit f007889283
4 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
consoles/my-joy-images/lib/index.js
View File

@ -84,27 +84,27 @@ exports.register = async server => {
});
}
const buildPathname = Path.join(buildStatic, 'static', rest);
const [err2] = await Intercept(
Fs.access(buildPathname, Fs.constants.R_OK)
);
if (!err2) {
return h.file(buildPathname, {
confine: buildStatic
});
}
const filename = manifest[rest];
if (!filename) {
return Boom.notFound();
}
const buildMapPathname = Path.join(buildRoot, filename);
const [err2] = await Intercept(
Fs.access(buildMapPathname, Fs.constants.R_OK)
);
if (!err2) {
return h.file(buildMapPathname, {
confine: buildStatic
});
}
const buildPathname = Path.join(buildStatic, rest);
return h.file(buildPathname, {
confine: buildStatic
});
}
},
{
method: '*',

22
consoles/my-joy-instances/lib/index.js
View File

@ -84,27 +84,27 @@ exports.register = async server => {
});
}
const buildPathname = Path.join(buildStatic, 'static', rest);
const [err2] = await Intercept(
Fs.access(buildPathname, Fs.constants.R_OK)
);
if (!err2) {
return h.file(buildPathname, {
confine: buildStatic
});
}
const filename = manifest[rest];
if (!filename) {
return Boom.notFound();
}
const buildMapPathname = Path.join(buildRoot, filename);
const [err2] = await Intercept(
Fs.access(buildMapPathname, Fs.constants.R_OK)
);
if (!err2) {
return h.file(buildMapPathname, {
confine: buildStatic
});
}
const buildPathname = Path.join(buildStatic, rest);
return h.file(buildPathname, {
confine: buildStatic
});
}
},
{
method: '*',

22
consoles/my-joy-navigation/lib/index.js
View File

@ -79,27 +79,27 @@ exports.register = async server => {
});
}
const buildPathname = Path.join(buildStatic, 'static', rest);
const [err2] = await Intercept(
Fs.access(buildPathname, Fs.constants.R_OK)
);
if (!err2) {
return h.file(buildPathname, {
confine: buildStatic
});
}
const filename = manifest[rest];
if (!filename) {
return Boom.notFound();
}
const buildMapPathname = Path.join(buildRoot, filename);
const [err2] = await Intercept(
Fs.access(buildMapPathname, Fs.constants.R_OK)
);
if (!err2) {
return h.file(buildMapPathname, {
confine: buildStatic
});
}
const buildPathname = Path.join(buildStatic, rest);
return h.file(buildPathname, {
confine: buildStatic
});
}
}
]);
};

2
packages/ui-toolkit/src/styleguide/wrapper.js
View File

@ -1,5 +1,5 @@
import React from 'react';
import { ThemeProvider, injectGlobal } from 'styled-components';
import styled, { ThemeProvider, injectGlobal } from 'styled-components';
import theme from '../theme';
import Base from '../base';