Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PCC-1176] Starter kit redesign #297

Merged
merged 57 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
aa00787
feat: add assets
a11rew Aug 13, 2024
3c48258
feat: add manypkg for dependency conflict management
a11rew Aug 14, 2024
8f674e0
feat: add design system button
a11rew Aug 14, 2024
1527722
feat(next-starter-ts): add updated header
a11rew Aug 14, 2024
4e6c2a5
feat: add pantheon logos
a11rew Aug 14, 2024
372b057
feat: use poppins font
a11rew Aug 14, 2024
002beb7
Merge branch 'ag/pcc-1527/starter-kit-redesign-design-system' of gith…
a11rew Aug 14, 2024
db6f5f4
Merge pull request #293 from pantheon-systems/ag/pcc-1527/starter-kit…
a11rew Aug 14, 2024
6d1682e
feat: add header and header nav menu
a11rew Aug 15, 2024
b9682ca
fix: re-add image
a11rew Aug 16, 2024
9392aa3
Merge branch 'ag/pcc-1176/starter-kit-redesign' of github.com:pantheo…
a11rew Aug 16, 2024
91ee28b
feat: add header to other js and app-router starters
a11rew Aug 16, 2024
64cd872
feat: add updated footer
a11rew Aug 16, 2024
b12b581
Merge pull request #294 from pantheon-systems/ag/pcc-1528/starter-kit…
a11rew Aug 16, 2024
d89aac5
Od/pcc 1536/article blog (#296)
aumkar Aug 20, 2024
ae3a2b3
wip: grid page
a11rew Aug 20, 2024
7e36aa2
wip: grid layout
a11rew Aug 20, 2024
aae01cf
feat: add error pages
a11rew Aug 20, 2024
9631e62
Merge pull request #299 from pantheon-systems/ag/pcc-1539/error-pages
a11rew Aug 20, 2024
61434f7
fix: use css instead of deprecated objectFit property
a11rew Aug 21, 2024
91286b5
feat: add media preview smart component
a11rew Aug 21, 2024
bece82a
feat: add error boundaries to smart components
a11rew Aug 21, 2024
785530c
Merge pull request #300 from pantheon-systems/ag/pcc-1531/smart-compo…
a11rew Aug 21, 2024
b7daa2c
Merge branch 'ag/pcc-1176/starter-kit-redesign' of github.com:pantheo…
a11rew Aug 21, 2024
25fee21
Fixed styling issue from Article/Blog view (#302)
aumkar Aug 22, 2024
7ea1d6a
Merge branch 'ag/pcc-1176/starter-kit-redesign' of github.com:pantheo…
a11rew Aug 22, 2024
1ffc9e5
feat: add article grid
a11rew Aug 22, 2024
f204210
feat: add article grid and homepage
a11rew Aug 22, 2024
bb94e77
chore: remove diff file
a11rew Aug 22, 2024
4ed9c83
Merge pull request #298 from pantheon-systems/ag/pcc-1535/starter-kit…
a11rew Aug 22, 2024
f969005
feat: update examples
a11rew Aug 23, 2024
b0acc6e
chore: re-add tag pages
a11rew Aug 23, 2024
49b6a9e
feat: add component preview support
a11rew Aug 23, 2024
b04efce
Merge pull request #303 from pantheon-systems/ag/pcc-1533/update-exam…
a11rew Aug 23, 2024
a2c0e3c
feat: update search results
a11rew Aug 26, 2024
2113106
feat(nextjs-starter-approuter-ts): update search results
a11rew Aug 26, 2024
a0e65c9
refactor: update log
a11rew Aug 26, 2024
6e0813f
Merge pull request #304 from pantheon-systems/ag/pcc-1538/search-results
a11rew Aug 26, 2024
deba71e
Updated Pagination styles and fixed issues (#305)
aumkar Aug 30, 2024
d15011e
feat: update starter README's
a11rew Aug 31, 2024
c1344d8
feat: remove unused dependencies
a11rew Aug 31, 2024
558e0b5
feat: fix broken tests
a11rew Aug 31, 2024
44de102
feat: update example page styling
a11rew Aug 31, 2024
8d8fb51
feat: add updated lead capture component
a11rew Aug 31, 2024
9c556d8
Merge branch 'main' of github.com:pantheon-systems/pantheon-content-c…
a11rew Aug 31, 2024
b267710
chore: update lockfile
a11rew Aug 31, 2024
6741d9d
feat: update outline to box shadow
a11rew Aug 31, 2024
3858213
PCC-1532: removed styles from specific tags
aumkar Sep 2, 2024
ca69763
same changes for other starters
aumkar Sep 2, 2024
588b2c8
not overriding all styles
aumkar Sep 2, 2024
8282cc5
Merge pull request #306 from pantheon-systems/ag/finalization-fixes
a11rew Sep 2, 2024
82fec5c
Merge pull request #307 from pantheon-systems/od/pcc-1532/bugfix/pagi…
a11rew Sep 2, 2024
8598ad4
fix: lint issues
a11rew Sep 2, 2024
28f7582
fix: manypkg dep issues
a11rew Sep 2, 2024
e56ef29
fix: assert client type
a11rew Sep 2, 2024
654f0a7
fix: lint
a11rew Sep 3, 2024
62e85b1
fix: lint
a11rew Sep 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"plugins": ["@ianvs/prettier-plugin-sort-imports"],
"plugins": [
"@ianvs/prettier-plugin-sort-imports",
"prettier-plugin-tailwindcss"
],
"semi": true,
"singleQuote": false,
"useTabs": false,
Expand Down
3 changes: 3 additions & 0 deletions configs/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"prettier": "3.2.5"
},
"devDependencies": {
"prettier-plugin-tailwindcss": "^0.6.6"
}
}
10 changes: 5 additions & 5 deletions local_testing/testpages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
},
"dependencies": {
"@pantheon-systems/pcc-react-sample-library": "workspace:*",
"next": "^14.2.3",
"next": "^14.2.5",
"react": "18.3.1",
"react-dom": "18.3.1"
},
"devDependencies": {
"@types/node": "^20.11.21",
"@types/react": "^18.2.60",
"@types/react-dom": "^18.2.19",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"autoprefixer": "^10.4.17",
"eslint": "^8.57.0",
"eslint-config-next": "14.0.3",
"eslint-config-next": "^14.2.3",
"postcss": "^8.4.35",
"tailwindcss": "^3.4.1",
"typescript": "^5.3.3"
"typescript": "^5.5.4"
}
}
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
},
"dependencies": {
"@changesets/cli": "^2.27.1",
"@manypkg/cli": "^0.21.4",
"eslint": "^8.57.0",
"eslint-config-pcc-custom": "workspace:*",
"husky": "^9.0.11",
"turbo": "^1.12.4"
},
"pnpm": {
Expand All @@ -36,9 +39,5 @@
"webpack-dev-middleware": "^7.2.1",
"@pantheon-systems/pcc-vue-sdk>ufo": "1.5.3"
}
},
"devDependencies": {
"eslint-config-pcc-custom": "workspace:*",
"husky": "^9.0.11"
}
}
4 changes: 2 additions & 2 deletions packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"devDependencies": {
"eslint": "^8.57.0",
"eslint-config-pcc-custom": "workspace:*",
"tsup": "^8.0.2",
"typescript": "^5.3.3"
"tsup": "^8.2.4",
"typescript": "^5.5.4"
},
"dependencies": {
"@pantheon-systems/pcc-sdk-core": "workspace:*"
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
"yargs": "^17.7.2"
},
"devDependencies": {
"@babel/preset-env": "7.21.5",
"@babel/preset-env": "^7.25.3",
"@types/bluebird": "^3.5.42",
"@types/fs-extra": "^11.0.4",
"@types/inquirer": "^9.0.7",
"@types/jest": "29.5.1",
"@types/node": "^20.14.15",
"@types/node": "^20.11.21",
"@types/nunjucks": "^3.2.6",
"@types/server-destroy": "^1.0.3",
"@types/showdown": "^2.0.6",
Expand All @@ -77,6 +77,6 @@
"jest": "29.5.0",
"tmp": "^0.2.3",
"ts-jest": "29.1.0",
"tsup": "^7.2.0"
"tsup": "^8.2.4"
}
}
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"graphql-tag": "^2.12.6",
"graphql-ws": "^5.15.0",
"query-string": "^8.2.0",
"typescript": "^5.3.3",
"typescript": "^5.5.4",
"zod": "^3.22.4",
"zod-validation-error": "^1.5.0"
},
Expand All @@ -55,7 +55,7 @@
"@vitest/coverage-v8": "^1.6.0",
"eslint": "^8.57.0",
"eslint-config-pcc-custom": "workspace:*",
"tsup": "^7.2.0",
"tsup": "^8.2.4",
"vitest": "^1.3.1"
}
}
6 changes: 4 additions & 2 deletions packages/react-sample-library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
"@storybook/react": "^8.1.4",
"@storybook/test": "^8.1.4",
"@types/node": "^20.11.21",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"copyfiles": "^2.4.1",
"eslint": "^8.57.0",
"eslint-config-pcc-custom": "workspace:*",
Expand All @@ -53,8 +55,8 @@
"react-dom": "18.3.1",
"rimraf": "^5.0.5",
"storybook": "^8.1.4",
"tsup": "^7.2.0",
"typescript": "^5.3.3"
"tsup": "^8.2.4",
"typescript": "^5.5.4"
},
"peerDependencies": {
"@types/react": ">=17",
Expand Down
14 changes: 8 additions & 6 deletions packages/react-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,26 @@
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@types/jest": "29.5.1",
"@types/node": "18.16.9",
"@types/node": "^20.11.21",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react-test-renderer": "18.0.0",
"babel-loader": "9.1.2",
"chalk": "^5.3.0",
"cli-spinners": "^2.9.2",
"concurrently": "8.0.1",
"eslint": "8.46.0",
"eslint": "^8.57.0",
"eslint-config-pcc-custom": "workspace:*",
"jest": "29.5.0",
"next": "^14.2.3",
"octokit": "^3.1.2",
"next": "^14.2.5",
"octokit": "^3.2.1",
"ora": "^6.3.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-test-renderer": "18.3.1",
"ts-jest": "29.1.0",
"tsup": "6.7.0",
"typescript": "5.4.5",
"tsup": "^8.2.4",
"typescript": "^5.5.4",
"yargs": "^17.7.2"
},
"peerDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */
import { setup, styled } from "goober";
import React, { useState } from "react";
import React, { ComponentProps, useState } from "react";
import { Arrow, useLayer } from "react-laag";
import { IconDot } from "../Icons/IconDot";
import { IconInfo } from "../Icons/IconInfo";
Expand Down Expand Up @@ -68,7 +68,7 @@ export const LivePreviewIndicator = ({ isLive }: Props) => {
</span>
</div>
<Arrow
{...arrowProps}
{...(arrowProps as ComponentProps<typeof Arrow>)}
size={9}
roundness={0}
backgroundColor="#23232D"
Expand Down
7 changes: 6 additions & 1 deletion packages/react-sdk/src/core/pantheon-context.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { ApolloClient } from "@apollo/client/core/ApolloClient.js";
import { ApolloProvider } from "@apollo/client/react/context/ApolloProvider.js";
import { PantheonClient } from "@pantheon-systems/pcc-sdk-core";
import React, { PropsWithChildren } from "react";
Expand All @@ -13,7 +14,11 @@ export const PantheonProvider = ({
children,
}: PantheonProviderProps) => (
<PantheonContext.Provider value={client}>
<ApolloProvider client={client.apolloClient}>{children}</ApolloProvider>
<ApolloProvider
client={client.apolloClient as unknown as ApolloClient<unknown>}
>
{children}
</ApolloProvider>
</PantheonContext.Provider>
);

Expand Down
10 changes: 8 additions & 2 deletions packages/react-sdk/src/utils/react-element.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
export const getTextContent = (node: React.ReactNode): string => {
import { type ReactNode } from "react";

export const getTextContent = (node: ReactNode): string => {
// Handle all possible types that ReactNode can be, since it is a union of types.
if (node == null) {
return "";
} else if (typeof node === "string" || typeof node === "number") {
} else if (
typeof node === "string" ||
typeof node === "number" ||
typeof node === "bigint"
) {
return node.toString();
} else if (typeof node === "boolean") {
return "";
Expand Down
6 changes: 3 additions & 3 deletions packages/vue-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@
"eslint-config-pcc-custom": "workspace:*",
"h3": "^1.11.1",
"sass": "^1.71.1",
"tsup": "^7.2.0",
"typescript": "^5.3.3",
"tsup": "^8.2.4",
"typescript": "^5.5.4",
"unplugin-vue": "^4.5.2",
"vite": "^5.1.4",
"vue": "^3.3.4",
"vue": "3.4.27",
"vue-3": "npm:vue@^3.4.27"
},
"peerDependencies": {
Expand Down
Loading
Loading