From 3a21ae775a3ca356c22ab8f181edbf2749afe911 Mon Sep 17 00:00:00 2001 From: Jason Rundell Date: Mon, 7 Oct 2024 11:38:38 -0400 Subject: [PATCH 1/9] Update @jasonrundell/react-mega-menu to version 2.2.0 --- demo/package-lock.json | 8 ++++---- demo/package.json | 2 +- next-demo/package-lock.json | 8 ++++---- next-demo/package.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/demo/package-lock.json b/demo/package-lock.json index c6e4ad9..ec5c053 100644 --- a/demo/package-lock.json +++ b/demo/package-lock.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@eslint/js": "^9.9.0", - "@jasonrundell/react-mega-menu": "^2.0.17", + "@jasonrundell/react-mega-menu": "^2.2.0", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@vitejs/plugin-react": "^4.3.1", @@ -1051,9 +1051,9 @@ } }, "node_modules/@jasonrundell/react-mega-menu": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/@jasonrundell/react-mega-menu/-/react-mega-menu-2.0.17.tgz", - "integrity": "sha512-ABMPzbBZlKv4RczGYgQ55HtTUngD7AhH8D+H6uGdwYa3FJohzeJMNeOApU7qAUWfSLioWhwgrVBfbMoXaHfWaA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@jasonrundell/react-mega-menu/-/react-mega-menu-2.2.0.tgz", + "integrity": "sha512-RCC2/kZQjXhmElshxuJvkiQgL5Tg5gVqF8N7fLADFHu9fYYXyYiWbQVuLObFxKPcWKefAktS0R39hmZ3gvoOjg==", "dev": true, "license": "MIT", "dependencies": { diff --git a/demo/package.json b/demo/package.json index be8d505..4b24af1 100644 --- a/demo/package.json +++ b/demo/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@eslint/js": "^9.9.0", - "@jasonrundell/react-mega-menu": "^2.0.17", + "@jasonrundell/react-mega-menu": "^2.2.0", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", "@vitejs/plugin-react": "^4.3.1", diff --git a/next-demo/package-lock.json b/next-demo/package-lock.json index caadaf9..9f04e02 100644 --- a/next-demo/package-lock.json +++ b/next-demo/package-lock.json @@ -8,7 +8,7 @@ "name": "next-demo", "version": "0.1.0", "dependencies": { - "@jasonrundell/react-mega-menu": "^2.0.17", + "@jasonrundell/react-mega-menu": "^2.2.0", "next": "14.2.11", "react": "^18", "react-dom": "^18" @@ -584,9 +584,9 @@ } }, "node_modules/@jasonrundell/react-mega-menu": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/@jasonrundell/react-mega-menu/-/react-mega-menu-2.0.17.tgz", - "integrity": "sha512-ABMPzbBZlKv4RczGYgQ55HtTUngD7AhH8D+H6uGdwYa3FJohzeJMNeOApU7qAUWfSLioWhwgrVBfbMoXaHfWaA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@jasonrundell/react-mega-menu/-/react-mega-menu-2.2.0.tgz", + "integrity": "sha512-RCC2/kZQjXhmElshxuJvkiQgL5Tg5gVqF8N7fLADFHu9fYYXyYiWbQVuLObFxKPcWKefAktS0R39hmZ3gvoOjg==", "license": "MIT", "dependencies": { "uuid": "^9.0.1" diff --git a/next-demo/package.json b/next-demo/package.json index c50baf0..c3d45c1 100644 --- a/next-demo/package.json +++ b/next-demo/package.json @@ -9,7 +9,7 @@ "lint": "next lint" }, "dependencies": { - "@jasonrundell/react-mega-menu": "^2.0.17", + "@jasonrundell/react-mega-menu": "^2.2.0", "next": "14.2.11", "react": "^18", "react-dom": "^18" From b069938af4fbabc764f4720cb2e1c6bb56cd4b56 Mon Sep 17 00:00:00 2001 From: Jason Rundell Date: Mon, 7 Oct 2024 11:38:44 -0400 Subject: [PATCH 2/9] Refactor Menu.jsx: Remove unused MENU_ITEM_TYPE_LINK import --- src/Menu.jsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Menu.jsx b/src/Menu.jsx index 8307eed..5aa0aec 100644 --- a/src/Menu.jsx +++ b/src/Menu.jsx @@ -15,10 +15,7 @@ import { renderMegaMenuItem, renderSubMenuItem } from './helpers/menu' -import { - MENU_ITEM_TYPE_LINK, - MENU_ITEM_TYPE_MEGA -} from './config/menuItemTypes' +import { MENU_ITEM_TYPE_MEGA } from './config/menuItemTypes' // Components import TopBar from './components/TopBar' From fe8dc688bb09966316c7b5f23190e76e9f76f70e Mon Sep 17 00:00:00 2001 From: Jason Rundell Date: Mon, 7 Oct 2024 11:50:20 -0400 Subject: [PATCH 3/9] Add Next.js demo workflow --- .github/workflows/next-demo.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/next-demo.yml diff --git a/.github/workflows/next-demo.yml b/.github/workflows/next-demo.yml new file mode 100644 index 0000000..3f8cc53 --- /dev/null +++ b/.github/workflows/next-demo.yml @@ -0,0 +1,27 @@ +name: Build Next Demo + +on: + pull_request: + branches: + - main + +jobs: + build-next-demo: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Install dependencies + run: npm ci + working-directory: next-demo + + - name: Run build + run: npm run build + working-directory: next-demo From e4952cf9f0b95517db5786e2741a12aefcfd2af7 Mon Sep 17 00:00:00 2001 From: Jason Rundell Date: Mon, 7 Oct 2024 11:51:07 -0400 Subject: [PATCH 4/9] Refactor Next.js demo workflow: Update build command to run in the correct directory --- .github/workflows/next-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/next-demo.yml b/.github/workflows/next-demo.yml index 3f8cc53..3354757 100644 --- a/.github/workflows/next-demo.yml +++ b/.github/workflows/next-demo.yml @@ -23,5 +23,5 @@ jobs: working-directory: next-demo - name: Run build - run: npm run build + run: cd next-demo && npm run build working-directory: next-demo From aeacdaafc0bae5ee1277f8091a1a1383c9dd5b65 Mon Sep 17 00:00:00 2001 From: Jason Rundell Date: Mon, 7 Oct 2024 11:53:24 -0400 Subject: [PATCH 5/9] Refactor Next.js demo workflow: Combine dependency installation and build steps --- .github/workflows/next-demo.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/next-demo.yml b/.github/workflows/next-demo.yml index 3354757..6e4fc30 100644 --- a/.github/workflows/next-demo.yml +++ b/.github/workflows/next-demo.yml @@ -18,10 +18,8 @@ jobs: with: node-version: 20 - - name: Install dependencies - run: npm ci - working-directory: next-demo - - - name: Run build - run: cd next-demo && npm run build - working-directory: next-demo + - name: Install dependencies and run build + run: | + cd next-demo + npm ci + npm run build From 301574abfba4f505a1610e942d216a66e4921d2e Mon Sep 17 00:00:00 2001 From: Jason Rundell Date: Mon, 7 Oct 2024 12:08:04 -0400 Subject: [PATCH 6/9] Add Vite demo workflow --- .github/workflows/vite-demo.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/vite-demo.yml diff --git a/.github/workflows/vite-demo.yml b/.github/workflows/vite-demo.yml new file mode 100644 index 0000000..533b2be --- /dev/null +++ b/.github/workflows/vite-demo.yml @@ -0,0 +1,24 @@ +name: Build Vite Demo + +on: + pull_request: + branches: + - main + +jobs: + build-next-demo: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Install dependencies and run build + run: | + cd demo + npm run build From 9bb03a266ff89c78efefe2096be51c5ed59df76b Mon Sep 17 00:00:00 2001 From: Jason Rundell Date: Mon, 7 Oct 2024 12:09:24 -0400 Subject: [PATCH 7/9] Add build workflow for Next.js demo --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..83f0d2d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,22 @@ +name: Build + +on: + pull_request: + branches: + - main + +jobs: + build-next-demo: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Install dependencies and run build + run: npm run build From e1f90042a20c41af4a1c8e1b4b4dc94e3b151bf7 Mon Sep 17 00:00:00 2001 From: Jason Rundell Date: Mon, 7 Oct 2024 15:08:51 -0400 Subject: [PATCH 8/9] Can't build due to package dependencies --- .github/workflows/build.yml | 4 +++- .github/workflows/next-demo.yml | 25 ------------------------- .github/workflows/vite-demo.yml | 24 ------------------------ 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 .github/workflows/next-demo.yml delete mode 100644 .github/workflows/vite-demo.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83f0d2d..7d890c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,4 +19,6 @@ jobs: node-version: 20 - name: Install dependencies and run build - run: npm run build + run: | + npm ci + npm run build diff --git a/.github/workflows/next-demo.yml b/.github/workflows/next-demo.yml deleted file mode 100644 index 6e4fc30..0000000 --- a/.github/workflows/next-demo.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Build Next Demo - -on: - pull_request: - branches: - - main - -jobs: - build-next-demo: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: 20 - - - name: Install dependencies and run build - run: | - cd next-demo - npm ci - npm run build diff --git a/.github/workflows/vite-demo.yml b/.github/workflows/vite-demo.yml deleted file mode 100644 index 533b2be..0000000 --- a/.github/workflows/vite-demo.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build Vite Demo - -on: - pull_request: - branches: - - main - -jobs: - build-next-demo: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: 20 - - - name: Install dependencies and run build - run: | - cd demo - npm run build From c922c05bbfa9666fb4a2a3248acd47fd73047823 Mon Sep 17 00:00:00 2001 From: Jason Rundell Date: Mon, 7 Oct 2024 15:10:40 -0400 Subject: [PATCH 9/9] Update package version to 2.2.1 in package-lock.json and package.json --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c3775ad..7a50728 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@jasonrundell/react-mega-menu", - "version": "2.2.0", + "version": "2.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@jasonrundell/react-mega-menu", - "version": "2.2.0", + "version": "2.2.1", "license": "MIT", "dependencies": { "uuid": "^9.0.1" diff --git a/package.json b/package.json index 41755c7..ec1e4d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@jasonrundell/react-mega-menu", - "version": "2.2.0", + "version": "2.2.1", "author": "jasonrundell ", "main": "dist/index.es.js", "module": "dist/index.es.js",