Skip to content

Commit

Permalink
fix: more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mxdvl committed Jun 20, 2024
1 parent 29a7296 commit 0d4484f
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ coverage: install

# Validate all assets.
validate: install
@./tools/task-runner/runner.mjs validate --verbose
@./tools/task-runner/runner.mjs validate/index.mjs --verbose
@yarn prettier */test/resources/*.json --check

# Validate all SCSS.
Expand Down
Binary file modified static/public/images/email/banners/morning-mail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion tools/__tasks__/compile/images/icons.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import glob from 'glob';
import btoa from 'btoa';
import { optimize } from 'svgo';
import mkdirp from 'mkdirp';
import { fileURLToPath } from 'url';

const getSVG = iconPath =>
new Promise((resolve, reject) => {
Expand Down Expand Up @@ -80,7 +81,7 @@ const saveSass = (sass, dest, fileName) =>
path.join(dest, fileName),
`
// THIS FILE WAS AUTOMATICALLY GENERATED BY
// ${path.relative(root, path.resolve(__filename))}
// ${path.relative(root, fileURLToPath(import.meta.url))}
// DO NOT EDIT IT!
@if ($svg-support) {
Expand Down
12 changes: 6 additions & 6 deletions tools/__tasks__/compile/index.mjs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
export default {
description: 'Compile assets for production',
task: [
await import('./conf/clean.mjs').then(module => module.default),
await import('./css/index.mjs').then(module => module.default),
await import('./data/index.mjs').then(module => module.default),
await import('./javascript/index.mjs').then(module => module.default),
await import('./hash/index.mjs').then(module => module.default),
await import('./conf/index.mjs').then(module => module.default),
await import('./conf/clean.mjs'),
await import('./css/index.mjs'),
await import('./data/index.mjs'),
await import('./javascript/index.mjs'),
await import('./hash/index.mjs'),
await import('./conf/index.mjs'),
],
}
4 changes: 2 additions & 2 deletions tools/__tasks__/compile/javascript/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ export default {
await import('./clean.mjs').then(module => module.default),
await import('../inline-svgs/index.mjs').then(module => module.default),
await import('./copy.mjs').then(module => module.default),
await import('./webpack.js').then(module => module.default),
await import('./webpack-atoms.js').then(module => module.default),
await import('./webpack.mjs').then(module => module.default),
await import('./webpack-atoms.mjs').then(module => module.default),
await import('./bundle-polyfills.mjs').then(module => module.default),
],
};
8 changes: 4 additions & 4 deletions tools/__tasks__/compile/javascript/index.watch.mjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export default {
description: 'Prepare JS for development',
task: [
(await import('../inline-svgs/index.mjs')).then(module => module.default),
(await import('./clean.mjs')).then(module => module.default),
(await import('./copy.mjs')).then(module => module.default),
(await import('./bundle-polyfills.mjs')).then(module => module.default),
await import('../inline-svgs/index.mjs').then(module => module.default),
await import('./clean.mjs').then(module => module.default),
await import('./copy.mjs').then(module => module.default),
await import('./bundle-polyfills.mjs').then(module => module.default),
],
};
8 changes: 4 additions & 4 deletions tools/__tasks__/validate/index.mjs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export default {
description: 'Lint assets',
task: [
import('./javascript.mjs'),
import('./typescript.mjs'),
import('./sass.mjs'),
import('./check-for-disallowed-strings.mjs'),
await import('./javascript.mjs'),
await import('./typescript.mjs'),
await import('./sass.mjs'),
await import('./check-for-disallowed-strings.mjs'),
],
concurrent: true,
};

0 comments on commit 0d4484f

Please sign in to comment.