trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "web: manage version via package.json" 

This reverts commit 022401b60e.

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

# Conflicts:
#	web/src/api/Sentry.ts
#	web/src/api/Users.ts
This commit is contained in:
Jens Langhammer 2022-07-04 21:10:16 +02:00
parent 0348d6558a
commit ddae9dc6e1
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bumpversion.cfg
View File

@ -17,4 +17,4 @@ tag_name = version/{new_version}
[bumpversion:file:internal/constants/constants.go] [bumpversion:file:internal/constants/constants.go]
[bumpversion:file:web/package.json] [bumpversion:file:web/src/constants.ts]

4
web/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@goauthentik/web", "name": "authentik-web",
"version": "2022.6.3", "version": "0.0.0",
"private": true, "private": true,
"license": "GNU GPLv3", "license": "GNU GPLv3",
"scripts": { "scripts": {

13
web/rollup.config.js
View File

@ -7,8 +7,6 @@ import copy from "rollup-plugin-copy";
import cssimport from "rollup-plugin-cssimport"; import cssimport from "rollup-plugin-cssimport";
import { terser } from "rollup-plugin-terser"; import { terser } from "rollup-plugin-terser";
import pkg from "./package.json";
const extensions = [".js", ".jsx", ".ts", ".tsx"]; const extensions = [".js", ".jsx", ".ts", ".tsx"];
export const resources = [ export const resources = [
@ -75,12 +73,6 @@ export const defaultOptions = {
plugins: [ plugins: [
cssimport(), cssimport(),
markdown(), markdown(),
replace({
"process.env.NODE_ENV": JSON.stringify(isProdBuild ? "production" : "development"),
"process.env.AK_API_BASE_PATH": JSON.stringify(apiBasePath),
"process.env.AK_VERSION": JSON.stringify(pkg.version),
"preventAssignment": true,
}),
nodeResolve({ extensions, browser: true }), nodeResolve({ extensions, browser: true }),
commonjs(), commonjs(),
babel({ babel({
@ -88,6 +80,11 @@ export const defaultOptions = {
babelHelpers: "runtime", babelHelpers: "runtime",
include: ["src/**/*"], include: ["src/**/*"],
}), }),
replace({
"process.env.NODE_ENV": JSON.stringify(isProdBuild ? "production" : "development"),
"process.env.AK_API_BASE_PATH": JSON.stringify(apiBasePath),
"preventAssignment": true,
}),
isProdBuild && terser(), isProdBuild && terser(),
].filter((p) => p), ].filter((p) => p),
watch: { watch: {

4
web/src/constants.ts
View File

@ -1,11 +1,9 @@
// Placeholder, replaced by rollup;
export const VERSION = process.env.AK_VERSION;
export const SECONDARY_CLASS = "pf-m-secondary"; export const SECONDARY_CLASS = "pf-m-secondary";
export const SUCCESS_CLASS = "pf-m-success"; export const SUCCESS_CLASS = "pf-m-success";
export const ERROR_CLASS = "pf-m-danger"; export const ERROR_CLASS = "pf-m-danger";
export const PROGRESS_CLASS = "pf-m-in-progress"; export const PROGRESS_CLASS = "pf-m-in-progress";
export const CURRENT_CLASS = "pf-m-current"; export const CURRENT_CLASS = "pf-m-current";
export const VERSION = "2022.6.3";
export const TITLE_DEFAULT = "authentik"; export const TITLE_DEFAULT = "authentik";
export const ROUTE_SEPARATOR = ";"; export const ROUTE_SEPARATOR = ";";