diff --git a/Makefile b/Makefile index c1d2812223..af832a90ef 100644 --- a/Makefile +++ b/Makefile @@ -150,9 +150,9 @@ gen-client-ts: gen-clean-ts ## Build and install the authentik API for Typescri --additional-properties=npmVersion=${NPM_VERSION} \ --git-repo-id authentik \ --git-user-id goauthentik - mkdir -p web/node_modules/@goauthentik/api - cd ${PWD}/${GEN_API_TS} && npm i - \cp -rf ${PWD}/${GEN_API_TS}/* web/node_modules/@goauthentik/api + + cd ${PWD}/${GEN_API_TS} && npm link + cd ${PWD}/web && npm link @goauthentik/api gen-client-py: gen-clean-py ## Build and install the authentik API for Python docker run \ diff --git a/web/packages/esbuild-plugin-live-reload/.github/README.md b/packages/esbuild-plugin-live-reload/.github/README.md similarity index 100% rename from web/packages/esbuild-plugin-live-reload/.github/README.md rename to packages/esbuild-plugin-live-reload/.github/README.md diff --git a/web/packages/esbuild-plugin-live-reload/.gitignore b/packages/esbuild-plugin-live-reload/.gitignore similarity index 61% rename from web/packages/esbuild-plugin-live-reload/.gitignore rename to packages/esbuild-plugin-live-reload/.gitignore index 31fa92798c..9861a83d29 100644 --- a/web/packages/esbuild-plugin-live-reload/.gitignore +++ b/packages/esbuild-plugin-live-reload/.gitignore @@ -1,3 +1,4 @@ README.md node_modules _media +!.github/README.md diff --git a/web/packages/esbuild-plugin-live-reload/.prettierignore b/packages/esbuild-plugin-live-reload/.prettierignore similarity index 100% rename from web/packages/esbuild-plugin-live-reload/.prettierignore rename to packages/esbuild-plugin-live-reload/.prettierignore diff --git a/web/packages/esbuild-plugin-live-reload/LICENSE.txt b/packages/esbuild-plugin-live-reload/LICENSE.txt similarity index 100% rename from web/packages/esbuild-plugin-live-reload/LICENSE.txt rename to packages/esbuild-plugin-live-reload/LICENSE.txt diff --git a/web/packages/esbuild-plugin-live-reload/client/ESBuildObserver.js b/packages/esbuild-plugin-live-reload/client/ESBuildObserver.js similarity index 100% rename from web/packages/esbuild-plugin-live-reload/client/ESBuildObserver.js rename to packages/esbuild-plugin-live-reload/client/ESBuildObserver.js diff --git a/web/packages/esbuild-plugin-live-reload/client/index.js b/packages/esbuild-plugin-live-reload/client/index.js similarity index 100% rename from web/packages/esbuild-plugin-live-reload/client/index.js rename to packages/esbuild-plugin-live-reload/client/index.js diff --git a/web/packages/esbuild-plugin-live-reload/client/types.d.ts b/packages/esbuild-plugin-live-reload/client/types.d.ts similarity index 100% rename from web/packages/esbuild-plugin-live-reload/client/types.d.ts rename to packages/esbuild-plugin-live-reload/client/types.d.ts diff --git a/web/packages/esbuild-plugin-live-reload/index.js b/packages/esbuild-plugin-live-reload/index.js similarity index 100% rename from web/packages/esbuild-plugin-live-reload/index.js rename to packages/esbuild-plugin-live-reload/index.js diff --git a/web/packages/esbuild-plugin-live-reload/package-lock.json b/packages/esbuild-plugin-live-reload/package-lock.json similarity index 99% rename from web/packages/esbuild-plugin-live-reload/package-lock.json rename to packages/esbuild-plugin-live-reload/package-lock.json index f2f8036201..7077032e1e 100644 --- a/web/packages/esbuild-plugin-live-reload/package-lock.json +++ b/packages/esbuild-plugin-live-reload/package-lock.json @@ -1,12 +1,12 @@ { "name": "@goauthentik/esbuild-plugin-live-reload", - "version": "1.0.5", + "version": "1.0.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@goauthentik/esbuild-plugin-live-reload", - "version": "1.0.5", + "version": "1.0.6", "license": "MIT", "dependencies": { "find-free-ports": "^3.1.1" diff --git a/web/packages/esbuild-plugin-live-reload/package.json b/packages/esbuild-plugin-live-reload/package.json similarity index 98% rename from web/packages/esbuild-plugin-live-reload/package.json rename to packages/esbuild-plugin-live-reload/package.json index 4a8205f9c2..c4caf67492 100644 --- a/web/packages/esbuild-plugin-live-reload/package.json +++ b/packages/esbuild-plugin-live-reload/package.json @@ -1,6 +1,6 @@ { "name": "@goauthentik/esbuild-plugin-live-reload", - "version": "1.0.5", + "version": "1.0.6", "description": "ESBuild + browser refresh. Build completes, page reloads.", "license": "MIT", "scripts": { diff --git a/web/packages/esbuild-plugin-live-reload/plugin/index.js b/packages/esbuild-plugin-live-reload/plugin/index.js similarity index 100% rename from web/packages/esbuild-plugin-live-reload/plugin/index.js rename to packages/esbuild-plugin-live-reload/plugin/index.js diff --git a/web/packages/esbuild-plugin-live-reload/tsconfig.json b/packages/esbuild-plugin-live-reload/tsconfig.json similarity index 100% rename from web/packages/esbuild-plugin-live-reload/tsconfig.json rename to packages/esbuild-plugin-live-reload/tsconfig.json diff --git a/web/packages/esbuild-plugin-live-reload/typedoc.json b/packages/esbuild-plugin-live-reload/typedoc.json similarity index 100% rename from web/packages/esbuild-plugin-live-reload/typedoc.json rename to packages/esbuild-plugin-live-reload/typedoc.json diff --git a/scripts/api-ts-templates/tsconfig.mustache b/scripts/api-ts-templates/tsconfig.mustache index a7fe768924..1226648c81 100644 --- a/scripts/api-ts-templates/tsconfig.mustache +++ b/scripts/api-ts-templates/tsconfig.mustache @@ -9,8 +9,8 @@ "strict": true, "newLine": "lf", "target": "ESNext", - "module": "ESNext", - "moduleResolution": "bundler", + "module": "NodeNext", + "moduleResolution": "NodeNext", "outDir": "dist", "skipDefaultLibCheck": true, "skipLibCheck": true, diff --git a/web/package-lock.json b/web/package-lock.json index eb3523577c..dd4d797cb0 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -75,7 +75,7 @@ "devDependencies": { "@eslint/js": "^9.27.0", "@goauthentik/core": "^1.0.0", - "@goauthentik/esbuild-plugin-live-reload": "^1.0.4", + "@goauthentik/esbuild-plugin-live-reload": "^1.0.5", "@goauthentik/eslint-config": "^1.0.5", "@goauthentik/prettier-config": "^1.0.5", "@goauthentik/tsconfig": "^1.0.4", @@ -1716,20 +1716,6 @@ "node": ">=6" } }, - "node_modules/@gerrit0/mini-shiki": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/@gerrit0/mini-shiki/-/mini-shiki-3.4.2.tgz", - "integrity": "sha512-3jXo5bNjvvimvdbIhKGfFxSnKCX+MA8wzHv55ptzk/cx8wOzT+BRcYgj8aFN3yTiTs+zvQQiaZFr7Jce1ZG3fw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@shikijs/engine-oniguruma": "^3.4.2", - "@shikijs/langs": "^3.4.2", - "@shikijs/themes": "^3.4.2", - "@shikijs/types": "^3.4.2", - "@shikijs/vscode-textmate": "^10.0.2" - } - }, "node_modules/@goauthentik/api": { "version": "2025.6.2-1750856752", "resolved": "https://registry.npmjs.org/@goauthentik/api/-/api-2025.6.2-1750856752.tgz", @@ -1740,8 +1726,20 @@ "link": true }, "node_modules/@goauthentik/esbuild-plugin-live-reload": { - "resolved": "packages/esbuild-plugin-live-reload", - "link": true + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@goauthentik/esbuild-plugin-live-reload/-/esbuild-plugin-live-reload-1.0.5.tgz", + "integrity": "sha512-MZ/najY+Xn62ijzj7JDS1sVupWI3BNRwJc4kykB/iP9CdLJw+xO71qPTjfCEEOVYMZrOTftD4KOLhRYx3GTqkA==", + "dev": true, + "license": "MIT", + "dependencies": { + "find-free-ports": "^3.1.1" + }, + "engines": { + "node": ">=22" + }, + "peerDependencies": { + "esbuild": "^0.25.4" + } }, "node_modules/@goauthentik/eslint-config": { "version": "1.0.5", @@ -4058,6 +4056,7 @@ "integrity": "sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": "^12.20.0 || ^14.18.0 || >=16.0.0" }, @@ -4719,55 +4718,6 @@ "node": ">=14.18" } }, - "node_modules/@shikijs/engine-oniguruma": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.4.2.tgz", - "integrity": "sha512-zcZKMnNndgRa3ORja6Iemsr3DrLtkX3cAF7lTJkdMB6v9alhlBsX9uNiCpqofNrXOvpA3h6lHcLJxgCIhVOU5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@shikijs/types": "3.4.2", - "@shikijs/vscode-textmate": "^10.0.2" - } - }, - "node_modules/@shikijs/langs": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.4.2.tgz", - "integrity": "sha512-H6azIAM+OXD98yztIfs/KH5H4PU39t+SREhmM8LaNXyUrqj2mx+zVkr8MWYqjceSjDw9I1jawm1WdFqU806rMA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@shikijs/types": "3.4.2" - } - }, - "node_modules/@shikijs/themes": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.4.2.tgz", - "integrity": "sha512-qAEuAQh+brd8Jyej2UDDf+b4V2g1Rm8aBIdvt32XhDPrHvDkEnpb7Kzc9hSuHUxz0Iuflmq7elaDuQAP9bHIhg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@shikijs/types": "3.4.2" - } - }, - "node_modules/@shikijs/types": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.4.2.tgz", - "integrity": "sha512-zHC1l7L+eQlDXLnxvM9R91Efh2V4+rN3oMVS2swCBssbj2U/FBwybD1eeLaq8yl/iwT+zih8iUbTBCgGZOYlVg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@shikijs/vscode-textmate": "^10.0.2", - "@types/hast": "^3.0.4" - } - }, - "node_modules/@shikijs/vscode-textmate": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz", - "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==", - "dev": true, - "license": "MIT" - }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -13238,6 +13188,7 @@ "integrity": "sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12.20" } @@ -13248,6 +13199,7 @@ "integrity": "sha512-qE3Veg1YXzGHQhlA6jzebZN2qVf6NX+A7m7qlhCGG30dJixrAQhYOsJjsnBjJkCSmuOPpCk30145fr8FV0bzog==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, @@ -15698,6 +15650,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/find-free-ports/-/find-free-ports-3.1.1.tgz", "integrity": "sha512-hQebewth9i5qkf0a0u06iFaxQssk5ZnPBBggsa1vk8zCYaZoz9IZXpoRLTbEOrYdqfrjvcxU00gYoCPgmXugKA==", + "dev": true, "license": "MIT" }, "node_modules/find-replace": { @@ -16242,6 +16195,7 @@ "integrity": "sha512-cmP497iLq54AZnv4YRAEMnEyQ1eIn4tGKbmswqwmFV4GBnAqE8NLtWxxdXa++AalfgL5EBH4IxTPyquEuGY/jA==", "dev": true, "license": "MIT", + "peer": true, "funding": { "url": "https://github.com/fisker/git-hooks-list?sponsor=1" } @@ -19172,16 +19126,6 @@ "dev": true, "license": "MIT" }, - "node_modules/linkify-it": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", - "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "uc.micro": "^2.0.0" - } - }, "node_modules/lit": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/lit/-/lit-3.3.0.tgz", @@ -19586,13 +19530,6 @@ "node": ">=16.14" } }, - "node_modules/lunr": { - "version": "2.3.9", - "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", - "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", - "dev": true, - "license": "MIT" - }, "node_modules/lz-string": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", @@ -19654,24 +19591,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/markdown-it": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", - "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1", - "entities": "^4.4.0", - "linkify-it": "^5.0.0", - "mdurl": "^2.0.0", - "punycode.js": "^2.3.1", - "uc.micro": "^2.1.0" - }, - "bin": { - "markdown-it": "bin/markdown-it.mjs" - } - }, "node_modules/markdown-table": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.4.tgz", @@ -20069,13 +19988,6 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/mdurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", - "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", - "dev": true, - "license": "MIT" - }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -23018,6 +22930,7 @@ "integrity": "sha512-h+3tSpr2nVpp+YOK1MDIYtYhHVXr8/0V59UUbJpIJFaqi3w4fvUokJo6eV8W+vELrUXIZzJ+DKm5G7lYzrMcKQ==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "sort-package-json": "3.2.1", "synckit": "0.11.6" @@ -23265,16 +23178,6 @@ "node": ">=6" } }, - "node_modules/punycode.js": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", - "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/puppeteer-core": { "version": "22.15.0", "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.15.0.tgz", @@ -25377,7 +25280,8 @@ "resolved": "https://registry.npmjs.org/sort-object-keys/-/sort-object-keys-1.1.3.tgz", "integrity": "sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/sort-package-json": { "version": "3.2.1", @@ -25385,6 +25289,7 @@ "integrity": "sha512-rTfRdb20vuoAn7LDlEtCqOkYfl2X+Qze6cLbNOzcDpbmKEhJI30tTN44d5shbKJnXsvz24QQhlCm81Bag7EOKg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "detect-indent": "^7.0.1", "detect-newline": "^4.0.1", @@ -26077,6 +25982,7 @@ "integrity": "sha512-2pR2ubZSV64f/vqm9eLPz/KOvR9Dm+Co/5ChLgeHl0yEDRc6h5hXHoxEQH8Y5Ljycozd3p1k5TTSVdzYGkPvLw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@pkgr/core": "^0.2.4" }, @@ -26287,6 +26193,7 @@ "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "fdir": "^6.4.4", "picomatch": "^4.0.2" @@ -27156,43 +27063,6 @@ "dev": true, "license": "MIT" }, - "node_modules/typedoc": { - "version": "0.28.5", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.28.5.tgz", - "integrity": "sha512-5PzUddaA9FbaarUzIsEc4wNXCiO4Ot3bJNeMF2qKpYlTmM9TTaSHQ7162w756ERCkXER/+o2purRG6YOAv6EMA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@gerrit0/mini-shiki": "^3.2.2", - "lunr": "^2.3.9", - "markdown-it": "^14.1.0", - "minimatch": "^9.0.5", - "yaml": "^2.7.1" - }, - "bin": { - "typedoc": "bin/typedoc" - }, - "engines": { - "node": ">= 18", - "pnpm": ">= 10" - }, - "peerDependencies": { - "typescript": "5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x" - } - }, - "node_modules/typedoc-plugin-markdown": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-4.6.3.tgz", - "integrity": "sha512-86oODyM2zajXwLs4Wok2mwVEfCwCnp756QyhLGX2IfsdRYr1DXLCgJgnLndaMUjJD7FBhnLk2okbNE9PdLxYRw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 18" - }, - "peerDependencies": { - "typedoc": "0.28.x" - } - }, "node_modules/types-ramda": { "version": "0.30.1", "resolved": "https://registry.npmjs.org/types-ramda/-/types-ramda-0.30.1.tgz", @@ -27249,13 +27119,6 @@ "node": ">=8" } }, - "node_modules/uc.micro": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", - "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", - "dev": true, - "license": "MIT" - }, "node_modules/ufo": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz", @@ -29467,6 +29330,7 @@ "packages/esbuild-plugin-live-reload": { "name": "@goauthentik/esbuild-plugin-live-reload", "version": "1.0.5", + "extraneous": true, "license": "MIT", "dependencies": { "find-free-ports": "^3.1.1" @@ -29490,16 +29354,6 @@ "esbuild": "^0.25.5" } }, - "packages/esbuild-plugin-live-reload/node_modules/@types/node": { - "version": "22.15.19", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.19.tgz", - "integrity": "sha512-3vMNr4TzNQyjHcRZadojpRaD9Ofr6LsonZAoQ+HMUa/9ORTPoxVIw0e0mpqWpdjj8xybyCM+oKOUH2vwFu/oEw==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.21.0" - } - }, "packages/monorepo": { "name": "@goauthentik/monorepo", "version": "1.0.0", diff --git a/web/package.json b/web/package.json index d21aec4af5..248f271744 100644 --- a/web/package.json +++ b/web/package.json @@ -146,7 +146,7 @@ "devDependencies": { "@eslint/js": "^9.27.0", "@goauthentik/core": "^1.0.0", - "@goauthentik/esbuild-plugin-live-reload": "^1.0.4", + "@goauthentik/esbuild-plugin-live-reload": "^1.0.5", "@goauthentik/eslint-config": "^1.0.5", "@goauthentik/prettier-config": "^1.0.5", "@goauthentik/tsconfig": "^1.0.4",