Skip to content

Commit

Permalink
Merge pull request #618 from UKHomeOffice/update-not-govuk-v0.15.2
Browse files Browse the repository at this point in the history
Update NotGovUK to v0.15.2
  • Loading branch information
daniel-ac-martin authored Dec 12, 2024
2 parents de66233 + 7c94c4e commit cf68ae4
Show file tree
Hide file tree
Showing 67 changed files with 8,775 additions and 3,982 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/change-assurance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
app: [ 'docs', 'next-example' ]
app: [ 'docs', 'next-example', 'remix-example' ]
steps:

- name: Check out repository
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
app: [ 'docs', 'next-example' ]
app: [ 'docs', 'next-example', 'remix-example' ]
browser: [ 'chromium', 'firefox', 'electron' ]
steps:

Expand Down
2 changes: 2 additions & 0 deletions .zap/rules.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@
# We don't control the vendors code
10110 OUTOFSCOPE .*/public/js/vendors\..*\.bundle\.js
90022 OUTOFSCOPE .*/public/js/vendors\..*\.bundle\.js
# False positive? Remove in future?
10003 OUTOFSCOPE .*/public/js/vendors\..*\.bundle\.js
22 changes: 11 additions & 11 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@
"@graphql-tools/schema": "10.0.7",
"@hods/components": "workspace:^0.5.0",
"@hods/sass-base": "workspace:^0.5.0",
"@not-govuk/anchor-list": "^0.15.0",
"@not-govuk/app-composer": "^0.15.0",
"@not-govuk/app-plop-pack": "^0.15.0",
"@not-govuk/asset-proxy": "^0.15.0",
"@not-govuk/client-renderer": "^0.15.0",
"@not-govuk/components": "^0.15.0",
"@not-govuk/engine": "^0.15.0",
"@not-govuk/router": "^0.15.0",
"@not-govuk/server-renderer": "^0.15.0",
"@not-govuk/user-info": "^0.15.0",
"@not-govuk/webpack-config": "^0.15.0",
"@not-govuk/anchor-list": "^0.15.2",
"@not-govuk/app-composer": "^0.15.2",
"@not-govuk/app-plop-pack": "^0.15.2",
"@not-govuk/asset-proxy": "^0.15.2",
"@not-govuk/client-renderer": "^0.15.2",
"@not-govuk/components": "^0.15.2",
"@not-govuk/engine": "^0.15.2",
"@not-govuk/router": "^0.15.2",
"@not-govuk/server-renderer": "^0.15.2",
"@not-govuk/user-info": "^0.15.2",
"@not-govuk/webpack-config": "^0.15.2",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"@types/webpack-env": "1.18.5",
Expand Down
7 changes: 2 additions & 5 deletions apps/next-example/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ import webpack from 'webpack';
const nextConfig = {
// This allows us to handle next-example, the same way we do standard apps, in CI
distDir: 'dist',
// Prevent react-router from resolving in order to use Next's router instead.
// Normally users will not need to do this, as they will not have react-router installed.
webpack: (config, _options) => ({
...config,
plugins: [
...config.plugins,
new webpack.NormalModuleReplacementPlugin(/^react-helmet-async$/, '@not-govuk\/VOID-react-helmet-async'),
new webpack.NormalModuleReplacementPlugin(/^react-router$/, '@not-govuk\/VOID-react-router'),
new webpack.NormalModuleReplacementPlugin(/^react-router-dom$/, '@not-govuk\/VOID-react-router-dom'),
new webpack.NormalModuleReplacementPlugin(/^@not-govuk\/head$/, '@not-govuk\/head\/dummy'), // ADD THIS LINE
new webpack.NormalModuleReplacementPlugin(/^@not-govuk\/router$/, '@not-govuk\/router\/next'), // ADD THIS LINE
]
})
};
Expand Down
2 changes: 1 addition & 1 deletion apps/next-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"dependencies": {
"@hods/components": "workspace:^0.5.0",
"@not-govuk/simple-components": "^0.15.0",
"@not-govuk/simple-components": "^0.15.2",
"next": "15.0.3",
"react": "18.3.1",
"react-dom": "18.3.1"
Expand Down
Binary file added apps/next-example/public/apple-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/next-example/public/apple-icon152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/next-example/public/apple-icon167.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/next-example/public/apple-icon180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/next-example/public/favicon.ico
Binary file not shown.
1 change: 0 additions & 1 deletion apps/next-example/public/next.svg

This file was deleted.

Binary file added apps/next-example/public/opengraph-image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion apps/next-example/public/vercel.svg

This file was deleted.

Binary file removed apps/next-example/src/app/favicon.ico
Binary file not shown.
107 changes: 0 additions & 107 deletions apps/next-example/src/app/globals.css

This file was deleted.

12 changes: 6 additions & 6 deletions apps/next-example/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import type { Metadata } from "next";
import type { Metadata, Viewport } from "next";
import React from "react";
//import { Inter } from "next/font/google";
import { Page } from '@hods/components';
/* import "./globals.css"; */

//const inter = Inter({ subsets: ["latin"] });

export const metadata: Metadata = {
title: "Create Next App",
description: "Generated by create next app",
description: "Generated by create next app"
};

export const viewport: Viewport = {
themeColor: '#ffffff'
};

export default function RootLayout({
Expand Down
Loading

1 comment on commit cf68ae4

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 Published on https://hods.netlify.app as production
🚀 Deployed on https://675b2d995ab4ed1da25dc9ef--hods.netlify.app

Please sign in to comment.