Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SLB-201: remove copy operations and streamline artefacts #129

Merged
merged 15 commits into from
Jan 24, 2024
Merged

SLB-201: remove copy operations and streamline artefacts #129

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b5e4148
feat(SLB-201): gatsby-plugin-static-dirs
pmelab Jan 22, 2024
8a02150
refactor(SLB-201): directly load stylesheets in gatsby
pmelab Jan 22, 2024
095f6c8
refactor(SLB-201): make ui a proper dependency of CMS
pmelab Jan 23, 2024
67dba86
refactor(SLB-201): rename cms.css to iframe.css to make its purpose c…
pmelab Jan 23, 2024
28e981e
refactor(SLB-201): load stylesheets via symlinks to node_modules/@cus…
pmelab Jan 23, 2024
e3d67f3
fix(SLB-201): remove wrong output definition
pmelab Jan 23, 2024
a922a77
refactor(SLB-201): symlink autoloaders instead of building them to th…
pmelab Jan 23, 2024
972dc30
fix(SLB-201): move gatsby directive autoloading entirely into schema …
pmelab Jan 23, 2024
ec503ef
refactor(SLB-201): remove unused import
pmelab Jan 24, 2024
e4dccd2
fix(SLB-201): add cache buster to styles.css
pmelab Jan 24, 2024
0982592
fix(SLB-201): switch back to standard style handling
pmelab Jan 24, 2024
ad89192
fix(SLB-201): properly export stylesheet from ui package
pmelab Jan 24, 2024
24b7d3d
fix(SLB-201): add tailwind settings to postcss
pmelab Jan 24, 2024
3ec3d20
perf(SLB-201): un-inline gatsby styles
pmelab Jan 24, 2024
b044c60
chore(SLB-201): use shared version of @amazeelabs/gatsby-plugin-stati…
pmelab Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/website/gatsby-browser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import './node_modules/@custom/ui/build/styles.css';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw that previously we imported it from both gatsby-browser and gatsby-ssr. Now it's gatsby-browser only. Not a mistake?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was a mistake before.


import { registerExecutor } from '@custom/schema';
import { GatsbyBrowser } from 'gatsby';

Expand Down
9 changes: 0 additions & 9 deletions apps/website/gatsby-ssr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { Locale, registerExecutor } from '@custom/schema';
import { GatsbySSR } from 'gatsby';
import React from 'react';

import { drupalExecutor } from './src/utils/drupal-executor';

export const onRenderBody: GatsbySSR['onRenderBody'] = ({
setHtmlAttributes,
setHeadComponents,
pathname,
}) => {
registerExecutor(drupalExecutor(`/graphql`));
Expand All @@ -27,11 +25,4 @@ export const onRenderBody: GatsbySSR['onRenderBody'] = ({
// We don't know the language.
}
}
setHeadComponents([
React.createElement('link', {
key: 'styles.css',
rel: 'stylesheet',
href: `/styles.css?t=${new Date().getTime()}`,
}),
]);
};
4 changes: 2 additions & 2 deletions packages/gatsby-plugin-static-dirs/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ export const pluginOptionsSchema = ({ Joi }) => {
};

/**
* @type {import('gatsby').GatsbyNode['onPostBuild']}
* @type {import('gatsby').GatsbyNode['onPreBuild']}
*/
export const onPostBuild = (_, options) => {
export const onPreBuild = (_, options) => {
Object.keys(options.directories).forEach((src) => {
const dest = options.directories[src];
cpSync(src, `public${dest}`, {
Expand Down