Merge pull request #4560 from alphagov/gulp-copy

Use Gulp to copy files instead of `cpy`
alphagov · Dec 14, 2023 · 049d732 · 049d732
2 parents 113d1e3 + 50f0515
commit 049d732
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 248 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/govuk-frontend-review/tasks/watch.mjs b/packages/govuk-frontend-review/tasks/watch.mjs
@@ -22,7 +22,8 @@ export const watch = (options) =>
      */
     task.name('lint:scss watch', () =>
       gulp.watch(
-        [join(options.srcPath, '**/*.scss')],
+        '**/*.scss',
+        { cwd: options.srcPath },
 
         // Run Stylelint checks
         npm.script('lint:scss:cli', [
@@ -36,10 +37,8 @@ export const watch = (options) =>
      */
     task.name('compile:scss watch', () =>
       gulp.watch(
-        [
-          join(options.srcPath, '**/*.scss'),
-          join(paths.package, 'dist/govuk/all.scss')
-        ],
+        ['**/*.scss', join(paths.package, 'dist/govuk/all.scss')],
+        { cwd: options.srcPath },
 
         // Run Sass compile
         styles(options)
@@ -51,8 +50,8 @@ export const watch = (options) =>
      */
     task.name('lint:js watch', () =>
       gulp.watch(
-        join(options.srcPath, '**/*.{cjs,js,mjs}'),
-        { ignored: ['**/*.test.*'] },
+        '**/*.{cjs,js,mjs}',
+        { cwd: options.srcPath, ignored: ['**/*.test.*'] },
         gulp.parallel(
           // Run TypeScript compiler
           npm.script('build:types', ['--incremental', '--pretty'], options),
@@ -70,7 +69,8 @@ export const watch = (options) =>
      */
     task.name('compile:js watch', () =>
       gulp.watch(
-        [join(options.srcPath, 'javascripts/**/*.mjs')],
+        'javascripts/**/*.mjs',
+        { cwd: options.srcPath },
 
         // Run JavaScripts compile
         scripts(options)

diff --git a/packages/govuk-frontend/tasks/assets.mjs b/packages/govuk-frontend/tasks/assets.mjs
@@ -1,6 +1,4 @@
-import { join } from 'path'
-
-import { files, task } from '@govuk-frontend/tasks'
+import { task } from '@govuk-frontend/tasks'
 import gulp from 'gulp'
 
 /**
@@ -11,9 +9,11 @@ import gulp from 'gulp'
 export const assets = (options) =>
   gulp.series(
     task.name('copy:assets', () =>
-      files.copy('**/*', {
-        srcPath: join(options.srcPath, 'govuk/assets'),
-        destPath: join(options.destPath, 'govuk/assets')
-      })
+      gulp
+        .src('govuk/assets/**/*', {
+          base: options.srcPath,
+          cwd: options.srcPath
+        })
+        .pipe(gulp.dest(options.destPath))
     )
   )
diff --git a/packages/govuk-frontend/tasks/build/package.mjs b/packages/govuk-frontend/tasks/build/package.mjs
@@ -1,7 +1,5 @@
-import { join } from 'path'
-
 import { paths } from '@govuk-frontend/config'
-import { files, npm, task } from '@govuk-frontend/tasks'
+import { npm, task } from '@govuk-frontend/tasks'
 import gulp from 'gulp'
 
 import { assets, fixtures, scripts, styles, templates } from '../index.mjs'
@@ -25,9 +23,11 @@ export default (options) =>
 
     // Copy GOV.UK Prototype Kit JavaScript
     task.name("copy:files 'govuk-prototype-kit'", () =>
-      files.copy('**/*.js', {
-        srcPath: join(options.srcPath, 'govuk-prototype-kit'),
-        destPath: join(options.destPath, 'govuk-prototype-kit')
-      })
+      gulp
+        .src('govuk-prototype-kit/**/*.js', {
+          base: options.srcPath,
+          cwd: options.srcPath
+        })
+        .pipe(gulp.dest(options.destPath))
     )
   )
diff --git a/packages/govuk-frontend/tasks/build/release.mjs b/packages/govuk-frontend/tasks/build/release.mjs
@@ -16,10 +16,12 @@ export default (options) =>
 
     // Copy GOV.UK Frontend static assets
     task.name('copy:assets', () =>
-      files.copy('**/*', {
-        srcPath: join(options.srcPath, 'govuk/assets'),
-        destPath: join(options.destPath, 'assets')
-      })
+      gulp
+        .src('govuk/assets/**/*', {
+          base: join(options.srcPath, 'govuk'),
+          cwd: options.srcPath
+        })
+        .pipe(gulp.dest(options.destPath))
     ),
 
     // Compile GOV.UK Frontend JavaScript

diff --git a/packages/govuk-frontend/tasks/templates.mjs b/packages/govuk-frontend/tasks/templates.mjs
@@ -1,6 +1,4 @@
-import { join } from 'path'
-
-import { files, task } from '@govuk-frontend/tasks'
+import { task } from '@govuk-frontend/tasks'
 import gulp from 'gulp'
 
 /**
@@ -11,9 +9,11 @@ import gulp from 'gulp'
 export const templates = (options) =>
   gulp.series(
     task.name('copy:templates', () =>
-      files.copy('**/*.{md,njk}', {
-        srcPath: join(options.srcPath, 'govuk'),
-        destPath: join(options.destPath, 'govuk')
-      })
+      gulp
+        .src('govuk/**/*.{md,njk}', {
+          base: options.srcPath,
+          cwd: options.srcPath
+        })
+        .pipe(gulp.dest(options.destPath))
     )
   )