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

feat: Update Gov UK Packages #523

Merged
merged 4 commits into from
Feb 20, 2024
Merged

feat: Update Gov UK Packages #523

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88ab0d2
feat: Update Gov UK Packages
jimwashbrook Feb 20, 2024
2c984e5
fix: unit tests to match govuk changes
jimwashbrook Feb 20, 2024
3cefe7c
fix: use commands
jimwashbrook Feb 20, 2024
54c459e
fix: button styling, compile scss
jimwashbrook Feb 20, 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
60 changes: 38 additions & 22 deletions src/Dfe.PlanTech.Web.Node/esbuild.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,76 @@
import * as esbuild from 'esbuild';
import { sassPlugin } from 'esbuild-sass-plugin';
import { cpSync, readdirSync } from 'fs';
import * as esbuild from "esbuild";
import { sassPlugin } from "esbuild-sass-plugin";
import { copyFileSync, cpSync, readdirSync } from "fs";

import { parse } from "path";

//Build JS
await esbuild.build({
entryPoints: ['scripts/app.js'],
entryPoints: ["scripts/app.js"],
bundle: true,
minify: true,
sourcemap: true,
target: ['chrome58', 'firefox57', 'safari11', 'edge16'],
outfile: 'out/js/app.js',
})
outfile: "out/js/app.js",
});

//Builds SASS
await esbuild.build({
entryPoints: ['styles/scss/application.scss'],
entryPoints: ["styles/scss/application.scss"],
bundle: true,
minify: true,
sourcemap: true,
target: ['chrome58', 'firefox57', 'safari11', 'edge16'],
external: ['/assets/*'],
plugins: [sassPlugin({
loader: { ".woff2": "file", ".png": "file" },
})],
outfile: 'out/css/application.css'
target: ["chrome58", "firefox57", "safari11", "edge16"],
external: ["/assets/*"],
plugins: [
sassPlugin({
loader: { ".woff2": "file", ".png": "file" },
}),
],
outfile: "out/css/application.css",
});

//Copy assets
//DFE
const dfeDir = "./node_modules/dfe-frontend-alpha/packages/assets";
readdirSync(dfeDir).forEach(file => {
readdirSync(dfeDir).forEach((file) => {
if (file.indexOf(".png") == -1) {
return;
}

cpSync(dfeDir + "/" + file, "./out/assets/images/" + file, { overwrite: true });
cpSync(dfeDir + "/" + file, "./out/assets/images/" + file, {
overwrite: true,
});
});

//GOVUK
const govukDir = "./node_modules/govuk-frontend/govuk/assets/";
const govukDir = "./node_modules/govuk-frontend/dist/govuk/assets/";
const targetFolders = ["images", "fonts"];
const ignoreFiles = ["favicon.ico"];

for (const folder of targetFolders) {
const path = govukDir + folder;

readdirSync(path).forEach(file => {
if (ignoreFiles.some(ignoreFile => ignoreFile == file)) {
readdirSync(path).forEach((file) => {
if (ignoreFiles.some((ignoreFile) => ignoreFile == file)) {
return;
}

cpSync(`${path}/${file}`, `./out/assets/${folder}/${file}`, { overwrite: true });
})
cpSync(`${path}/${file}`, `./out/assets/${folder}/${file}`, {
overwrite: true,
});
});
}

copyFileSync(
"./node_modules/govuk-frontend/dist/govuk/govuk-frontend.min.js",
"./out/js/govuk-frontend.min.js"
);

copyFileSync(
".//node_modules/govuk-frontend/dist/govuk/govuk-frontend.min.css",
"./out/css/govuk-frontend.min.css"
);

//Copy to Dfe.PlanTech.Web
const targetDir = "../Dfe.PlanTech.Web/wwwroot";
const folders = ["css", "assets", "js"];
Expand All @@ -63,4 +80,3 @@ for (const folder of folders) {

cpSync(path, `${targetDir}/${folder}`, { recursive: true, overwrite: true });
}

Loading
Loading