From 9dacb22ec99ea1c9f863b73a1ffdd55476c58707 Mon Sep 17 00:00:00 2001 From: Rory Doak Date: Tue, 17 Sep 2024 09:32:36 +0100 Subject: [PATCH 1/2] fix: new ref to planx-core --- editor.planx.uk/package.json | 2 +- editor.planx.uk/pnpm-lock.yaml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index 2cd00f4b21..de8b78cd38 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -15,7 +15,7 @@ "@mui/material": "^5.15.10", "@mui/utils": "^5.15.11", "@opensystemslab/map": "1.0.0-alpha.3", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d47553e", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#5ed4195", "@tiptap/core": "^2.4.0", "@tiptap/extension-bold": "^2.0.3", "@tiptap/extension-bubble-menu": "^2.1.13", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index a0ee2beed6..e32f1d702e 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -47,8 +47,8 @@ dependencies: specifier: 1.0.0-alpha.3 version: 1.0.0-alpha.3 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#d47553e - version: github.com/theopensystemslab/planx-core/d47553e(@types/react@18.2.45) + specifier: git+https://github.com/theopensystemslab/planx-core#5ed4195 + version: github.com/theopensystemslab/planx-core/5ed4195(@types/react@18.2.45) '@tiptap/core': specifier: ^2.4.0 version: 2.4.0(@tiptap/pm@2.0.3) @@ -21061,6 +21061,7 @@ packages: /workbox-google-analytics@6.6.0: resolution: {integrity: sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==} + deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained dependencies: workbox-background-sync: 6.6.0 workbox-core: 6.6.0 @@ -21360,9 +21361,9 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - github.com/theopensystemslab/planx-core/d47553e(@types/react@18.2.45): - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d47553e} - id: github.com/theopensystemslab/planx-core/d47553e + github.com/theopensystemslab/planx-core/5ed4195(@types/react@18.2.45): + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/5ed4195} + id: github.com/theopensystemslab/planx-core/5ed4195 name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true From 9474325bba429cc54d865a689bcfcdf0dbb76c00 Mon Sep 17 00:00:00 2001 From: Rory Doak Date: Tue, 17 Sep 2024 09:38:53 +0100 Subject: [PATCH 2/2] new merged planx-core refs --- api.planx.uk/package.json | 2 +- api.planx.uk/pnpm-lock.yaml | 8 ++++---- e2e/tests/api-driven/package.json | 2 +- e2e/tests/api-driven/pnpm-lock.yaml | 8 ++++---- e2e/tests/ui-driven/package.json | 2 +- e2e/tests/ui-driven/pnpm-lock.yaml | 8 ++++---- editor.planx.uk/package.json | 2 +- editor.planx.uk/pnpm-lock.yaml | 10 +++++----- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json index 33042b0c16..54e01911eb 100644 --- a/api.planx.uk/package.json +++ b/api.planx.uk/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@airbrake/node": "^2.1.8", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d47553e", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#c515291", "@types/isomorphic-fetch": "^0.0.36", "adm-zip": "^0.5.10", "aws-sdk": "^2.1467.0", diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml index 4322bf9d5f..f5ab2e0e19 100644 --- a/api.planx.uk/pnpm-lock.yaml +++ b/api.planx.uk/pnpm-lock.yaml @@ -14,8 +14,8 @@ dependencies: specifier: ^2.1.8 version: 2.1.8 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#d47553e - version: github.com/theopensystemslab/planx-core/d47553e + specifier: git+https://github.com/theopensystemslab/planx-core#c515291 + version: github.com/theopensystemslab/planx-core/c515291 '@types/isomorphic-fetch': specifier: ^0.0.36 version: 0.0.36 @@ -6137,8 +6137,8 @@ packages: resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} dev: false - github.com/theopensystemslab/planx-core/d47553e: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d47553e} + github.com/theopensystemslab/planx-core/c515291: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/c515291} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json index d5e27fd240..4669e9198d 100644 --- a/e2e/tests/api-driven/package.json +++ b/e2e/tests/api-driven/package.json @@ -7,7 +7,7 @@ "packageManager": "pnpm@8.6.6", "dependencies": { "@cucumber/cucumber": "^9.3.0", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d47553e", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#c515291", "axios": "^1.7.4", "dotenv": "^16.3.1", "dotenv-expand": "^10.0.0", diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml index 31f0a8f970..8ba8e39375 100644 --- a/e2e/tests/api-driven/pnpm-lock.yaml +++ b/e2e/tests/api-driven/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^9.3.0 version: 9.3.0 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#d47553e - version: github.com/theopensystemslab/planx-core/d47553e + specifier: git+https://github.com/theopensystemslab/planx-core#c515291 + version: github.com/theopensystemslab/planx-core/c515291 axios: specifier: ^1.7.4 version: 1.7.4 @@ -2932,8 +2932,8 @@ packages: resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} dev: false - github.com/theopensystemslab/planx-core/d47553e: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d47553e} + github.com/theopensystemslab/planx-core/c515291: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/c515291} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json index ed53dde709..ed22c415be 100644 --- a/e2e/tests/ui-driven/package.json +++ b/e2e/tests/ui-driven/package.json @@ -8,7 +8,7 @@ "postinstall": "./install-dependencies.sh" }, "dependencies": { - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d47553e", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#c515291", "axios": "^1.7.4", "dotenv": "^16.3.1", "eslint": "^8.56.0", diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml index aef5a7a65b..8164ef6585 100644 --- a/e2e/tests/ui-driven/pnpm-lock.yaml +++ b/e2e/tests/ui-driven/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#d47553e - version: github.com/theopensystemslab/planx-core/d47553e + specifier: git+https://github.com/theopensystemslab/planx-core#c515291 + version: github.com/theopensystemslab/planx-core/c515291 axios: specifier: ^1.7.4 version: 1.7.4 @@ -2674,8 +2674,8 @@ packages: resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} dev: false - github.com/theopensystemslab/planx-core/d47553e: - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/d47553e} + github.com/theopensystemslab/planx-core/c515291: + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/c515291} name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json index de8b78cd38..4d01590e3f 100644 --- a/editor.planx.uk/package.json +++ b/editor.planx.uk/package.json @@ -15,7 +15,7 @@ "@mui/material": "^5.15.10", "@mui/utils": "^5.15.11", "@opensystemslab/map": "1.0.0-alpha.3", - "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#5ed4195", + "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#c515291", "@tiptap/core": "^2.4.0", "@tiptap/extension-bold": "^2.0.3", "@tiptap/extension-bubble-menu": "^2.1.13", diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml index e32f1d702e..140ecc1a78 100644 --- a/editor.planx.uk/pnpm-lock.yaml +++ b/editor.planx.uk/pnpm-lock.yaml @@ -47,8 +47,8 @@ dependencies: specifier: 1.0.0-alpha.3 version: 1.0.0-alpha.3 '@opensystemslab/planx-core': - specifier: git+https://github.com/theopensystemslab/planx-core#5ed4195 - version: github.com/theopensystemslab/planx-core/5ed4195(@types/react@18.2.45) + specifier: git+https://github.com/theopensystemslab/planx-core#c515291 + version: github.com/theopensystemslab/planx-core/c515291(@types/react@18.2.45) '@tiptap/core': specifier: ^2.4.0 version: 2.4.0(@tiptap/pm@2.0.3) @@ -21361,9 +21361,9 @@ packages: use-sync-external-store: 1.2.0(react@18.2.0) dev: false - github.com/theopensystemslab/planx-core/5ed4195(@types/react@18.2.45): - resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/5ed4195} - id: github.com/theopensystemslab/planx-core/5ed4195 + github.com/theopensystemslab/planx-core/c515291(@types/react@18.2.45): + resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/c515291} + id: github.com/theopensystemslab/planx-core/c515291 name: '@opensystemslab/planx-core' version: 1.0.0 prepare: true