Update frontend package paths

sanjaypoyzer · May 18, 2018 · 9744cef · 9744cef
1 parent f74a88b
commit 9744cef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/config/paths.json b/config/paths.json
@@ -3,7 +3,8 @@
   "deploy": "deploy",
     "public": "deploy/public/",
   "nodemodules": "node_modules/",
-    "govukfrontend": "node_modules/@govuk-frontend/",
+    "govukfrontend": "node_modules/@govuk-frontend/frontend/",
+    "govukfrontendcomponents": "node_modules/@govuk-frontend/frontend/components/",
     "iframeresizer": "node_modules/iframe-resizer/",
     "clipboard": "node_modules/clipboard/dist/",
     "html5shiv": "node_modules/html5shiv/dist/",

diff --git a/lib/colours.js b/lib/colours.js
@@ -1,11 +1,11 @@
 const assert = require('assert')
 const scssToJson = require('scss-to-json')
 
-const coloursAppliedSCSS = scssToJson('./node_modules/@govuk-frontend/globals/settings/_colours-applied.scss', {
-  dependencies: [{path: './node_modules/@govuk-frontend/globals/settings/_colours-palette.scss'}]
+const coloursAppliedSCSS = scssToJson('./node_modules/@govuk-frontend/frontend/settings/_colours-applied.scss', {
+  dependencies: [{path: './node_modules/@govuk-frontend/frontend/settings/_colours-palette.scss'}]
 })
 
-const coloursPaletteSCSS = scssToJson('./node_modules/@govuk-frontend/globals/settings/_colours-palette.scss')
+const coloursPaletteSCSS = scssToJson('./node_modules/@govuk-frontend/frontend/settings/_colours-palette.scss')
 
 // combine both SCSS data objects - some Main colours are only in Palette
 const coloursSCSS = Object.assign(coloursAppliedSCSS, coloursPaletteSCSS)

diff --git a/lib/metalsmith.js b/lib/metalsmith.js
@@ -24,7 +24,7 @@ const views = [
   paths.layouts,
   paths.partials,
   paths.components,
-  paths.govukfrontend
+  paths.govukfrontendcomponents
 ]
 
 // static site generator
@@ -56,8 +56,8 @@ module.exports = metalsmith(__dirname) // __dirname defined by node.js: name of
 
   // copy static assets from node_modules/@govukfrontend
   .use(assets({
-    source: '../' + paths.govukfrontend + 'icons/',
-    destination: 'icons'
+    source: '../' + paths.govukfrontend + 'assets/',
+    destination: 'assets'
   }))
 
   // copy static assets from node_modules/iframe-resizer

diff --git a/tasks/serve.js b/tasks/serve.js
@@ -9,7 +9,7 @@ metalsmith.use(browsersync({
   files: [
     paths.source + '**/*',
     paths.views + '**/*',
-    'node_modules/@govuk-frontend/**/*'
+    'node_modules/@govuk-frontend/frontend/**/*'
   ] // files to watch
 }))