Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert: web: Fix inline documentation rendering (#13379) #13606

Closed
wants to merge 1 commit into from
Closed

revert: web: Fix inline documentation rendering (#13379) #13606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions package-lock.json
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions web/.storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const importInlinePatterns = [
'import AKGlobal from "@goauthentik/common/styles/authentik\\.css',
'import PF.+ from "@patternfly/patternfly/\\S+\\.css',
'import ThemeDark from "@goauthentik/common/styles/theme-dark\\.css',
'import OneDark from "@goauthentik/common/styles/one-dark\\.css',
'import styles from "\\./LibraryPageImpl\\.css',
];

Expand All @@ -40,10 +39,6 @@ const config: StorybookConfig = {
from: "../src/common/styles/theme-dark.css",
to: "@goauthentik/common/styles/theme-dark.css",
},
{
from: "../src/common/styles/one-dark.css",
to: "@goauthentik/common/styles/one-dark.css",
},
],
framework: {
name: "@storybook/web-components-vite",
Expand Down
2 changes: 1 addition & 1 deletion ...scripts/esbuild/build-observer-plugin.mjs → web/build-observer-plugin.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import path from "path";
* @returns {string}
*/
export function serializeCustomEventToStream(event) {
// @ts-expect-error - TS doesn't know about the detail property
// @ts-ignore
const data = event.detail ?? {};

const eventContent = [`event: ${event.type}`, `data: ${JSON.stringify(data)}`];
Expand Down
14 changes: 7 additions & 7 deletions web/scripts/build-web.mjs → web/build.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ import esbuild from "esbuild";
import findFreePorts from "find-free-ports";
import { copyFileSync, mkdirSync, readFileSync, statSync } from "fs";
import { globSync } from "glob";
import * as path from "path";
import path from "path";
import { cwd } from "process";
import process from "process";
import { fileURLToPath } from "url";

import { mdxPlugin } from "./esbuild/build-mdx-plugin.mjs";
import { buildObserverPlugin } from "./esbuild/build-observer-plugin.mjs";
import { buildObserverPlugin } from "./build-observer-plugin.mjs";

const __dirname = fileURLToPath(new URL(".", import.meta.url));
let authentikProjectRoot = path.join(__dirname, "..", "..");
let authentikProjectRoot = __dirname + "../";

try {
// Use the package.json file in the root folder, as it has the current version information.
Expand Down Expand Up @@ -122,10 +121,11 @@ const BASE_ESBUILD_OPTIONS = {
loader: {
".css": "text",
".md": "text",
".mdx": "text",
},
define: definitions,
format: "esm",
plugins: [mdxPlugin()],
plugins: [],
logOverride: {
/**
* HACK: Silences issue originating in ESBuild.
Expand Down Expand Up @@ -160,7 +160,7 @@ function composeVersionID() {
* @throws {Error} on build failure
*/
function createEntryPointOptions([source, dest], overrides = {}) {
const outdir = path.join(__dirname, "..", "dist", dest);
const outdir = path.join(__dirname, "./dist", dest);

return {
...BASE_ESBUILD_OPTIONS,
Expand Down Expand Up @@ -213,7 +213,7 @@ async function doWatch() {
buildObserverPlugin({
serverURL,
logPrefix: entryPoint[1],
relativeRoot: path.join(__dirname, ".."),
relativeRoot: __dirname,
}),
],
define: {
Expand Down
2 changes: 1 addition & 1 deletion web/eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default [
...globals.node,
},
},
files: ["scripts/**/*.mjs", "*.ts", "*.mjs"],
files: ["scripts/*.mjs", "*.ts", "*.mjs"],
rules: {
"no-unused-vars": "off",
// We WANT our scripts to output to the console!
Expand Down
Loading
Loading