Issue #3299099 by brianperry: Upgrade Drupal State Dependency to 3.0.0 or above (ed18d17c) · Commits · project / gdwc

gdwc-provider/gdwc-provider.js

+3 −8

Original line number	Diff line number	Diff line
		@@ -19,13 +19,9 @@ export class GdwcProvider extends LitElement {
		*/
		id: { type: String },
		/**
		* Relationships to be included.
		* json:api query parameter values
		*/
		include: { type: String },
		/**
		* A GraphQL query to be used when retrieving the object.
		*/
		query: { type: String },
		params: { type: String },
		/**
		* Flag for debug mode
		*/
		@@ -46,8 +42,7 @@ export class GdwcProvider extends LitElement {
		const store = await this.storeController.query({
		objectName: this.objectName,
		id: this.id,
		query: this.query,
		include: this.include,
		params: this.params,
		});

		if (this.debug) {

gdwc-provider/gdwc-provider.stories.js

+15 −7

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ import { html } from 'lit';
		import '../store.js';
		import '../provider.js';
		import '../card.js';
		import '../container.js';

		export default {
		title: 'Data/Provider (Experimental)',
		@@ -24,7 +25,7 @@ const collectionTemplate = ({ apiBase, debug, objectName }) =>
		<gdwc-store apiBase=${apiBase} ?debug=${debug}>
		<gdwc-provider
		objectName=${objectName}
		include="field_media_image.field_media_image"
		params="include=field_media_image.field_media_image"
		?debug=${debug}
		>
		<template>
		@@ -51,11 +52,18 @@ const resourceTemplate = ({ apiBase, debug, apiPrefix, objectName }) =>
		<gdwc-store apiBase=${apiBase} apiPrefix=${apiPrefix} ?debug=${debug}>
		<gdwc-provider
		objectName=${objectName}
		id="b08476b6-8d10-4ac5-b539-ca3b9e8161ec"
		id="c1a87e33-06a7-4c76-97dd-85b8d6fcd45b"
		>
		<template>
		<style>
		:host {
		--gdwc-padding: var(--size-6);
		}
		</style>
		<gdwc-container>
		<h2>{{ title }}</h2>
		<p>{{ body }}</p>
		<p>{{ body.processed }}</p>
		</gdwc-container>
		</template>
		</gdwc-provider>
		</gdwc-store>
		@@ -71,8 +79,8 @@ Collection.args = {

		export const Resource = resourceTemplate.bind({});
		Resource.args = {
		apiBase: 'https://live-contentacms.pantheonsite.io',
		apiPrefix: 'api',
		apiBase: 'https://dev-ds-demo.pantheonsite.io',
		apiPrefix: 'jsonapi',
		debug: true,
		objectName: 'pages',
		objectName: 'node--page',
		};

gdwc-store/store-controller.js

+2 −5

Original line number	Diff line number	Diff line
		@@ -30,11 +30,8 @@ export class StoreController {
		this.host.dispatchEvent(this.storeEvent);
		}

		async query({ objectName, query, id, include }) {
		if (include) {
		this.store.params.addInclude([include]);
		}
		const result = await this.store.getObject({ objectName, id, query });
		async query({ objectName, params, id }) {
		const result = await this.store.getObject({ objectName, id, params });
		this.host.requestUpdate();
		return result;
		}

package-lock.json

+14 −424

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		"version": "4.0.1",
		"license": "GPL-2.0-or-later",
		"dependencies": {
		"@gdwc/drupal-state": "^2.5.2",
		"@gdwc/drupal-state": "^4.1.0",
		"linkset-menu": "0.0.2",
		"lit": "^2.2.7",
		"object-path": "^0.11.8",
		@@ -147,41 +147,6 @@
		"node": ">=6.0.0"
		}
		},
		"node_modules/@apollo/client": {
		"version": "3.5.10",
		"license": "MIT",
		"dependencies": {
		"@graphql-typed-document-node/core": "^3.0.0",
		"@wry/context": "^0.6.0",
		"@wry/equality": "^0.5.0",
		"@wry/trie": "^0.3.0",
		"graphql-tag": "^2.12.3",
		"hoist-non-react-statics": "^3.3.2",
		"optimism": "^0.16.1",
		"prop-types": "^15.7.2",
		"symbol-observable": "^4.0.0",
		"ts-invariant": "^0.9.4",
		"tslib": "^2.3.0",
		"zen-observable-ts": "^1.2.0"
		},
		"peerDependencies": {
		"graphql": "^14.0.0 \|\| ^15.0.0 \|\| ^16.0.0",
		"graphql-ws": "^5.5.5",
		"react": "^16.8.0 \|\| ^17.0.0",
		"subscriptions-transport-ws": "^0.9.0 \|\| ^0.11.0"
		},
		"peerDependenciesMeta": {
		"graphql-ws": {
		"optional": true
		},
		"react": {
		"optional": true
		},
		"subscriptions-transport-ws": {
		"optional": true
		}
		}
		},
		"node_modules/@babel/code-frame": {
		"version": "7.18.6",
		"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
		@@ -2118,37 +2083,24 @@
		"dev": true
		},
		"node_modules/@gdwc/drupal-state": {
		"version": "2.5.2",
		"version": "4.1.0",
		"resolved": "https://registry.npmjs.org/@gdwc/drupal-state/-/drupal-state-4.1.0.tgz",
		"integrity": "sha512-EjLvEU9e6hE0VRy0uPzI5rurB4B/bl9UVTScf0Y64R5cOYJ2h+c0XymHbCfShrhMY8H5FxnMYVu+Bu9OEUkfcw==",
		"hasInstallScript": true,
		"license": "GPL-2.0-or-later",
		"dependencies": {
		"@apollo/client": "^3.4.15",
		"@babel/runtime": "^7.16.7",
		"@docsearch/react": "^1.0.0-alpha.28",
		"@types/humps": "^2.0.1",
		"@types/isomorphic-fetch": "0.0.35",
		"@types/jest": "^27.0.1",
		"apollo-link": "^1.2.14",
		"apollo-link-json-api": "^0.1.2",
		"drupal-jsonapi-params": "^1.2.2",
		"graphql": "^15.6.0",
		"graphql-anywhere": "^4.2.7",
		"humps": "^2.0.1",
		"isomorphic-fetch": "^3.0.0",
		"jest": "^27.0.6",
		"jest-junit": "^12.2.0",
		"jsona": "^1.9.7",
		"jsona": "1.9.7",
		"patch-package": "^6.4.7",
		"qs": "^6.10.1",
		"ts-jest": "^27.0.5",
		"zustand": "^3.5.7"
		}
		},
		"node_modules/@graphql-typed-document-node/core": {
		"version": "3.1.1",
		"license": "MIT",
		"peerDependencies": {
		"graphql": "^0.8.0 \|\| ^0.9.0 \|\| ^0.10.0 \|\| ^0.11.0 \|\| ^0.12.0 \|\| ^0.13.0 \|\| ^14.0.0 \|\| ^15.0.0 \|\| ^16.0.0"
		"zustand": "3.7.2"
		}
		},
		"node_modules/@humanwhocodes/config-array": {
		@@ -6586,10 +6538,6 @@
		"integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==",
		"dev": true
		},
		"node_modules/@types/humps": {
		"version": "2.0.1",
		"license": "MIT"
		},
		"node_modules/@types/is-function": {
		"version": "1.0.1",
		"dev": true,
		@@ -7067,36 +7015,6 @@
		"@xtuc/long": "4.2.2"
		}
		},
		"node_modules/@wry/context": {
		"version": "0.6.1",
		"license": "MIT",
		"dependencies": {
		"tslib": "^2.3.0"
		},
		"engines": {
		"node": ">=8"
		}
		},
		"node_modules/@wry/equality": {
		"version": "0.5.2",
		"license": "MIT",
		"dependencies": {
		"tslib": "^2.3.0"
		},
		"engines": {
		"node": ">=8"
		}
		},
		"node_modules/@wry/trie": {
		"version": "0.3.1",
		"license": "MIT",
		"dependencies": {
		"tslib": "^2.3.0"
		},
		"engines": {
		"node": ">=8"
		}
		},
		"node_modules/@xtuc/ieee754": {
		"version": "1.2.0",
		"dev": true,
		@@ -7365,80 +7283,6 @@
		"node": ">= 8"
		}
		},
		"node_modules/apollo-link": {
		"version": "1.2.14",
		"license": "MIT",
		"dependencies": {
		"apollo-utilities": "^1.3.0",
		"ts-invariant": "^0.4.0",
		"tslib": "^1.9.3",
		"zen-observable-ts": "^0.8.21"
		},
		"peerDependencies": {
		"graphql": "^0.11.3 \|\| ^0.12.3 \|\| ^0.13.0 \|\| ^14.0.0 \|\| ^15.0.0"
		}
		},
		"node_modules/apollo-link-json-api": {
		"version": "0.1.2",
		"license": "MIT",
		"peerDependencies": {
		"apollo-link": ">=1",
		"graphql": ">=0.11",
		"graphql-anywhere": ">=4",
		"humps": ">=2",
		"qs": ">=6"
		}
		},
		"node_modules/apollo-link/node_modules/ts-invariant": {
		"version": "0.4.4",
		"license": "MIT",
		"dependencies": {
		"tslib": "^1.9.3"
		}
		},
		"node_modules/apollo-link/node_modules/tslib": {
		"version": "1.14.1",
		"license": "0BSD"
		},
		"node_modules/apollo-link/node_modules/zen-observable-ts": {
		"version": "0.8.21",
		"license": "MIT",
		"dependencies": {
		"tslib": "^1.9.3",
		"zen-observable": "^0.8.0"
		}
		},
		"node_modules/apollo-utilities": {
		"version": "1.3.4",
		"license": "MIT",
		"dependencies": {
		"@wry/equality": "^0.1.2",
		"fast-json-stable-stringify": "^2.0.0",
		"ts-invariant": "^0.4.0",
		"tslib": "^1.10.0"
		},
		"peerDependencies": {
		"graphql": "^0.11.0 \|\| ^0.12.0 \|\| ^0.13.0 \|\| ^14.0.0 \|\| ^15.0.0"
		}
		},
		"node_modules/apollo-utilities/node_modules/@wry/equality": {
		"version": "0.1.11",
		"license": "MIT",
		"dependencies": {
		"tslib": "^1.9.3"
		}
		},
		"node_modules/apollo-utilities/node_modules/ts-invariant": {
		"version": "0.4.4",
		"license": "MIT",
		"dependencies": {
		"tslib": "^1.9.3"
		}
		},
		"node_modules/apollo-utilities/node_modules/tslib": {
		"version": "1.14.1",
		"license": "0BSD"
		},
		"node_modules/app-root-dir": {
		"version": "1.0.2",
		"dev": true,
		@@ -13851,49 +13695,6 @@
		"version": "4.2.6",
		"license": "ISC"
		},
		"node_modules/graphql": {
		"version": "15.8.0",
		"license": "MIT",
		"engines": {
		"node": ">= 10.x"
		}
		},
		"node_modules/graphql-anywhere": {
		"version": "4.2.7",
		"license": "MIT",
		"dependencies": {
		"apollo-utilities": "^1.3.4",
		"ts-invariant": "^0.3.2",
		"tslib": "^1.10.0"
		},
		"peerDependencies": {
		"graphql": "^0.11.0 \|\| ^0.12.0 \|\| ^0.13.0 \|\| ^14.0.0 \|\| ^15.0.0"
		}
		},
		"node_modules/graphql-anywhere/node_modules/ts-invariant": {
		"version": "0.3.3",
		"license": "MIT",
		"dependencies": {
		"tslib": "^1.9.3"
		}
		},
		"node_modules/graphql-anywhere/node_modules/tslib": {
		"version": "1.14.1",
		"license": "0BSD"
		},
		"node_modules/graphql-tag": {
		"version": "2.12.6",
		"license": "MIT",
		"dependencies": {
		"tslib": "^2.1.0"
		},
		"engines": {
		"node": ">=10"
		},
		"peerDependencies": {
		"graphql": "^0.9.0 \|\| ^0.10.0 \|\| ^0.11.0 \|\| ^0.12.0 \|\| ^0.13.0 \|\| ^14.0.0 \|\| ^15.0.0 \|\| ^16.0.0"
		}
		},
		"node_modules/handlebars": {
		"version": "4.7.7",
		"dev": true,
		@@ -14276,13 +14077,6 @@
		"minimalistic-crypto-utils": "^1.0.1"
		}
		},
		"node_modules/hoist-non-react-statics": {
		"version": "3.3.2",
		"license": "BSD-3-Clause",
		"dependencies": {
		"react-is": "^16.7.0"
		}
		},
		"node_modules/hosted-git-info": {
		"version": "2.8.9",
		"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
		@@ -14526,10 +14320,6 @@
		"node": ">=10.17.0"
		}
		},
		"node_modules/humps": {
		"version": "2.0.1",
		"license": "MIT"
		},
		"node_modules/husky": {
		"version": "8.0.1",
		"resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
		@@ -20590,14 +20380,6 @@
		"node": ">=8"
		}
		},
		"node_modules/optimism": {
		"version": "0.16.1",
		"license": "MIT",
		"dependencies": {
		"@wry/context": "^0.6.0",
		"@wry/trie": "^0.3.0"
		}
		},
		"node_modules/optionator": {
		"version": "0.8.3",
		"license": "MIT",
		@@ -24521,13 +24303,6 @@
		"dev": true,
		"license": "MIT"
		},
		"node_modules/symbol-observable": {
		"version": "4.0.0",
		"license": "MIT",
		"engines": {
		"node": ">=0.10"
		}
		},
		"node_modules/symbol-tree": {
		"version": "3.2.4",
		"license": "MIT"
		@@ -25093,16 +24868,6 @@
		"node": ">=6.10"
		}
		},
		"node_modules/ts-invariant": {
		"version": "0.9.4",
		"license": "MIT",
		"dependencies": {
		"tslib": "^2.1.0"
		},
		"engines": {
		"node": ">=8"
		}
		},
		"node_modules/ts-jest": {
		"version": "27.1.4",
		"license": "MIT",
		@@ -25299,6 +25064,7 @@
		},
		"node_modules/tslib": {
		"version": "2.3.0",
		"dev": true,
		"license": "0BSD"
		},
		"node_modules/tty-browserify": {
		@@ -27073,17 +26839,6 @@
		"url": "https://github.com/sponsors/sindresorhus"
		}
		},
		"node_modules/zen-observable": {
		"version": "0.8.15",
		"license": "MIT"
		},
		"node_modules/zen-observable-ts": {
		"version": "1.2.3",
		"license": "MIT",
		"dependencies": {
		"zen-observable": "0.8.15"
		}
		},
		"node_modules/zustand": {
		"version": "3.7.2",
		"license": "MIT",
		@@ -27208,23 +26963,6 @@
		"@jridgewell/trace-mapping": "^0.3.9"
		}
		},
		"@apollo/client": {
		"version": "3.5.10",
		"requires": {
		"@graphql-typed-document-node/core": "^3.0.0",
		"@wry/context": "^0.6.0",
		"@wry/equality": "^0.5.0",
		"@wry/trie": "^0.3.0",
		"graphql-tag": "^2.12.3",
		"hoist-non-react-statics": "^3.3.2",
		"optimism": "^0.16.1",
		"prop-types": "^15.7.2",
		"symbol-observable": "^4.0.0",
		"ts-invariant": "^0.9.4",
		"tslib": "^2.3.0",
		"zen-observable-ts": "^1.2.0"
		}
		},
		"@babel/code-frame": {
		"version": "7.18.6",
		"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
		@@ -28438,34 +28176,25 @@
		"dev": true
		},
		"@gdwc/drupal-state": {
		"version": "2.5.2",
		"version": "4.1.0",
		"resolved": "https://registry.npmjs.org/@gdwc/drupal-state/-/drupal-state-4.1.0.tgz",
		"integrity": "sha512-EjLvEU9e6hE0VRy0uPzI5rurB4B/bl9UVTScf0Y64R5cOYJ2h+c0XymHbCfShrhMY8H5FxnMYVu+Bu9OEUkfcw==",
		"requires": {
		"@apollo/client": "^3.4.15",
		"@babel/runtime": "^7.16.7",
		"@docsearch/react": "^1.0.0-alpha.28",
		"@types/humps": "^2.0.1",
		"@types/isomorphic-fetch": "0.0.35",
		"@types/jest": "^27.0.1",
		"apollo-link": "^1.2.14",
		"apollo-link-json-api": "^0.1.2",
		"drupal-jsonapi-params": "^1.2.2",
		"graphql": "^15.6.0",
		"graphql-anywhere": "^4.2.7",
		"humps": "^2.0.1",
		"isomorphic-fetch": "^3.0.0",
		"jest": "^27.0.6",
		"jest-junit": "^12.2.0",
		"jsona": "^1.9.7",
		"jsona": "1.9.7",
		"patch-package": "^6.4.7",
		"qs": "^6.10.1",
		"ts-jest": "^27.0.5",
		"zustand": "^3.5.7"
		"zustand": "3.7.2"
		}
		},
		"@graphql-typed-document-node/core": {
		"version": "3.1.1",
		"requires": {}
		},
		"@humanwhocodes/config-array": {
		"version": "0.9.5",
		"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
		@@ -31485,9 +31214,6 @@
		"integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==",
		"dev": true
		},
		"@types/humps": {
		"version": "2.0.1"
		},
		"@types/is-function": {
		"version": "1.0.1",
		"dev": true
		@@ -31910,24 +31636,6 @@
		"@xtuc/long": "4.2.2"
		}
		},
		"@wry/context": {
		"version": "0.6.1",
		"requires": {
		"tslib": "^2.3.0"
		}
		},
		"@wry/equality": {
		"version": "0.5.2",
		"requires": {
		"tslib": "^2.3.0"
		}
		},
		"@wry/trie": {
		"version": "0.3.1",
		"requires": {
		"tslib": "^2.3.0"
		}
		},
		"@xtuc/ieee754": {
		"version": "1.2.0",
		"dev": true
		@@ -32113,63 +31821,6 @@
		"picomatch": "^2.0.4"
		}
		},
		"apollo-link": {
		"version": "1.2.14",
		"requires": {
		"apollo-utilities": "^1.3.0",
		"ts-invariant": "^0.4.0",
		"tslib": "^1.9.3",
		"zen-observable-ts": "^0.8.21"
		},
		"dependencies": {
		"ts-invariant": {
		"version": "0.4.4",
		"requires": {
		"tslib": "^1.9.3"
		}
		},
		"tslib": {
		"version": "1.14.1"
		},
		"zen-observable-ts": {
		"version": "0.8.21",
		"requires": {
		"tslib": "^1.9.3",
		"zen-observable": "^0.8.0"
		}
		}
		}
		},
		"apollo-link-json-api": {
		"version": "0.1.2",
		"requires": {}
		},
		"apollo-utilities": {
		"version": "1.3.4",
		"requires": {
		"@wry/equality": "^0.1.2",
		"fast-json-stable-stringify": "^2.0.0",
		"ts-invariant": "^0.4.0",
		"tslib": "^1.10.0"
		},
		"dependencies": {
		"@wry/equality": {
		"version": "0.1.11",
		"requires": {
		"tslib": "^1.9.3"
		}
		},
		"ts-invariant": {
		"version": "0.4.4",
		"requires": {
		"tslib": "^1.9.3"
		}
		},
		"tslib": {
		"version": "1.14.1"
		}
		}
		},
		"app-root-dir": {
		"version": "1.0.2",
		"dev": true
		@@ -36693,34 +36344,6 @@
		"graceful-fs": {
		"version": "4.2.6"
		},
		"graphql": {
		"version": "15.8.0"
		},
		"graphql-anywhere": {
		"version": "4.2.7",
		"requires": {
		"apollo-utilities": "^1.3.4",
		"ts-invariant": "^0.3.2",
		"tslib": "^1.10.0"
		},
		"dependencies": {
		"ts-invariant": {
		"version": "0.3.3",
		"requires": {
		"tslib": "^1.9.3"
		}
		},
		"tslib": {
		"version": "1.14.1"
		}
		}
		},
		"graphql-tag": {
		"version": "2.12.6",
		"requires": {
		"tslib": "^2.1.0"
		}
		},
		"handlebars": {
		"version": "4.7.7",
		"dev": true,
		@@ -36994,12 +36617,6 @@
		"minimalistic-crypto-utils": "^1.0.1"
		}
		},
		"hoist-non-react-statics": {
		"version": "3.3.2",
		"requires": {
		"react-is": "^16.7.0"
		}
		},
		"hosted-git-info": {
		"version": "2.8.9",
		"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
		@@ -37182,9 +36799,6 @@
		"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
		"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
		},
		"humps": {
		"version": "2.0.1"
		},
		"husky": {
		"version": "8.0.1",
		"resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
		@@ -41271,13 +40885,6 @@
		"resolved": "https://registry.npmjs.org/open-props/-/open-props-1.4.5.tgz",
		"integrity": "sha512-NxNk5gVI97CAYUJjR5wOBhwyLFD8bNsyiPO81j6ctbVKi0+NHhSjcLfd4h++dFnEwFfA5Q0AVZTQWX5cQnz64A=="
		},
		"optimism": {
		"version": "0.16.1",
		"requires": {
		"@wry/context": "^0.6.0",
		"@wry/trie": "^0.3.0"
		}
		},
		"optionator": {
		"version": "0.8.3",
		"requires": {
		@@ -44119,9 +43726,6 @@
		}
		}
		},
		"symbol-observable": {
		"version": "4.0.0"
		},
		"symbol-tree": {
		"version": "3.2.4"
		},
		@@ -44532,12 +44136,6 @@
		"version": "2.1.0",
		"dev": true
		},
		"ts-invariant": {
		"version": "0.9.4",
		"requires": {
		"tslib": "^2.1.0"
		}
		},
		"ts-jest": {
		"version": "27.1.4",
		"requires": {
		@@ -44653,7 +44251,8 @@
		}
		},
		"tslib": {
		"version": "2.3.0"
		"version": "2.3.0",
		"dev": true
		},
		"tty-browserify": {
		"version": "0.0.0",
		@@ -45911,15 +45510,6 @@
		"version": "0.1.0",
		"dev": true
		},
		"zen-observable": {
		"version": "0.8.15"
		},
		"zen-observable-ts": {
		"version": "1.2.3",
		"requires": {
		"zen-observable": "0.8.15"
		}
		},
		"zustand": {
		"version": "3.7.2",
		"requires": {}

package.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@
		],
		"license": "GPL-2.0-or-later",
		"dependencies": {
		"@gdwc/drupal-state": "^2.5.2",
		"@gdwc/drupal-state": "^4.1.0",
		"linkset-menu": "0.0.2",
		"lit": "^2.2.7",
		"object-path": "^0.11.8",