Move root PNPM workspace to js directory

Closes keycloak#35455

Signed-off-by: Jon Koops <[email protected]>

.github/CODEOWNERS

@@ -46,12 +46,6 @@
 # UI (@keycloak/ui-maintainers)
 ###################################################################################################
 
-/eslint.config.js                                           @keycloak/ui-maintainers
-/package.json                                               @keycloak/ui-maintainers
-/pnpm-lock.yaml                                             @keycloak/ui-maintainers
-/pnpm-workspace.yaml                                        @keycloak/ui-maintainers
-/tsconfig.eslint.json                                       @keycloak/ui-maintainers
-/tsconfig.json                                              @keycloak/ui-maintainers
 /themes/                                                    @keycloak/ui-maintainers @keycloak/maintainers
 /js/                                                        @keycloak/ui-maintainers
 /js/**/maven-resources-community/**/messages_*.properties   @keycloak/ui-maintainers @keycloak/maintainers

.github/actions/conditional/conditions

@@ -32,12 +32,6 @@ operator/                                   operator
 docs/guides/                                guides
 docs/documentation/                         documentation
 
-eslint.config.js                            js
-package.json                                js
-pnpm-lock.yaml                              js
-pnpm-workspace.yaml                         js
-tsconfig.eslint.json                        js
-tsconfig.json                               js
 js/                                         js
 rest/admin-ui-ext/                          js
 services/                                   js

.github/actions/node-cache/action.yml

@@ -8,8 +8,8 @@ runs:
       id: tooling-versions
       shell: bash
       run: |
-        echo "node=$(cat pom.xml | grep '<node.version>' | cut -d '>' -f 2 | cut -d '<' -f 1 | cut -c 2-)" >> $GITHUB_OUTPUT
-        echo "pnpm=$(cat pom.xml | grep '<pnpm.version>' | cut -d '>' -f 2 | cut -d '<' -f 1 | cut -c 1-)" >> $GITHUB_OUTPUT
+        echo "node=$(cat js/pom.xml | grep '<node.version>' | cut -d '>' -f 2 | cut -d '<' -f 1 | cut -c 2-)" >> $GITHUB_OUTPUT
+        echo "pnpm=$(cat js/pom.xml | grep '<pnpm.version>' | cut -d '>' -f 2 | cut -d '<' -f 1 | cut -c 1-)" >> $GITHUB_OUTPUT
 
     # Downloading Node.js often fails due to network issues, therefore we cache the artifacts downloaded by the frontend plugin.
     - uses: actions/cache@v4

.github/actions/pnpm-setup/action.yml

@@ -29,6 +29,7 @@ runs:
     - name: Install dependencies
       shell: bash
       run: pnpm install --prefer-offline --frozen-lockfile
+      working-directory: js
 
     # This step is only needed to ensure that the Cypress binary is installed.
     # If the binary was retrieved from the cache, this step is a no-op.

.github/workflows/js-ci.yml

@@ -69,8 +69,10 @@ jobs:
       - uses: ./.github/actions/pnpm-setup
 
       - run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} lint
+        working-directory: js
 
       - run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} build
+        working-directory: js
 
   ui-shared:
     name: UI Shared
@@ -85,8 +87,10 @@ jobs:
       - uses: ./.github/actions/pnpm-setup
 
       - run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} lint
+        working-directory: js
 
       - run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} build
+        working-directory: js
 
   account-ui:
     name: Account UI
@@ -101,8 +105,10 @@ jobs:
       - uses: ./.github/actions/pnpm-setup
 
       - run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} lint
+        working-directory: js
 
       - run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} build
+        working-directory: js
 
   admin-ui:
     name: Admin UI
@@ -117,12 +123,16 @@ jobs:
       - uses: ./.github/actions/pnpm-setup
 
       - run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} lint
+        working-directory: js
 
       - run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} test
+        working-directory: js
 
       - run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} build
+        working-directory: js
 
       - run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} cy:check-types
+        working-directory: js
 
   account-ui-e2e:
     name: Account UI E2E
@@ -156,9 +166,11 @@ jobs:
 
       - name: Install Playwright browsers
         run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} exec playwright install --with-deps
+        working-directory: js
 
       - name: Run Playwright tests
         run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} test
+        working-directory: js
 
       - name: Upload Playwright report
         uses: actions/upload-artifact@v4
@@ -228,6 +240,7 @@ jobs:
 
       - name: Compile Admin Client
         run: pnpm --fail-if-no-match --filter @keycloak/keycloak-admin-client build
+        working-directory: js
 
       - name: Download Keycloak server
         uses: actions/download-artifact@v4
@@ -249,6 +262,7 @@ jobs:
 
       - name: Start LDAP server
         run: pnpm --fail-if-no-match --filter ${{ env.WORKSPACE }} cy:ldap-server &
+        working-directory: js
 
       - name: Run Cypress
         uses: cypress-io/github-action@v6

.gitignore

@@ -86,24 +86,9 @@ quarkus/data/*.db
 # Git ephemeral files
 *.versionsBackup
 
-# frontend-maven-plugin
-node
-
-# Wireit
-.wireit
-
-# Vite
-dist
-
 !/quarkus/dist
 !/quarkus/**/src/**/dist
 
-# ESLint
-.eslintcache
-
-# NPM
-node_modules
-
 # SDKMAM environment file
 .sdkmanrc
 

js/.gitignore

@@ -0,0 +1,14 @@
+# frontend-maven-plugin
+node
+
+# Wireit
+.wireit
+
+# Vite
+dist
+
+# ESLint
+.eslintcache
+
+# NPM
+node_modules

js/.husky/pre-commit

@@ -7,6 +7,9 @@ if [ ! -f "$FILE" ]; then
   exit 0;
 fi
 
+# Change to the js directory.
+cd js
+
 # Exit if dependencies are not installed.
 if [ ! -d "node_modules" ]; then
   exit 0;

js/apps/account-ui/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "include": ["src"],
   "exclude": ["**/*.test.ts", "**/*.test.tsx"]
 }

js/apps/admin-ui/src/groups/MembershipsModal.tsx

@@ -1,5 +1,5 @@
 import type GroupRepresentation from "@keycloak/keycloak-admin-client/lib/defs/groupRepresentation";
-import UserRepresentation from "js/libs/keycloak-admin-client/lib/defs/userRepresentation";
+import UserRepresentation from "@keycloak/keycloak-admin-client/lib/defs/userRepresentation";
 import { Modal, ModalVariant } from "@patternfly/react-core";
 import {
   Button,

js/apps/admin-ui/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "include": ["src"],
   "exclude": ["**/*.test.ts", "**/*.test.tsx"],
   "references": [{ "path": "./tsconfig.node.json" }]

eslint.config.js → js/eslint.config.js

@@ -161,16 +161,16 @@ export default tseslint.config(
   },
   {
     ...playwright.configs["flat/recommended"],
-    files: ["js/apps/account-ui/test/**"],
+    files: ["apps/account-ui/test/**"],
   },
   {
-    files: ["js/libs/keycloak-admin-client/test/**"],
+    files: ["libs/keycloak-admin-client/test/**"],
     rules: {
       "@typescript-eslint/no-unused-expressions": "off",
     },
   },
   {
-    files: ["js/libs/keycloak-admin-client/src/**"],
+    files: ["libs/keycloak-admin-client/src/**"],
     rules: {
       "@typescript-eslint/no-empty-object-type": "off",
     },

js/libs/keycloak-admin-client/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "include": ["src"],
   "compilerOptions": {
     "module": "Node16",

js/libs/ui-shared/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../tsconfig.json",
   "include": ["src"],
   "exclude": ["**/*.test.ts", "**/*.test.tsx"]
 }

package.json → js/package.json

@@ -4,7 +4,7 @@
   "type": "module",
   "packageManager": "[email protected]+sha512.c8180b3fbe4e4bca02c94234717896b5529740a6cbadf19fa78254270403ea2f27d4e1d46a08a0f56c89b63dc8ebfd3ee53326da720273794e6200fcf0d184ab",
   "scripts": {
-    "prepare": "husky js/.husky"
+    "prepare": "cd .. && husky js/.husky"
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.3",

js/pnpm-workspace.yaml

@@ -0,0 +1,4 @@
+packages:
+  - apps/*
+  - libs/*
+  - themes-vendor