fix(assets): update build paths

This commit is contained in:
Oliver Davies 2022-08-13 12:32:33 +01:00
parent b7456fdf42
commit 072ec2db46
7 changed files with 39 additions and 42 deletions

View file

@ -60,7 +60,7 @@ COPY --chown=sculpin:sculpin src src
RUN sculpin generate --env prod --output-dir /output/html RUN sculpin generate --env prod --output-dir /output/html
COPY --chown=sculpin:sculpin . . COPY --chown=sculpin:sculpin . .
COPY --chown=sculpin:sculpin --from=assets /app/source/build /build COPY --chown=sculpin:sculpin --from=assets /app/build /build
ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"] ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]

View file

@ -20,7 +20,7 @@ console.log(watch);
esbuild.build({ esbuild.build({
entryPoints: ["./js/app.js"], entryPoints: ["./js/app.js"],
outfile: "../source/build/app.js", outfile: "/app/build/app.js",
bundle: true, bundle: true,
minify: minify, minify: minify,
sourcemap: sourcemap, sourcemap: sourcemap,

View file

@ -1,68 +1,65 @@
const colors = require('./tools/tailwindcss/colours') const colors = require("./tailwindcss/colours");
const defaultTheme = require('tailwindcss/defaultTheme') const defaultTheme = require("tailwindcss/defaultTheme");
const { fontFamily } = defaultTheme const { fontFamily } = defaultTheme;
module.exports = { module.exports = {
mode: 'jit', mode: "jit",
darkMode: 'media', darkMode: "media",
important: true, important: true,
purge: { purge: {
content: [ content: ["./tailwindcss/safelist-classes.txt", "../source/**/*.{md,twig}"],
'tools/tailwindcss/safelist-classes.txt',
'source/**/*.{md,twig}',
],
}, },
theme: { theme: {
outline: { outline: {
black: '1px solid black', black: "1px solid black",
white: '1px solid white' white: "1px solid white",
}, },
extend: { extend: {
typography: (theme) => ({ typography: (theme) => ({
DEFAULT: { DEFAULT: {
css: { css: {
p: { p: {
lineHeight: 400 lineHeight: 400,
} },
} },
} },
}), }),
colors, colors,
fontFamily: { fontFamily: {
sans: [ sans: [
'Roboto Condensed', "Roboto Condensed",
'Arial', "Arial",
'Helvetica Neue', "Helvetica Neue",
'Helvetica', "Helvetica",
'sans-serif', "sans-serif",
], ],
mono: [ mono: [
'ui-monospace', "ui-monospace",
'SFMono-Regular', "SFMono-Regular",
'SF Mono', "SF Mono",
'Consolas', "Consolas",
'Liberation Mono', "Liberation Mono",
...fontFamily.mono ...fontFamily.mono,
] ],
}, },
spacing: { spacing: {
'2px': '2px' "2px": "2px",
}, },
borderWidth: { borderWidth: {
3: '3px' 3: "3px",
}, },
width: { width: {
96: '24rem' 96: "24rem",
} },
} },
}, },
corePlugins: { corePlugins: {
container: false container: false,
}, },
plugins: [ plugins: [
require('./tools/tailwindcss/plugins/focus-visible'), require("./tailwindcss/plugins/focus-visible"),
require('@tailwindcss/aspect-ratio'), require("@tailwindcss/aspect-ratio"),
require('@tailwindcss/forms'), require("@tailwindcss/forms"),
require('@tailwindcss/typography') require("@tailwindcss/typography"),
] ],
} };

View file

@ -88,7 +88,7 @@ function yarn:build:css {
tailwindcss --postcss \ tailwindcss --postcss \
-i css/tailwind.pcss \ -i css/tailwind.pcss \
-o source/build/app.css "${args[@]}" -o /app/build/app.css "${args[@]}"
} }
function yarn:build:js { function yarn:build:js {