Skip to content

Commit

Permalink
V2 migrate theme (#619)
Browse files Browse the repository at this point in the history
* wip

* wip

* wi

* wip

* wip

* wip

* wip

* wip
  • Loading branch information
ebgranger authored Apr 9, 2024
1 parent cc4e42d commit 3964239
Show file tree
Hide file tree
Showing 18 changed files with 10,455 additions and 5,661 deletions.
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ out
jest-coverage
plop-templates
/ui/theme/src/tokens.ts
/packages/kit/src/theme/tokens.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from "react";
import { styled, theme } from "@washingtonpost/wpds-ui-kit";
const uiKit = theme;
import Tokens from "@washingtonpost/wpds-theme/src/wpds.tokens.json";
import Tokens from "@washingtonpost/wpds-ui-kit/src/theme/wpds.tokens.json";
import { hex, score } from "wcag-contrast";
import { useTheme } from "next-themes";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react";
import { styled } from "@washingtonpost/wpds-ui-kit";
import Tokens from "@washingtonpost/wpds-theme/src/wpds.tokens.json";
import Tokens from "@washingtonpost/wpds-ui-kit/src/theme/wpds.tokens.json";
import { useTheme } from "next-themes";
import Fuse from "fuse.js";
import { InputSearch } from "@washingtonpost/wpds-ui-kit";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ Ensure that the WPDS fonts and css variables are available on the page if they a

```jsx
// _app.js or other main script file

// also available from @washingtonpost/wpds-ui-kit
// also available from @washingtonpost/wpds-ui-kit
import { getCssText, globalStyles } from "@washingtonpost/wpds-theme";

const style = document.createElement("style");
Expand Down
13 changes: 7 additions & 6 deletions build.washingtonpost.com/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
"@washingtonpost/site-favicons": "0.3.4-alpha.1",
"@washingtonpost/site-footer": "0.25.3-alpha.1",
"@washingtonpost/tachyons-css": "^1.8.0",
"@washingtonpost/wpds-assets": "2.0.0-alpha.0",
"@washingtonpost/wpds-assets": "2.0.0-alpha.1",
"@washingtonpost/wpds-kitchen-sink": "2.0.0-alpha.10",
"@washingtonpost/wpds-tailwind-theme": "2.0.0-alpha.10",
"@washingtonpost/wpds-tokens": "2.0.0-alpha.10",
"@washingtonpost/wpds-ui-kit": "2.0.0-alpha.10",
"fuse.js": "^6.6.2",
"gray-matter": "^4.0.2",
"lz-string": "^1.4.4",
"next": "^14",
"next": "14.0.3",
"next-mdx-remote": "^4.4.1",
"next-themes": "0.2.1",
"param-case": "^3.0.4",
Expand All @@ -57,11 +57,12 @@
"@next/bundle-analyzer": "^12.1.0",
"@types/lz-string": "^1.3.34",
"@types/node": "^17.0.21",
"@types/react": "^18.2.42",
"@types/react": "18.2.39",
"@types/react-dom": "18.2.17",
"autoprefixer": "^10.4.13",
"babel-plugin-extract-react-types": "^0.1.14",
"eslint": "8.9.0",
"eslint-config-next": "^14.1.3",
"eslint-config-next": "^14.0.3",
"extract-react-types": "^0.30.2",
"glob": "^7.2.0",
"husky": "^7.0.0",
Expand All @@ -78,7 +79,7 @@
"overrides": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"@washingtonpost/wpds-assets": "2.0.0-alpha.0",
"@washingtonpost/wpds-ui-kit": "2.0.0-alpha.8"
"@washingtonpost/wpds-assets": "2.0.0-alpha.1",
"@washingtonpost/wpds-ui-kit": "2.0.0-alpha.10"
}
}
Loading

0 comments on commit 3964239

Please sign in to comment.