Ensure govuk-frontend is loaded from linked package

Rather than using directory traversal `../../../src` etc

app/nodemon.json

@@ -1,6 +1,6 @@
 {
   "watch": ["./src", "../package/src/govuk/**/*.{json,yaml}"],
-  "ignore": ["**/*.test.*"],
+  "ignore": ["./src/javascripts/**", "**/*.test.*"],
   "ext": "mjs,json,yaml",
   "quiet": true
 }

app/package.json

@@ -24,6 +24,7 @@
     "govuk_frontend_toolkit": "^9.0.1",
     "govuk_template_jinja": "^0.26.0",
     "govuk-elements-sass": "3.1.3",
+    "govuk-frontend": "*",
     "gulp": "^4.0.2",
     "gulp-cli": "^2.3.0",
     "highlight.js": "^11.7.0",

app/src/javascripts/all.mjs

@@ -0,0 +1,4 @@
+import * as GOVUKFrontend from 'govuk-frontend'
+
+// Manually window global for tests
+window.GOVUKFrontend = GOVUKFrontend

app/src/stylesheets/app-ie8.scss

@@ -1,3 +1,3 @@
-@import "../../../package/src/govuk/all-ie8";
+@import "govuk/all-ie8";
 @import "partials/app";
 @import "partials/banner";

app/src/stylesheets/app.scss

@@ -1,7 +1,7 @@
 $govuk-show-breakpoints: true;
 $govuk-new-link-styles: true;
 
-@import "../../../package/src/govuk/all";
+@import "govuk/all";
 @import "partials/app";
 @import "partials/code";
 @import "partials/banner";

app/src/stylesheets/full-page-examples/campaign-page.scss

@@ -1,6 +1,6 @@
-@import "../../../../package/src/govuk/base";
+@import "govuk/base";
 $govuk-new-link-styles: true;
-@import "../../../../package/src/govuk/core/all";
+@import "govuk/core/all";
 
 .app-header--campaign {
   padding-bottom: govuk-spacing(2);

app/src/stylesheets/full-page-examples/search.scss

@@ -1,6 +1,6 @@
-@import "../../../../package/src/govuk/base";
+@import "govuk/base";
 $govuk-new-link-styles: true;
-@import "../../../../package/src/govuk/core/all";
+@import "govuk/core/all";
 
 .app-document-list > li {
   padding-top: govuk-spacing(4);

app/tasks/scripts.mjs

@@ -12,7 +12,7 @@ import { npm, scripts, task } from '../../tasks/index.mjs'
 export const compile = gulp.series(
   task.name('compile:js', () =>
     scripts.compile('all.mjs', {
-      srcPath: join(paths.src, 'govuk'),
+      srcPath: join(paths.app, 'src/javascripts'),
       destPath: join(paths.app, 'dist/javascripts'),
 
       filePath (file) {

app/tasks/watch.mjs

@@ -28,6 +28,7 @@ export function watch () {
 
     gulp.watch([
       `${slash(paths.root)}/jsdoc.config.js`,
+      `${slash(paths.app)}/src/javascripts/**/*.mjs`,
       `${slash(paths.src)}/govuk/**/*.mjs`
     ], gulp.parallel(
       npm.script('lint:js'),

docs/examples/webpack/assets/stylesheets/app.scss

@@ -1 +1 @@
-@import "govuk-frontend/govuk/all";
+@import "govuk/all";

docs/examples/webpack/webpack.config.js

@@ -4,7 +4,7 @@ const CopyPlugin = require('copy-webpack-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
 
 // Module resolution
-const frontendPath = dirname(require.resolve('govuk-frontend'))
+const frontendPath = resolve(dirname(require.resolve('govuk-frontend')), '../')
 
 module.exports = ({ WEBPACK_SERVE }, { mode }) => ({
   devServer: {
@@ -48,6 +48,7 @@ module.exports = ({ WEBPACK_SERVE }, { mode }) => ({
             loader: 'sass-loader',
             options: {
               sassOptions: {
+                includePaths: [frontendPath],
                 quietDeps: true
               }
             }
@@ -84,7 +85,7 @@ module.exports = ({ WEBPACK_SERVE }, { mode }) => ({
       patterns: [
         resolve(__dirname, 'index.html'),
         {
-          context: resolve(frontendPath, './assets'),
+          context: resolve(frontendPath, './govuk/assets'),
           from: '{fonts,images}/**',
           to: './assets'
         }

package.json

@@ -72,6 +72,7 @@
     "postcss-unrgba": "^1.1.1",
     "puppeteer": "^19.8.2",
     "rollup": "0.59.4",
+    "rollup-plugin-node-resolve": "^4.2.4",
     "rollup-plugin-replace": "^2.2.0",
     "sass-embedded": "^1.60.0",
     "sassdoc": "^2.7.4",

package/src/govuk/components/globals.test.mjs

@@ -31,14 +31,15 @@ describe('GOV.UK Frontend', () => {
     it('exports Components', async () => {
       const components = exported
         .filter(method => !['initAll', 'version'].includes(method))
+        .sort()
 
       // Ensure GOV.UK Frontend exports the expected components
       expect(components).toEqual([
         'Accordion',
         'Button',
-        'Details',
         'CharacterCount',
         'Checkboxes',
+        'Details',
         'ErrorSummary',
         'Header',
         'NotificationBanner',

tasks/scripts.mjs

@@ -2,6 +2,7 @@ import { join, parse } from 'path'
 
 import PluginError from 'plugin-error'
 import { rollup } from 'rollup'
+import resolve from 'rollup-plugin-node-resolve'
 import replace from 'rollup-plugin-replace'
 import { minify } from 'terser'
 
@@ -42,7 +43,8 @@ export async function compileJavaScript ([modulePath, { srcPath, destPath, fileP
   const moduleDestPath = join(destPath, filePath ? filePath(parse(modulePath)) : modulePath)
 
   // Rollup plugins
-  const plugins = []
+  // @ts-expect-error "This expression is not callable" due to incorrect types
+  const plugins = [resolve()]
 
   if (!isDev) {
     // Add GOV.UK Frontend release version

tasks/styles.mjs

@@ -65,6 +65,7 @@ export async function compileStylesheet ([modulePath, { srcPath, destPath, fileP
       // Resolve @imports via
       loadPaths: [
         join(paths.root, 'node_modules/govuk_frontend_toolkit/stylesheets'),
+        join(paths.root, 'node_modules/govuk-frontend/src'),
         join(paths.root, 'node_modules')
       ],