Skip to content

Commit

Permalink
Reformat *.js files in project root with Prettier
Browse files Browse the repository at this point in the history
These files were not formatted previously due to the Prettier glob not matching
`*.mjs`.
  • Loading branch information
robertknight committed Apr 16, 2024
1 parent 19d19fd commit 962f69e
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 31 deletions.
38 changes: 19 additions & 19 deletions gulpfile.js
Expand Up @@ -5,22 +5,22 @@ import {
runTests,
watchJS,
} from '@hypothesis/frontend-build';
import changed from 'gulp-changed';
import gulp from 'gulp';
import changed from 'gulp-changed';

import { serveDev } from './dev-server/serve-dev.js';
import { servePackage } from './dev-server/serve-package.js';
import tailwindConfig from './tailwind.config.js';
import annotatorTailwindConfig from './tailwind-annotator.config.js';
import sidebarTailwindConfig from './tailwind-sidebar.config.js';
import tailwindConfig from './tailwind.config.js';

gulp.task('build-js', () => buildJS('./rollup.config.js'));
gulp.task('watch-js', () => watchJS('./rollup.config.js'));

gulp.task('build-annotator-tailwind-css', () =>
buildCSS(['./src/styles/annotator/annotator.scss'], {
tailwindConfig: annotatorTailwindConfig,
})
}),
);

gulp.task('build-sidebar-tailwind-css', () =>
Expand All @@ -32,8 +32,8 @@ gulp.task('build-sidebar-tailwind-css', () =>
// be managed with its own tailwind config?
'./src/styles/ui-playground/ui-playground.scss',
],
{ tailwindConfig: sidebarTailwindConfig }
)
{ tailwindConfig: sidebarTailwindConfig },
),
);

gulp.task('build-standalone-css', () =>
Expand All @@ -47,17 +47,17 @@ gulp.task('build-standalone-css', () =>
// Vendor
'./node_modules/katex/dist/katex.min.css',
],
{ tailwindConfig }
)
{ tailwindConfig },
),
);

gulp.task(
'build-css',
gulp.parallel(
'build-annotator-tailwind-css',
'build-sidebar-tailwind-css',
'build-standalone-css'
)
'build-standalone-css',
),
);

gulp.task(
Expand All @@ -70,9 +70,9 @@ gulp.task(
'src/**/*.tsx',
'dev-server/ui-playground/**/*.tsx',
],
gulp.task('build-css')
gulp.task('build-css'),
);
})
}),
);

const fontFiles = ['node_modules/katex/dist/fonts/*.woff2'];
Expand All @@ -88,7 +88,7 @@ gulp.task(
'watch-fonts',
gulp.series('build-fonts', function watchFonts() {
gulp.watch(fontFiles, gulp.task('build-fonts'));
})
}),
);

// Files to reference in `build/manifest.json`, used by `build/boot.js`.
Expand All @@ -111,7 +111,7 @@ gulp.task('watch-boot-script', () => {
'src/boot/**/*.{js,ts,tsx}',
],
{ delay: 500 },
gulp.task('build-boot-script')
gulp.task('build-boot-script'),
);
});

Expand All @@ -129,8 +129,8 @@ gulp.task(
'build',
gulp.series(
gulp.parallel('build-js', 'build-css', 'build-fonts'),
'build-boot-script'
)
'build-boot-script',
),
);

gulp.task(
Expand All @@ -141,8 +141,8 @@ gulp.task(
'watch-boot-script',
'watch-css',
'watch-fonts',
'watch-js'
)
'watch-js',
),
);

// Unit and integration testing tasks.
Expand All @@ -157,6 +157,6 @@ gulp.task(
karmaConfig: 'src/karma.config.cjs',
rollupConfig: 'rollup-tests.config.js',
testsPattern: 'src/**/*-test.js',
})
)
}),
),
);
7 changes: 3 additions & 4 deletions rollup-boot.config.js
@@ -1,10 +1,9 @@
import { readFileSync } from 'fs';

import { babel } from '@rollup/plugin-babel';
import { nodeResolve } from '@rollup/plugin-node-resolve';
import json from '@rollup/plugin-json';
import { nodeResolve } from '@rollup/plugin-node-resolve';
import replace from '@rollup/plugin-replace';
import terser from '@rollup/plugin-terser';
import { readFileSync } from 'fs';

const isProd = process.env.NODE_ENV === 'production';
const prodPlugins = [];
Expand Down Expand Up @@ -65,7 +64,7 @@ export default {
// produces a prod bundle of the same size and dev bundle that has less cruft in it.
babelHelpers: 'inline',
exclude: 'node_modules/**',
extensions: ['.js', '.ts', '.tsx']
extensions: ['.js', '.ts', '.tsx'],
}),
json(),
nodeResolve({ extensions: ['.js', '.ts', '.tsx'] }),
Expand Down
5 changes: 2 additions & 3 deletions rollup-tests.config.js
@@ -1,12 +1,11 @@
import { readFileSync } from 'fs';

import { babel } from '@rollup/plugin-babel';
import commonjs from '@rollup/plugin-commonjs';
import json from '@rollup/plugin-json';
import { nodeResolve } from '@rollup/plugin-node-resolve';
import replace from '@rollup/plugin-replace';
import { string } from 'rollup-plugin-string';
import virtual from '@rollup/plugin-virtual';
import { readFileSync } from 'fs';
import { string } from 'rollup-plugin-string';

export default {
input: 'build/scripts/test-inputs.js', // Input file generated by gulp task
Expand Down
7 changes: 3 additions & 4 deletions rollup.config.js
@@ -1,11 +1,10 @@
import { readFileSync } from 'fs';

import { babel } from '@rollup/plugin-babel';
import commonjs from '@rollup/plugin-commonjs';
import { nodeResolve } from '@rollup/plugin-node-resolve';
import replace from '@rollup/plugin-replace';
import terser from '@rollup/plugin-terser';
import virtual from '@rollup/plugin-virtual';
import { readFileSync } from 'fs';
import { string } from 'rollup-plugin-string';

const isProd = process.env.NODE_ENV === 'production';
Expand All @@ -27,14 +26,14 @@ if (isProd) {
// See https://github.com/hypothesis/client/issues/4045.
max_line_len: 1024,
},
})
}),
);

// Eliminate debug-only imports.
prodPlugins.push(
virtual({
'preact/debug': '',
})
}),
);
}

Expand Down
3 changes: 2 additions & 1 deletion tailwind.config.js
Expand Up @@ -23,7 +23,8 @@ export default {
'fade-out': 'fade-out 0.3s forwards',
'pulse-fade-out': 'pulse-fade-out 5s ease-in-out forwards',
'slide-in-from-right': 'slide-in-from-right 0.3s forwards ease-in-out',
'updates-notification-slide-in': 'updates-notification-slide-in 0.3s ease-in'
'updates-notification-slide-in':
'updates-notification-slide-in 0.3s ease-in',
},
boxShadow: {
// A more prominent shadow than the one used by tailwind, intended for
Expand Down

0 comments on commit 962f69e

Please sign in to comment.