From 2a0fb42745db8b01381d97201c705ecc8096367e Mon Sep 17 00:00:00 2001 From: Stuart Clark Date: Tue, 20 Aug 2024 10:42:15 +1000 Subject: [PATCH] chore: update dependencies and versions --- .circleci/config.yml | 4 +-- .nvmrc | 2 +- examples/druxt-site/package.json | 5 ++++ examples/druxt-site/yarn.lock | 16 +++--------- package.json | 7 ++++- yarn.lock | 45 ++++++++++++++++++++------------ 6 files changed, 46 insertions(+), 33 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cd0f2d8cb..5cffd2637 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: - checkout - restore_cache: - keys:s + keys: - v1-dependencies-{{ checksum "package.json" }} # fallback to using the latest cache if no exact match is found. - v1-dependencies- @@ -84,7 +84,7 @@ jobs: test_e2e: machine: - image: ubuntu-2004:2022.07.1 + image: ubuntu-2204:edge working_directory: ~/repo environment: DDEV_NONINTERACTIVE: "true" diff --git a/.nvmrc b/.nvmrc index 47979412e..bb52a169c 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.20.1 +v18.18.2 diff --git a/examples/druxt-site/package.json b/examples/druxt-site/package.json index 406b042a7..5f9ef1583 100644 --- a/examples/druxt-site/package.json +++ b/examples/druxt-site/package.json @@ -18,5 +18,10 @@ "@nuxt/postcss8": "latest", "@nuxtjs/storybook": "latest", "postcss": "latest" + }, + "resolutions": { + "vue": "^2.7", + "vue-server-renderer": "^2.7", + "vue-template-compiler": "^2.7" } } diff --git a/examples/druxt-site/yarn.lock b/examples/druxt-site/yarn.lock index a560a2445..4ebe773b4 100644 --- a/examples/druxt-site/yarn.lock +++ b/examples/druxt-site/yarn.lock @@ -18770,7 +18770,7 @@ __metadata: languageName: node linkType: hard -"vue-server-renderer@npm:^2.7.16": +"vue-server-renderer@npm:^2.7": version: 2.7.16 resolution: "vue-server-renderer@npm:2.7.16" dependencies: @@ -18796,17 +18796,7 @@ __metadata: languageName: node linkType: hard -"vue-template-compiler@npm:^2.6.14": - version: 2.7.8 - resolution: "vue-template-compiler@npm:2.7.8" - dependencies: - de-indent: ^1.0.2 - he: ^1.2.0 - checksum: e0886488f46055c6e8f59c57fdcc624d1b241aaa0995977482381124a4bf602142743bb6127cf13fa8b04e4c1070253c7aa9b77abc158cf7ab988b223cddbf24 - languageName: node - linkType: hard - -"vue-template-compiler@npm:^2.7.16": +"vue-template-compiler@npm:^2.7": version: 2.7.16 resolution: "vue-template-compiler@npm:2.7.16" dependencies: @@ -18823,7 +18813,7 @@ __metadata: languageName: node linkType: hard -"vue@npm:^2.7.16": +"vue@npm:^2.7": version: 2.7.16 resolution: "vue@npm:2.7.16" dependencies: diff --git a/package.json b/package.json index bfa63dff2..0f9d4d947 100644 --- a/package.json +++ b/package.json @@ -67,5 +67,10 @@ "vue-jest": "3.0.7", "vue-template-compiler": "2.7.14" }, - "packageManager": "yarn@3.6.1" + "packageManager": "yarn@3.6.1", + "resolutions": { + "vue": "^2.7", + "vue-server-renderer": "^2.7", + "vue-template-compiler": "^2.7" + } } diff --git a/yarn.lock b/yarn.lock index 632b22444..8f79c2dcd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2280,7 +2280,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.13, @babel/parser@npm:^7.18.4": +"@babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.13": version: 7.18.13 resolution: "@babel/parser@npm:7.18.13" bin: @@ -2307,7 +2307,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3": +"@babel/parser@npm:^7.23.5, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3": version: 7.25.3 resolution: "@babel/parser@npm:7.25.3" dependencies: @@ -7441,14 +7441,18 @@ __metadata: languageName: node linkType: hard -"@vue/compiler-sfc@npm:2.7.14": - version: 2.7.14 - resolution: "@vue/compiler-sfc@npm:2.7.14" +"@vue/compiler-sfc@npm:2.7.16": + version: 2.7.16 + resolution: "@vue/compiler-sfc@npm:2.7.16" dependencies: - "@babel/parser": ^7.18.4 + "@babel/parser": ^7.23.5 postcss: ^8.4.14 + prettier: ^1.18.2 || ^2.0.0 source-map: ^0.6.1 - checksum: 25e00abaecb311f1effbf539bc3e4fdeedb39d35f9c2947b2640187a047e6a7400e693fd7da1d3a98977b9078c5bf629ca47f8b9a59dc14a080c0a1e1dd06a49 + dependenciesMeta: + prettier: + optional: true + checksum: cf3e498ff01f0876769fa0ec2fc679f18238c42b96ee19744cca94b0b0d0c25c274e7fcad536dab3efb4aad48558219dba861c3937d06d9d91d55be368747097 languageName: node linkType: hard @@ -20239,6 +20243,15 @@ fsevents@^1.2.7: languageName: node linkType: hard +"prettier@npm:^1.18.2 || ^2.0.0": + version: 2.8.8 + resolution: "prettier@npm:2.8.8" + bin: + prettier: bin-prettier.js + checksum: b49e409431bf129dd89238d64299ba80717b57ff5a6d1c1a8b1a28b590d998a34e083fa13573bc732bb8d2305becb4c9a4407f8486c81fa7d55100eb08263cf8 + languageName: node + linkType: hard + "prettier@npm:^2.7.1": version: 2.7.1 resolution: "prettier@npm:2.7.1" @@ -24732,13 +24745,13 @@ typescript@^4.3.5: languageName: node linkType: hard -"vue-template-compiler@npm:2.7.14": - version: 2.7.14 - resolution: "vue-template-compiler@npm:2.7.14" +"vue-template-compiler@npm:^2.7": + version: 2.7.16 + resolution: "vue-template-compiler@npm:2.7.16" dependencies: de-indent: ^1.0.2 he: ^1.2.0 - checksum: eba9d2eed6b7110c963bc356b47bdd11d4023d25148abb7e5f7826db2fefe7ad8a575787ee0d8fa47701d44a6f54bde475279b1319f44e1049271eb2419f93a7 + checksum: a0d52ecbb99bad37f370341b5c594c5caa1f72b15b3f225148ef378fc06aa25c93185ef061f7e6e5e443c9067e70d8f158742716112acf84088932ebcc49ad10 languageName: node linkType: hard @@ -24749,13 +24762,13 @@ typescript@^4.3.5: languageName: node linkType: hard -"vue@npm:2.7.14, vue@npm:^2.7.14": - version: 2.7.14 - resolution: "vue@npm:2.7.14" +"vue@npm:^2.7": + version: 2.7.16 + resolution: "vue@npm:2.7.16" dependencies: - "@vue/compiler-sfc": 2.7.14 + "@vue/compiler-sfc": 2.7.16 csstype: ^3.1.0 - checksum: 8b06da67cc40870c66a30b7a6bc2874950cd4383792c371eb30497dd14fc7b41cf308b1c4517368d8f0e7ac16198c08de19236f6a79fe43f4bdbc4a1d9d4ad07 + checksum: 42eb129edbd2b647b7a5e0655d69fb2dfcba55009bd4cc6a80da5006ba19054bcbf56554599d9b4379f4aa3bfabc0b4e68c0d7fb47d92b5e41d56b38791553eb languageName: node linkType: hard