Merge branch 'main' into dsw-000-consistent-type-imports

justeattakeaway · Jul 23, 2024 · 9e7e73a · 9e7e73a
2 parents 2dacf17 + 0e2456c
commit 9e7e73a
Show file tree

Hide file tree

Showing 74 changed files with 1,157 additions and 618 deletions.
diff --git a/.changeset/blue-yaks-mix.md b/.changeset/blue-yaks-mix.md
diff --git a/.changeset/curly-tomatoes-leave.md b/.changeset/curly-tomatoes-leave.md
diff --git a/.changeset/dry-frogs-grin.md b/.changeset/dry-frogs-grin.md
diff --git a/.changeset/neat-lies-relax.md b/.changeset/neat-lies-relax.md
diff --git a/.changeset/nervous-ducks-repeat.md b/.changeset/nervous-ducks-repeat.md
diff --git a/.changeset/nervous-singers-give.md b/.changeset/nervous-singers-give.md
@@ -0,0 +1,5 @@
+---
+"wc-react18": minor
+---
+
+[Added] - pie-webc integration and switch to using vite to resolve bundling error
diff --git a/.changeset/polite-bugs-think.md b/.changeset/polite-bugs-think.md
diff --git a/.changeset/red-dingos-wash.md b/.changeset/red-dingos-wash.md
diff --git a/.changeset/silver-dryers-attack.md b/.changeset/silver-dryers-attack.md
diff --git a/.changeset/wicked-crews-serve.md b/.changeset/wicked-crews-serve.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.62.0
+
+### Minor Changes
+
+- [Changed] - Let commitizen read ticket number from branch name ([#1614](https://github.com/justeattakeaway/pie/pull/1614)) by [@xander-marjoram](https://github.com/xander-marjoram)
+
 ## 2.61.3
 
 ### Patch Changes

diff --git a/apps/examples/wc-angular12/CHANGELOG.md b/apps/examples/wc-angular12/CHANGELOG.md
@@ -1,5 +1,16 @@
 # wc-angular12
 
+## 0.5.0
+
+### Minor Changes
+
+- [Added] pie-webc integration to angular examples app ([#1611](https://github.com/justeattakeaway/pie/pull/1611)) by [@kevinrodrigues](https://github.com/kevinrodrigues)
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @justeattakeaway/pie-webc@0.5.14
+
 ## 0.4.43
 
 ### Patch Changes

diff --git a/apps/examples/wc-angular12/package.json b/apps/examples/wc-angular12/package.json
@@ -1,6 +1,6 @@
 {
     "name": "wc-angular12",
-    "version": "0.4.43",
+    "version": "0.5.0",
     "private": true,
     "scripts": {
         "ng": "ng",
@@ -18,7 +18,7 @@
         "@angular/platform-browser-dynamic": "15.2.0",
         "@angular/router": "15.2.0",
         "@justeattakeaway/pie-css": "0.12.1",
-        "@justeattakeaway/pie-webc": "0.5.13",
+        "@justeattakeaway/pie-webc": "0.5.14",
         "rxjs": "7.8.0",
         "tslib": "2.3.0",
         "zone.js": "0.12.0"

diff --git a/apps/examples/wc-next10/CHANGELOG.md b/apps/examples/wc-next10/CHANGELOG.md
@@ -1,5 +1,16 @@
 # wc-next10
 
+## 0.6.0
+
+### Minor Changes
+
+- [Added] pie-webc integration to next10 example app ([#1617](https://github.com/justeattakeaway/pie/pull/1617)) by [@kevinrodrigues](https://github.com/kevinrodrigues)
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @justeattakeaway/pie-webc@0.5.14
+
 ## 0.5.46
 
 ### Patch Changes

diff --git a/apps/examples/wc-next10/package.json b/apps/examples/wc-next10/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wc-next10",
-  "version": "0.5.46",
+  "version": "0.6.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@justeattakeaway/pie-css": "0.12.1",
-    "@justeattakeaway/pie-webc": "0.5.13",
+    "@justeattakeaway/pie-webc": "0.5.14",
     "@lit/react": "1.0.2",
     "next": "10.2.3",
     "next-transpile-modules": "4.1.0",

diff --git a/apps/examples/wc-next13/CHANGELOG.md b/apps/examples/wc-next13/CHANGELOG.md
@@ -1,5 +1,16 @@
 # wc-next13
 
+## 0.4.0
+
+### Minor Changes
+
+- [Added] - pie-webc integration to next13 example apps ([#1613](https://github.com/justeattakeaway/pie/pull/1613)) by [@kevinrodrigues](https://github.com/kevinrodrigues)
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @justeattakeaway/pie-webc@0.5.14
+
 ## 0.3.43
 
 ### Patch Changes

diff --git a/apps/examples/wc-next13/package.json b/apps/examples/wc-next13/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wc-next13",
   "private": true,
-  "version": "0.3.43",
+  "version": "0.4.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@justeattakeaway/pie-css": "0.12.1",
-    "@justeattakeaway/pie-webc": "0.5.13",
+    "@justeattakeaway/pie-webc": "0.5.14",
     "@lit-labs/nextjs": "0.2.0",
     "@lit/react": "1.0.5",
     "next": "13.5.5",

diff --git a/apps/examples/wc-nuxt2/CHANGELOG.md b/apps/examples/wc-nuxt2/CHANGELOG.md
@@ -1,5 +1,12 @@
 # wc-nuxt2
 
+## 0.7.1
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @justeattakeaway/pie-webc@0.5.14
+
 ## 0.7.0
 
 ### Minor Changes

diff --git a/apps/examples/wc-nuxt2/package.json b/apps/examples/wc-nuxt2/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wc-nuxt2",
   "author": "Just Eat Takeaway.com - Design System Team",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "private": true,
   "scripts": {
     "dev": "nuxt",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@justeattakeaway/pie-css": "0.12.1",
-    "@justeattakeaway/pie-webc": "0.5.13",
+    "@justeattakeaway/pie-webc": "0.5.14",
     "core-js": "3.30.0",
     "nuxt": "2.17.0",
     "vue": "2.7.16",

diff --git a/apps/examples/wc-nuxt3/CHANGELOG.md b/apps/examples/wc-nuxt3/CHANGELOG.md
@@ -1,5 +1,12 @@
 # wc-nuxt3
 
+## 0.6.1
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @justeattakeaway/pie-webc@0.5.14
+
 ## 0.6.0
 
 ### Minor Changes

diff --git a/apps/examples/wc-nuxt3/package.json b/apps/examples/wc-nuxt3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wc-nuxt3",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "private": true,
   "scripts": {
     "build:examples": "nuxt build",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@justeattakeaway/pie-css": "0.12.1",
-    "@justeattakeaway/pie-webc": "0.5.13",
+    "@justeattakeaway/pie-webc": "0.5.14",
     "nuxt-ssr-lit": "1.6.5"
   },
   "devDependencies": {

diff --git a/apps/examples/wc-react18/.eslintrc.js b/apps/examples/wc-react18/.eslintrc.js
@@ -1,5 +1,4 @@
 module.exports = {
-    root: true,
     extends: [
         require.resolve('@justeattakeaway/eslint-config-pie/strict'),
     ],

diff --git a/apps/examples/wc-react18/.gitignore b/apps/examples/wc-react18/.gitignore
@@ -1,11 +1,24 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
 
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
+node_modules
+dist
+dist-ssr
+*.local
 
-# production
-/build
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/apps/examples/wc-react18/README.md b/apps/examples/wc-react18/README.md
@@ -1,20 +1,21 @@
-## How to use React App
+# React + Vite
 
-### `yarn dev`
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
 
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
+Currently, two official plugins are available:
 
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
 
-### `yarn build`
 
-Builds the app for production to the `build` folder.\
+### `yarn dev`
 
+Runs the app in the development mode.
 
 #### Using Web Components in React
 
-React 18 and previous versions don't handle web components and custom elements out of the box correctly in all cases due to how React treats custom props and events (More details can be found [here](https://lit.dev/docs/frameworks/react/)). Our solution for this is to wrap the web component to include the `[@lit/react](https://lit.dev/docs/frameworks/react/)` package, generating a `react` file inside the component's `dist` folder.
+React 18 and previous versions don't handle web components and custom elements out of the box correctly in all cases due to how React treats custom props and events (More details can be found [here](https://lit.dev/docs/frameworks/react/)). Our solution for this is to wrap the web component to include the `[@lit/react](https://lit.dev/docs/frameworks/react/)` package, generating a `react` file inside the component's `dist` folder.
 
-Therefore, in order to import the web component into your React application, please use:
+### Example
 
-import { PieButton } from '@justeattakeaway/pie-button/dist/react';
+import { PieButton } from '@justeattakeaway/pie-webc/react/button.js';
diff --git a/apps/examples/wc-react18/index.html b/apps/examples/wc-react18/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>
diff --git a/apps/examples/wc-react18/package.json b/apps/examples/wc-react18/package.json
@@ -1,18 +1,30 @@
 {
   "name": "wc-react18",
-  "version": "0.5.42",
   "private": true,
+  "version": "0.5.42",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
+    "preview": "vite preview"
+  },
   "dependencies": {
-    "@justeattakeaway/pie-button": "0.47.8",
     "@justeattakeaway/pie-css": "0.12.1",
+    "@justeattakeaway/pie-webc": "0.5.13",
     "@lit/react": "1.0.5",
     "react": "18.3.1",
-    "react-dom": "18.3.1",
-    "react-scripts": "5.0.1"
+    "react-dom": "18.3.1"
   },
-  "scripts": {
-    "dev": "react-scripts start",
-    "build:examples": "react-scripts build"
+  "devDependencies": {
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.0",
+    "@vitejs/plugin-react": "4.3.1",
+    "eslint": "8.57.0",
+    "eslint-plugin-react": "7.34.3",
+    "eslint-plugin-react-hooks": "4.6.2",
+    "eslint-plugin-react-refresh": "0.4.7",
+    "vite": "5.3.4"
   },
   "browserslist": [
     "extends @justeattakeaway/browserslist-config-pie"

diff --git a/apps/examples/wc-react18/public/index.html b/apps/examples/wc-react18/public/index.html
diff --git a/apps/examples/wc-react18/src/styles.css → apps/examples/wc-react18/src/App.css b/apps/examples/wc-react18/src/styles.css → apps/examples/wc-react18/src/App.css
@@ -25,3 +25,10 @@
 * {
     font-family: JETSansDigital, Arial, sans-serif;
 }
+
+#root {
+    max-width: 1280px;
+    margin: 0 auto;
+    padding: 2rem;
+    text-align: center;
+}