From 96dd9b1fa53e51b1c53b9b73fd2238b419df1766 Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Tue, 2 May 2023 16:29:15 +0100 Subject: [PATCH 01/10] Remove IE8 pinned packages to enable updates --- .github/dependabot.yml | 6 ------ package-lock.json | 6 +++--- package.json.unit.test.js | 14 -------------- packages/govuk-frontend-review/package.json | 4 ++-- shared/tasks/package.json | 2 +- 5 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 package.json.unit.test.js diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b6f61e19cc..70fd72a3ac 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,12 +17,6 @@ updates: allow: - dependency-type: direct - ignore: - # Always ignore legacy packages - - dependency-name: iframe-resizer - - dependency-name: jquery - - dependency-name: rollup - # Update GitHub Actions - package-ecosystem: github-actions directory: / diff --git a/package-lock.json b/package-lock.json index be3262920f..d823d16f1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26689,8 +26689,8 @@ "govuk-frontend-lib": "*", "highlight.js": "^11.7.0", "html5shiv": "^3.7.3", - "iframe-resizer": "3.5.15", - "jquery": "1.12.4", + "iframe-resizer": "^3.5.15", + "jquery": "^1.12.4", "js-beautify": "^1.14.7", "marked": "^4.3.0", "nunjucks": "^3.2.4", @@ -26782,7 +26782,7 @@ "postcss": "^8.4.23", "postcss-load-config": "^4.0.1", "puppeteer": "^19.11.1", - "rollup": "0.59.4", + "rollup": "^0.59.4", "rollup-plugin-node-resolve": "^4.2.4", "rollup-plugin-replace": "^2.2.0", "sass-embedded": "^1.62.0", diff --git a/package.json.unit.test.js b/package.json.unit.test.js deleted file mode 100644 index ecf88190dc..0000000000 --- a/package.json.unit.test.js +++ /dev/null @@ -1,14 +0,0 @@ -const packageLockJson = require('./package-lock.json') -const packageJson = require('./shared/tasks/package.json') - -describe('because rollup 0.60 drops support for Internet Explorer 8', () => { - describe('rollup', () => { - it('should be pinned to 0.59.4 in package.json', () => { - expect(packageJson.devDependencies.rollup).toEqual('0.59.4') - }) - - it('should be pinned to 0.59.4 in package-lock.json', () => { - expect(packageLockJson.packages['node_modules/rollup'].version).toEqual('0.59.4') - }) - }) -}) diff --git a/packages/govuk-frontend-review/package.json b/packages/govuk-frontend-review/package.json index 0d3b89434e..8f81e4bafa 100644 --- a/packages/govuk-frontend-review/package.json +++ b/packages/govuk-frontend-review/package.json @@ -29,8 +29,8 @@ "govuk-frontend-lib": "*", "highlight.js": "^11.7.0", "html5shiv": "^3.7.3", - "iframe-resizer": "3.5.15", - "jquery": "1.12.4", + "iframe-resizer": "^3.5.15", + "jquery": "^1.12.4", "js-beautify": "^1.14.7", "marked": "^4.3.0", "nunjucks": "^3.2.4", diff --git a/shared/tasks/package.json b/shared/tasks/package.json index c4a4a395ed..4dcf727bee 100644 --- a/shared/tasks/package.json +++ b/shared/tasks/package.json @@ -27,7 +27,7 @@ "postcss": "^8.4.23", "postcss-load-config": "^4.0.1", "puppeteer": "^19.11.1", - "rollup": "0.59.4", + "rollup": "^0.59.4", "rollup-plugin-node-resolve": "^4.2.4", "rollup-plugin-replace": "^2.2.0", "sass-embedded": "^1.62.0", From bdfd740d72576529ba2b41ca97a035b9cd82d71d Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Tue, 2 May 2023 16:24:18 +0100 Subject: [PATCH 02/10] Remove IE8 legacy support for Rollup and Terser --- shared/tasks/scripts.mjs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/shared/tasks/scripts.mjs b/shared/tasks/scripts.mjs index 6044430162..5df2b35cdb 100644 --- a/shared/tasks/scripts.mjs +++ b/shared/tasks/scripts.mjs @@ -81,9 +81,6 @@ export async function compileJavaScript ([modulePath, { srcPath, destPath, fileP // for browser + Node.js compatibility format: 'umd', - // Legacy mode is required for IE8 support - legacy: true, - // Used to set the `window` global for 'iife' and 'umd' bundles // Components are given unique names (e.g GOVUKFrontend.Accordion) amd: { id: componentPathToModuleName(modulePath) }, @@ -120,7 +117,6 @@ export function minifyJavaScript (modulePath, result) { // Compatibility workarounds ecma: 5, - ie8: true, safari10: true }) From 5fac4813a7609effd6bb3c1732a945df2040eb56 Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Tue, 2 May 2023 16:18:28 +0100 Subject: [PATCH 03/10] Remove IE8 html5shiv package --- package-lock.json | 6 ------ packages/govuk-frontend-review/package.json | 1 - .../govuk-frontend-review/src/common/middleware/vendor.mjs | 6 ------ .../src/views/examples/scoped-initialisation/index.njk | 3 --- .../src/views/examples/template-custom/index.njk | 3 --- .../src/views/examples/template-default/index.njk | 3 --- shared/lib/names.unit.test.mjs | 4 ---- 7 files changed, 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index d823d16f1a..c7cba37950 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12798,11 +12798,6 @@ "node": ">=10" } }, - "node_modules/html5shiv": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz", - "integrity": "sha512-SZwGvLGNtgp8GbgFX7oXEp8OR1aBt5LliX6dG0kdD1kl3KhMonN0QcSa/A3TsTgFewaGCbIryQunjayWDXzxmw==" - }, "node_modules/htmlparser2": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz", @@ -26688,7 +26683,6 @@ "govuk-frontend-config": "*", "govuk-frontend-lib": "*", "highlight.js": "^11.7.0", - "html5shiv": "^3.7.3", "iframe-resizer": "^3.5.15", "jquery": "^1.12.4", "js-beautify": "^1.14.7", diff --git a/packages/govuk-frontend-review/package.json b/packages/govuk-frontend-review/package.json index 8f81e4bafa..728d26deff 100644 --- a/packages/govuk-frontend-review/package.json +++ b/packages/govuk-frontend-review/package.json @@ -28,7 +28,6 @@ "govuk-frontend-config": "*", "govuk-frontend-lib": "*", "highlight.js": "^11.7.0", - "html5shiv": "^3.7.3", "iframe-resizer": "^3.5.15", "jquery": "^1.12.4", "js-beautify": "^1.14.7", diff --git a/packages/govuk-frontend-review/src/common/middleware/vendor.mjs b/packages/govuk-frontend-review/src/common/middleware/vendor.mjs index fbfa85b718..c7a81746da 100644 --- a/packages/govuk-frontend-review/src/common/middleware/vendor.mjs +++ b/packages/govuk-frontend-review/src/common/middleware/vendor.mjs @@ -3,12 +3,6 @@ import { packageNameToPath } from 'govuk-frontend-lib/names' const router = express.Router() -/** - * Add middleware to serve HTML5 Shiv - * from node_modules - */ -router.use('/html5-shiv/', express.static(packageNameToPath('html5shiv', 'dist'))) - /** * Add middleware to serve legacy code * from node_modules diff --git a/packages/govuk-frontend-review/src/views/examples/scoped-initialisation/index.njk b/packages/govuk-frontend-review/src/views/examples/scoped-initialisation/index.njk index d6fdc3ed46..c4769c8ec7 100644 --- a/packages/govuk-frontend-review/src/views/examples/scoped-initialisation/index.njk +++ b/packages/govuk-frontend-review/src/views/examples/scoped-initialisation/index.njk @@ -4,9 +4,6 @@ {% block head %} - {% endblock %} {% block content %} diff --git a/packages/govuk-frontend-review/src/views/examples/template-custom/index.njk b/packages/govuk-frontend-review/src/views/examples/template-custom/index.njk index a5d472bba6..be9c8dbb54 100644 --- a/packages/govuk-frontend-review/src/views/examples/template-custom/index.njk +++ b/packages/govuk-frontend-review/src/views/examples/template-custom/index.njk @@ -26,9 +26,6 @@ {% block head %} - {% endblock %} diff --git a/packages/govuk-frontend-review/src/views/examples/template-default/index.njk b/packages/govuk-frontend-review/src/views/examples/template-default/index.njk index 9a2cd51ec6..0b21b053ed 100644 --- a/packages/govuk-frontend-review/src/views/examples/template-default/index.njk +++ b/packages/govuk-frontend-review/src/views/examples/template-default/index.njk @@ -2,9 +2,6 @@ {% block head %} - {% endblock %} {% block content %} diff --git a/shared/lib/names.unit.test.mjs b/shared/lib/names.unit.test.mjs index 4175fe5312..df6510cea3 100644 --- a/shared/lib/names.unit.test.mjs +++ b/shared/lib/names.unit.test.mjs @@ -129,10 +129,6 @@ describe('componentPathToModuleName', () => { describe('packageNameToPath', () => { const packages = [ - { - name: 'html5shiv', - path: join(paths.root, 'node_modules/html5shiv') - }, { name: 'govuk_template_jinja', path: join(paths.root, 'node_modules/govuk_template_jinja') From 9943030cdf4bb6e4008d8ce85951a545bb75badc Mon Sep 17 00:00:00 2001 From: Colin Rotherham Date: Tue, 2 May 2023 16:30:43 +0100 Subject: [PATCH 04/10] Remove IE8 iframe-resizer polyfills --- packages/govuk-frontend-review/src/views/component-preview.njk | 3 --- packages/govuk-frontend-review/src/views/layouts/layout.njk | 3 --- 2 files changed, 6 deletions(-) diff --git a/packages/govuk-frontend-review/src/views/component-preview.njk b/packages/govuk-frontend-review/src/views/component-preview.njk index a8fc0d897d..e772d5d659 100644 --- a/packages/govuk-frontend-review/src/views/component-preview.njk +++ b/packages/govuk-frontend-review/src/views/component-preview.njk @@ -16,8 +16,5 @@ {% endblock %} {% block scripts %} - {% endblock %} diff --git a/packages/govuk-frontend-review/src/views/layouts/layout.njk b/packages/govuk-frontend-review/src/views/layouts/layout.njk index 7a20b5b196..13d5bf8169 100644 --- a/packages/govuk-frontend-review/src/views/layouts/layout.njk +++ b/packages/govuk-frontend-review/src/views/layouts/layout.njk @@ -11,9 +11,6 @@ {% block bodyEnd %} {{ super() }} {% block scripts %} -