Merge branch 'main' into dsw-2121-pie-toast-create-basic-markup

.changeset/blue-yaks-mix.md

@@ -0,0 +1,5 @@
+---
+"wc-next13": minor
+---
+
+[Added] - pie-webc integration to next13 example apps

.changeset/curly-tomatoes-leave.md

@@ -0,0 +1,5 @@
+---
+"wc-next10": minor
+---
+
+[Added] pie-webc integration to next10 example app

apps/examples/wc-next10/ButtonSizes.js

@@ -1,6 +1,5 @@
 import React from 'react';
-import { sizes } from '@justeattakeaway/pie-button';
-import { PieButton } from '@justeattakeaway/pie-button/dist/react';
+import { PieButton, sizes } from '@justeattakeaway/pie-webc/react/button';
 
 export default function ButtonSizes () {
     return (

apps/examples/wc-next10/Counter.js

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { PieButton } from '@justeattakeaway/pie-button/dist/react';
+import { PieButton } from '@justeattakeaway/pie-webc/react/button';
 
 export default function Counter () {
     const [count, setCount] = useState(0);

apps/examples/wc-next10/VariantSwitch.js

@@ -1,6 +1,5 @@
 import React, { useState, useRef } from 'react';
-import { variants } from '@justeattakeaway/pie-button';
-import { PieButton } from '@justeattakeaway/pie-button/dist/react';
+import { PieButton, variants } from '@justeattakeaway/pie-webc/react/button';
 
 export default function VariantSwitch () {
     const variantIndex = useRef(0);

apps/examples/wc-next10/next.config.js

@@ -2,6 +2,7 @@ const path = require('path');
 
 const transpileModules = [
     '@justeattakeaway/pie-button',
+    '@justeattakeaway/pie-webc',
     '@justeattakeaway/pie-cookie-banner',
     '@lit/react',
     'lit'

apps/examples/wc-next10/package.json

@@ -10,9 +10,8 @@
     "lint:examples": "eslint ."
   },
   "dependencies": {
-    "@justeattakeaway/pie-button": "0.47.8",
-    "@justeattakeaway/pie-cookie-banner": "0.21.0",
     "@justeattakeaway/pie-css": "0.12.1",
+    "@justeattakeaway/pie-webc": "0.5.13",
     "@lit/react": "1.0.2",
     "next": "10.2.3",
     "next-transpile-modules": "4.1.0",

apps/examples/wc-next13/.eslintrc.cjs

@@ -0,0 +1,21 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
+    'plugin:react-hooks/recommended',
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs'],
+  parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
+  settings: { react: { version: '18.2' } },
+  plugins: ['react-refresh'],
+  rules: {
+    'react/jsx-no-target-blank': 'off',
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+  },
+}

apps/examples/wc-next13/.gitignore

@@ -1,43 +1,24 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
-# testing
-/coverage
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
+# Logs
+logs
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-.pnpm-debug.log*
-
-# local env files
-.env*.local
-
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

apps/examples/wc-next13/README.md

@@ -1,4 +1,11 @@
-## How to use Next.js App
+# React + Vite
+
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+
+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 dev`
 
@@ -39,4 +46,4 @@ React 18 and previous versions don't handle web components and custom elements o
 
 Therefore, in order to import the web component into your React application, please use:
 
-import { PieButton } from '@justeattakeaway/pie-button/dist/react';
+import { PieButton } from '@justeattakeaway/pie-webc/react/button.js';

apps/examples/wc-next13/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>

apps/examples/wc-next13/package.json

@@ -1,29 +1,32 @@
 {
   "name": "wc-next13",
-  "version": "0.3.43",
   "private": true,
+  "version": "0.3.43",
+  "type": "module",
   "scripts": {
-    "dev": "NODE_OPTIONS=--conditions=development next dev",
-    "build:examples": "yarn build-static",
-    "build-static": "next build && next export -o build",
-    "start": "next start",
-    "lint:examples": "next lint"
+    "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-labs/nextjs": "0.2.0",
     "@lit/react": "1.0.5",
     "next": "13.5.5",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },
   "devDependencies": {
-    "@types/node": "20.9.3",
+    "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
-    "eslint": "8.37.0",
-    "eslint-config-next": "13.5.5",
-    "typescript": "5.4.5"
+    "@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"
   },
   "volta": {
     "extends": "../../../package.json"

apps/examples/wc-next13/styles/styles.css → apps/examples/wc-next13/src/App.css

@@ -25,13 +25,3 @@
 * {
     font-family: JETSansDigital, Arial, sans-serif;
 }
-
-.flex-wrapper {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-}
-
-.padding {
-    padding: 1rem;
-}

apps/examples/wc-next13/src/App.jsx

@@ -0,0 +1,17 @@
+import './App.css'
+import { PieButton } from "@justeattakeaway/pie-webc/react/button.js";
+import '@justeattakeaway/pie-css';
+
+function App() {
+  return (
+      <>
+          <div className="App">
+              <PieButton size='large'>WC Button in NextJS!</PieButton>
+              <PieButton variant='secondary'>WC Button in NextJS!</PieButton>
+              <PieButton disabled>WC Button in NextJS!</PieButton>
+          </div>
+      </>
+  )
+}
+
+export default App

apps/examples/wc-next13/src/main.jsx

@@ -0,0 +1,9 @@
+import React from 'react'
+import ReactDOM from 'react-dom/client'
+import App from './App.jsx'
+
+ReactDOM.createRoot(document.getElementById('root')).render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+)

apps/examples/wc-next13/vite.config.js

@@ -0,0 +1,9 @@
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+
+export default defineConfig({
+    plugins: [react()],
+    resolve: {
+        alias: {},
+    },
+});