@keycloakify/svelte 0.2.6 → 0.2.8-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/keycloakify-svelte/account/DefaultPage.svelte +1 -1
- package/keycloakify-svelte/account/Template.svelte +14 -7
- package/keycloakify-svelte/account/pages/Account.svelte +10 -8
- package/keycloakify-svelte/account/pages/Applications.svelte +8 -6
- package/keycloakify-svelte/account/pages/FederatedIdentity.svelte +2 -2
- package/keycloakify-svelte/account/pages/Log.svelte +8 -6
- package/keycloakify-svelte/account/pages/Password.svelte +10 -8
- package/keycloakify-svelte/account/pages/Sessions.svelte +8 -6
- package/keycloakify-svelte/account/pages/Totp.svelte +8 -6
- package/keycloakify-svelte/bin/200.index.js +78 -82
- package/keycloakify-svelte/bin/266.index.js +98 -103
- package/keycloakify-svelte/bin/{343.index.js → 545.index.js} +4079 -2565
- package/keycloakify-svelte/bin/709.index.js +91 -95
- package/keycloakify-svelte/bin/818.index.js +108 -113
- package/keycloakify-svelte/bin/index.js +623 -1908
- package/keycloakify-svelte/login/DefaultPage.svelte +1 -1
- package/keycloakify-svelte/login/Template.svelte +14 -8
- package/keycloakify-svelte/login/components/AddRemoveButtonsMultiValuedAttribute.svelte +6 -4
- package/keycloakify-svelte/login/components/AddRemoveButtonsMultiValuedAttribute.svelte.d.ts +1 -1
- package/keycloakify-svelte/login/components/GroupLabel.svelte +11 -9
- package/keycloakify-svelte/login/components/InputFieldByType.svelte +2 -2
- package/keycloakify-svelte/login/components/InputTag.svelte +5 -5
- package/keycloakify-svelte/login/components/InputTagSelects.svelte +51 -47
- package/keycloakify-svelte/login/components/LogoutOtherSessions.svelte +1 -1
- package/keycloakify-svelte/login/components/PasswordWrapper.svelte +2 -2
- package/keycloakify-svelte/login/components/SelectTag.svelte +21 -19
- package/keycloakify-svelte/login/components/TermsAcceptance.svelte +1 -1
- package/keycloakify-svelte/login/components/TextareaTag.svelte +6 -3
- package/keycloakify-svelte/login/components/UserProfileFormFields.svelte +6 -6
- package/keycloakify-svelte/login/pages/Code.svelte +9 -7
- package/keycloakify-svelte/login/pages/DeleteAccountConfirm.svelte +8 -6
- package/keycloakify-svelte/login/pages/DeleteCredential.svelte +8 -6
- package/keycloakify-svelte/login/pages/Error.svelte +2 -2
- package/keycloakify-svelte/login/pages/FrontchannelLogout.svelte +2 -2
- package/keycloakify-svelte/login/pages/IdpReviewUserProfile.svelte +8 -6
- package/keycloakify-svelte/login/pages/Info.svelte +2 -2
- package/keycloakify-svelte/login/pages/Login.svelte +9 -6
- package/keycloakify-svelte/login/pages/LoginConfigTotp.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginIdpLinkConfirm.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginIdpLinkConfirmOverride.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginIdpLinkEmail.svelte +2 -2
- package/keycloakify-svelte/login/pages/LoginOauth2DeviceVerifyUserCode.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginOauthGrant.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginOtp.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginPageExpired.svelte +2 -2
- package/keycloakify-svelte/login/pages/LoginPasskeysConditionalAuthenticate.svelte +14 -7
- package/keycloakify-svelte/login/pages/LoginPassword.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginRecoveryAuthnCodeConfig.svelte +10 -7
- package/keycloakify-svelte/login/pages/LoginRecoveryAuthnCodeInput.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginResetOtp.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginResetPassword.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginUpdatePassword.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginUpdateProfile.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginUsername.svelte +8 -6
- package/keycloakify-svelte/login/pages/LoginVerifyEmail.svelte +2 -2
- package/keycloakify-svelte/login/pages/LoginX509Info.svelte +8 -6
- package/keycloakify-svelte/login/pages/LogoutConfirm.svelte +8 -6
- package/keycloakify-svelte/login/pages/Register.svelte +9 -7
- package/keycloakify-svelte/login/pages/SamlPostForm.svelte +2 -2
- package/keycloakify-svelte/login/pages/SelectAuthenticator.svelte +3 -3
- package/keycloakify-svelte/login/pages/Terms.svelte +8 -6
- package/keycloakify-svelte/login/pages/UpdateEmail.svelte +8 -6
- package/keycloakify-svelte/login/pages/WebauthnAuthenticate.svelte +6 -5
- package/keycloakify-svelte/login/pages/WebauthnError.svelte +8 -6
- package/keycloakify-svelte/login/pages/WebauthnRegister.svelte +6 -5
- package/package.json +22 -20
- package/src/account/DefaultPage.svelte +1 -1
- package/src/account/Template.svelte +14 -7
- package/src/account/pages/Account.svelte +10 -8
- package/src/account/pages/Applications.svelte +8 -6
- package/src/account/pages/FederatedIdentity.svelte +2 -2
- package/src/account/pages/Log.svelte +8 -6
- package/src/account/pages/Password.svelte +10 -8
- package/src/account/pages/Sessions.svelte +8 -6
- package/src/account/pages/Totp.svelte +8 -6
- package/src/bin/initialize-account-theme/boilerplate/KcPage.svelte +3 -3
- package/src/bin/initialize-account-theme/boilerplate/KcPageStory.svelte +1 -1
- package/src/bin/initialize-account-theme/initialize-account-theme.ts +2 -1
- package/src/bin/tools/getThisCodebaseRootDirPath.ts +7 -0
- package/src/bin/tools/nodeModulesBinDirPath.ts +30 -1
- package/src/bin/tools/runPrettier.ts +42 -39
- package/src/login/DefaultPage.svelte +1 -1
- package/src/login/Template.svelte +14 -8
- package/src/login/components/AddRemoveButtonsMultiValuedAttribute.svelte +6 -4
- package/src/login/components/GroupLabel.svelte +11 -9
- package/src/login/components/InputFieldByType.svelte +2 -2
- package/src/login/components/InputTag.svelte +5 -5
- package/src/login/components/InputTagSelects.svelte +51 -47
- package/src/login/components/LogoutOtherSessions.svelte +1 -1
- package/src/login/components/PasswordWrapper.svelte +2 -2
- package/src/login/components/SelectTag.svelte +21 -19
- package/src/login/components/TermsAcceptance.svelte +1 -1
- package/src/login/components/TextareaTag.svelte +6 -3
- package/src/login/components/UserProfileFormFields.svelte +6 -6
- package/src/login/pages/Code.svelte +9 -7
- package/src/login/pages/DeleteAccountConfirm.svelte +8 -6
- package/src/login/pages/DeleteCredential.svelte +8 -6
- package/src/login/pages/Error.svelte +2 -2
- package/src/login/pages/FrontchannelLogout.svelte +2 -2
- package/src/login/pages/IdpReviewUserProfile.svelte +8 -6
- package/src/login/pages/Info.svelte +2 -2
- package/src/login/pages/Login.svelte +9 -6
- package/src/login/pages/LoginConfigTotp.svelte +8 -6
- package/src/login/pages/LoginIdpLinkConfirm.svelte +8 -6
- package/src/login/pages/LoginIdpLinkConfirmOverride.svelte +8 -6
- package/src/login/pages/LoginIdpLinkEmail.svelte +2 -2
- package/src/login/pages/LoginOauth2DeviceVerifyUserCode.svelte +8 -6
- package/src/login/pages/LoginOauthGrant.svelte +8 -6
- package/src/login/pages/LoginOtp.svelte +8 -6
- package/src/login/pages/LoginPageExpired.svelte +2 -2
- package/src/login/pages/LoginPasskeysConditionalAuthenticate.svelte +14 -7
- package/src/login/pages/LoginPassword.svelte +8 -6
- package/src/login/pages/LoginRecoveryAuthnCodeConfig.svelte +10 -7
- package/src/login/pages/LoginRecoveryAuthnCodeInput.svelte +8 -6
- package/src/login/pages/LoginResetOtp.svelte +8 -6
- package/src/login/pages/LoginResetPassword.svelte +8 -6
- package/src/login/pages/LoginUpdatePassword.svelte +8 -6
- package/src/login/pages/LoginUpdateProfile.svelte +8 -6
- package/src/login/pages/LoginUsername.svelte +8 -6
- package/src/login/pages/LoginVerifyEmail.svelte +2 -2
- package/src/login/pages/LoginX509Info.svelte +8 -6
- package/src/login/pages/LogoutConfirm.svelte +8 -6
- package/src/login/pages/Register.svelte +9 -7
- package/src/login/pages/SamlPostForm.svelte +2 -2
- package/src/login/pages/SelectAuthenticator.svelte +3 -3
- package/src/login/pages/Terms.svelte +8 -6
- package/src/login/pages/UpdateEmail.svelte +8 -6
- package/src/login/pages/WebauthnAuthenticate.svelte +6 -5
- package/src/login/pages/WebauthnError.svelte +8 -6
- package/src/login/pages/WebauthnRegister.svelte +6 -5
- package/src/bin/tools/readThisNpmPackageVersion.ts +0 -22
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import type { KcContext } from './KcContext';
|
|
5
5
|
|
|
6
6
|
const props: PageProps<KcContext, I18n> = $props();
|
|
7
|
-
const { kcContext
|
|
7
|
+
const { kcContext, ...rest } = $derived(props);
|
|
8
8
|
const loadComponent = () => {
|
|
9
9
|
switch (kcContext.pageId) {
|
|
10
10
|
case 'password.ftl':
|
|
@@ -4,17 +4,17 @@
|
|
|
4
4
|
import { useSetClassName } from '../tools/useSetClassName';
|
|
5
5
|
import { getKcClsx } from 'keycloakify/account/lib/kcClsx';
|
|
6
6
|
import { clsx } from 'keycloakify/tools/clsx';
|
|
7
|
-
import { onMount } from 'svelte';
|
|
7
|
+
import { onMount, untrack } from 'svelte';
|
|
8
8
|
import type { I18n } from './i18n';
|
|
9
9
|
import type { KcContext } from './KcContext';
|
|
10
10
|
import { kcSanitize } from 'keycloakify/lib/kcSanitize';
|
|
11
11
|
|
|
12
12
|
const { kcContext, i18n, doUseDefaultCss, active, classes, children }: TemplateProps<KcContext, I18n> = $props();
|
|
13
|
-
const { kcClsx } = getKcClsx({ doUseDefaultCss, classes });
|
|
13
|
+
const { kcClsx } = $derived(getKcClsx({ doUseDefaultCss, classes }));
|
|
14
14
|
|
|
15
|
-
const { msg, msgStr, currentLanguage, enabledLanguages } = $i18n;
|
|
15
|
+
const { msg, msgStr, currentLanguage, enabledLanguages } = $derived($i18n);
|
|
16
16
|
|
|
17
|
-
const { url, features, realm, message, referrer } = kcContext;
|
|
17
|
+
const { url, features, realm, message, referrer } = $derived(kcContext);
|
|
18
18
|
|
|
19
19
|
onMount(() => {
|
|
20
20
|
document.title = msgStr('accountManagementTitle');
|
|
@@ -22,15 +22,22 @@
|
|
|
22
22
|
|
|
23
23
|
useSetClassName({
|
|
24
24
|
qualifiedName: 'html',
|
|
25
|
-
className: kcClsx('kcHtmlClass'),
|
|
25
|
+
className: untrack(() => kcClsx('kcHtmlClass')),
|
|
26
26
|
});
|
|
27
27
|
|
|
28
28
|
useSetClassName({
|
|
29
29
|
qualifiedName: 'body',
|
|
30
|
-
className: clsx(
|
|
30
|
+
className: clsx(
|
|
31
|
+
'admin-console',
|
|
32
|
+
'user',
|
|
33
|
+
untrack(() => kcClsx('kcBodyClass')),
|
|
34
|
+
),
|
|
31
35
|
});
|
|
32
36
|
|
|
33
|
-
const { isReadyToRender } = useInitialize({
|
|
37
|
+
const { isReadyToRender } = useInitialize({
|
|
38
|
+
kcContext: untrack(() => kcContext),
|
|
39
|
+
doUseDefaultCss: untrack(() => doUseDefaultCss),
|
|
40
|
+
});
|
|
34
41
|
</script>
|
|
35
42
|
|
|
36
43
|
{#if $isReadyToRender}
|
|
@@ -13,19 +13,21 @@
|
|
|
13
13
|
...props
|
|
14
14
|
}: PageProps<Extract<KcContext, { pageId: 'account.ftl' }>, I18n> = $props();
|
|
15
15
|
|
|
16
|
-
const classes = {
|
|
16
|
+
const classes = $derived({
|
|
17
17
|
...props.classes,
|
|
18
18
|
kcBodyClass: clsx(props.classes?.kcBodyClass, 'user'),
|
|
19
|
-
};
|
|
20
|
-
|
|
21
|
-
const { kcClsx } = getKcClsx({
|
|
22
|
-
doUseDefaultCss,
|
|
23
|
-
classes,
|
|
24
19
|
});
|
|
25
20
|
|
|
26
|
-
const {
|
|
21
|
+
const { kcClsx } = $derived(
|
|
22
|
+
getKcClsx({
|
|
23
|
+
doUseDefaultCss,
|
|
24
|
+
classes,
|
|
25
|
+
}),
|
|
26
|
+
);
|
|
27
|
+
|
|
28
|
+
const { url, realm, messagesPerField, stateChecker, account, referrer } = $derived(kcContext);
|
|
27
29
|
|
|
28
|
-
const { msg } = $i18n;
|
|
30
|
+
const { msg } = $derived($i18n);
|
|
29
31
|
</script>
|
|
30
32
|
|
|
31
33
|
<Template
|
|
@@ -12,18 +12,20 @@
|
|
|
12
12
|
classes,
|
|
13
13
|
}: PageProps<Extract<KcContext, { pageId: 'applications.ftl' }>, I18n> = $props();
|
|
14
14
|
|
|
15
|
-
const { kcClsx } =
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
const { kcClsx } = $derived(
|
|
16
|
+
getKcClsx({
|
|
17
|
+
doUseDefaultCss,
|
|
18
|
+
classes,
|
|
19
|
+
}),
|
|
20
|
+
);
|
|
19
21
|
|
|
20
22
|
const {
|
|
21
23
|
url,
|
|
22
24
|
applications: { applications },
|
|
23
25
|
stateChecker,
|
|
24
|
-
} = kcContext;
|
|
26
|
+
} = $derived(kcContext);
|
|
25
27
|
|
|
26
|
-
const { msg, advancedMsg } = $i18n;
|
|
28
|
+
const { msg, advancedMsg } = $derived($i18n);
|
|
27
29
|
|
|
28
30
|
function isArrayWithEmptyObject(variable: unknown): boolean {
|
|
29
31
|
return (
|
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
classes,
|
|
12
12
|
}: PageProps<Extract<KcContext, { pageId: 'federatedIdentity.ftl' }>, I18n> = $props();
|
|
13
13
|
|
|
14
|
-
const { url, federatedIdentity, stateChecker } = kcContext;
|
|
15
|
-
const { msg } = $i18n;
|
|
14
|
+
const { url, federatedIdentity, stateChecker } = $derived(kcContext);
|
|
15
|
+
const { msg } = $derived($i18n);
|
|
16
16
|
</script>
|
|
17
17
|
|
|
18
18
|
<Template
|
|
@@ -12,14 +12,16 @@
|
|
|
12
12
|
classes,
|
|
13
13
|
}: PageProps<Extract<KcContext, { pageId: 'log.ftl' }>, I18n> = $props();
|
|
14
14
|
|
|
15
|
-
const { kcClsx } =
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
const { kcClsx } = $derived(
|
|
16
|
+
getKcClsx({
|
|
17
|
+
doUseDefaultCss,
|
|
18
|
+
classes,
|
|
19
|
+
}),
|
|
20
|
+
);
|
|
19
21
|
|
|
20
|
-
const { log } = kcContext;
|
|
22
|
+
const { log } = $derived(kcContext);
|
|
21
23
|
|
|
22
|
-
const { msg } = $i18n;
|
|
24
|
+
const { msg } = $derived($i18n);
|
|
23
25
|
</script>
|
|
24
26
|
|
|
25
27
|
<Template
|
|
@@ -14,18 +14,20 @@
|
|
|
14
14
|
...props
|
|
15
15
|
}: PageProps<Extract<KcContext, { pageId: 'password.ftl' }>, I18n> = $props();
|
|
16
16
|
|
|
17
|
-
const classes = {
|
|
17
|
+
const classes = $derived({
|
|
18
18
|
...props.classes,
|
|
19
19
|
kcBodyClass: clsx(props.classes?.kcBodyClass, 'password'),
|
|
20
|
-
};
|
|
21
|
-
|
|
22
|
-
const { kcClsx } = getKcClsx({
|
|
23
|
-
doUseDefaultCss,
|
|
24
|
-
classes,
|
|
25
20
|
});
|
|
26
|
-
const { url, password, account, stateChecker } = kcContext;
|
|
27
21
|
|
|
28
|
-
const {
|
|
22
|
+
const { kcClsx } = $derived(
|
|
23
|
+
getKcClsx({
|
|
24
|
+
doUseDefaultCss,
|
|
25
|
+
classes,
|
|
26
|
+
}),
|
|
27
|
+
);
|
|
28
|
+
const { url, password, account, stateChecker } = $derived(kcContext);
|
|
29
|
+
|
|
30
|
+
const { msgStr, msg } = $derived($i18n);
|
|
29
31
|
|
|
30
32
|
const [currentPassword, setCurrentPassword] = useState('');
|
|
31
33
|
const [newPassword, setNewPassword] = useState('');
|
|
@@ -12,14 +12,16 @@
|
|
|
12
12
|
classes,
|
|
13
13
|
}: PageProps<Extract<KcContext, { pageId: 'sessions.ftl' }>, I18n> = $props();
|
|
14
14
|
|
|
15
|
-
const { kcClsx } =
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
const { kcClsx } = $derived(
|
|
16
|
+
getKcClsx({
|
|
17
|
+
doUseDefaultCss,
|
|
18
|
+
classes,
|
|
19
|
+
}),
|
|
20
|
+
);
|
|
19
21
|
|
|
20
|
-
const { url, stateChecker, sessions } = kcContext;
|
|
22
|
+
const { url, stateChecker, sessions } = $derived(kcContext);
|
|
21
23
|
|
|
22
|
-
const { msg } = $i18n;
|
|
24
|
+
const { msg } = $derived($i18n);
|
|
23
25
|
</script>
|
|
24
26
|
|
|
25
27
|
<Template
|
|
@@ -14,14 +14,16 @@
|
|
|
14
14
|
classes,
|
|
15
15
|
}: PageProps<Extract<KcContext, { pageId: 'totp.ftl' }>, I18n> = $props();
|
|
16
16
|
|
|
17
|
-
const { kcClsx } =
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
const { kcClsx } = $derived(
|
|
18
|
+
getKcClsx({
|
|
19
|
+
doUseDefaultCss,
|
|
20
|
+
classes,
|
|
21
|
+
}),
|
|
22
|
+
);
|
|
21
23
|
|
|
22
|
-
const { totp, mode, url, messagesPerField, stateChecker } = kcContext;
|
|
24
|
+
const { totp, mode, url, messagesPerField, stateChecker } = $derived(kcContext);
|
|
23
25
|
|
|
24
|
-
const { msg, msgStr, advancedMsg } = $i18n;
|
|
26
|
+
const { msg, msgStr, advancedMsg } = $derived($i18n);
|
|
25
27
|
</script>
|
|
26
28
|
|
|
27
29
|
<Template
|
|
@@ -6,7 +6,8 @@ export const modules = {
|
|
|
6
6
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
7
7
|
|
|
8
8
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
9
|
-
/* harmony export */ J: () => (/* binding */ getThisCodebaseRootDirPath)
|
|
9
|
+
/* harmony export */ J: () => (/* binding */ getThisCodebaseRootDirPath),
|
|
10
|
+
/* harmony export */ x: () => (/* binding */ getNearestPackageJsonDirPath)
|
|
10
11
|
/* harmony export */ });
|
|
11
12
|
/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(896);
|
|
12
13
|
/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
|
|
@@ -31,6 +32,12 @@ function getThisCodebaseRootDirPath() {
|
|
|
31
32
|
}
|
|
32
33
|
return (result = getThisCodebaseRootDirPath_rec(__dirname));
|
|
33
34
|
}
|
|
35
|
+
function getNearestPackageJsonDirPath(dirPath) {
|
|
36
|
+
if (fs__WEBPACK_IMPORTED_MODULE_0__.existsSync(path__WEBPACK_IMPORTED_MODULE_1__.join(dirPath, 'package.json'))) {
|
|
37
|
+
return dirPath;
|
|
38
|
+
}
|
|
39
|
+
return getNearestPackageJsonDirPath(path__WEBPACK_IMPORTED_MODULE_1__.join(dirPath, '..'));
|
|
40
|
+
}
|
|
34
41
|
|
|
35
42
|
|
|
36
43
|
/***/ }),
|
|
@@ -43,13 +50,35 @@ function getThisCodebaseRootDirPath() {
|
|
|
43
50
|
/* harmony export */ });
|
|
44
51
|
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(928);
|
|
45
52
|
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_0__);
|
|
53
|
+
/* harmony import */ var _getThisCodebaseRootDirPath__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(697);
|
|
54
|
+
|
|
46
55
|
|
|
47
56
|
let cache = undefined;
|
|
57
|
+
/** NOTE: Careful, this function can fail when the binary
|
|
58
|
+
* Used is not in the node_modules directory of the project
|
|
59
|
+
* (for example when running tests with vscode extension we'll get
|
|
60
|
+
* '/Users/dylan/.vscode/extensions/vitest.explorer-1.16.0/dist/worker.js'
|
|
61
|
+
*
|
|
62
|
+
* instead of
|
|
63
|
+
* '/Users/joseph/.nvm/versions/node/v22.12.0/bin/node'
|
|
64
|
+
* or
|
|
65
|
+
* '/Users/joseph/github/keycloakify-starter/node_modules/.bin/vite'
|
|
66
|
+
*
|
|
67
|
+
* as the value of process.argv[1]
|
|
68
|
+
*/
|
|
48
69
|
function getNodeModulesBinDirPath() {
|
|
49
70
|
if (cache !== undefined) {
|
|
50
71
|
return cache;
|
|
51
72
|
}
|
|
52
73
|
const binPath = process.argv[1];
|
|
74
|
+
special_case_running_not_from_distribution: {
|
|
75
|
+
if (!binPath.endsWith('.ts')) {
|
|
76
|
+
break special_case_running_not_from_distribution;
|
|
77
|
+
}
|
|
78
|
+
const packageJsonDirPath = (0,_getThisCodebaseRootDirPath__WEBPACK_IMPORTED_MODULE_1__/* .getNearestPackageJsonDirPath */ .x)((0,path__WEBPACK_IMPORTED_MODULE_0__.dirname)(binPath));
|
|
79
|
+
const nodeModulesBinDirPath = (0,path__WEBPACK_IMPORTED_MODULE_0__.join)(packageJsonDirPath, 'node_modules', '.bin');
|
|
80
|
+
return nodeModulesBinDirPath;
|
|
81
|
+
}
|
|
53
82
|
const segments = ['.bin'];
|
|
54
83
|
let foundNodeModules = false;
|
|
55
84
|
for (const segment of binPath.split(path__WEBPACK_IMPORTED_MODULE_0__.sep).reverse()) {
|
|
@@ -65,42 +94,15 @@ function getNodeModulesBinDirPath() {
|
|
|
65
94
|
}
|
|
66
95
|
segments.unshift(segment);
|
|
67
96
|
}
|
|
97
|
+
if (!foundNodeModules) {
|
|
98
|
+
throw new Error(`Could not find node_modules in path ${binPath}`);
|
|
99
|
+
}
|
|
68
100
|
const nodeModulesBinDirPath = segments.join(path__WEBPACK_IMPORTED_MODULE_0__.sep);
|
|
69
101
|
cache = nodeModulesBinDirPath;
|
|
70
102
|
return nodeModulesBinDirPath;
|
|
71
103
|
}
|
|
72
104
|
|
|
73
105
|
|
|
74
|
-
/***/ }),
|
|
75
|
-
|
|
76
|
-
/***/ 704:
|
|
77
|
-
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
78
|
-
|
|
79
|
-
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
80
|
-
/* harmony export */ M: () => (/* binding */ readThisNpmPackageVersion)
|
|
81
|
-
/* harmony export */ });
|
|
82
|
-
/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(896);
|
|
83
|
-
/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
|
|
84
|
-
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(928);
|
|
85
|
-
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
|
|
86
|
-
/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(966);
|
|
87
|
-
/* harmony import */ var _getThisCodebaseRootDirPath__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(697);
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
let cache = undefined;
|
|
93
|
-
function readThisNpmPackageVersion() {
|
|
94
|
-
if (cache !== undefined) {
|
|
95
|
-
return cache;
|
|
96
|
-
}
|
|
97
|
-
const version = JSON.parse(fs__WEBPACK_IMPORTED_MODULE_0__.readFileSync((0,path__WEBPACK_IMPORTED_MODULE_1__.join)((0,_getThisCodebaseRootDirPath__WEBPACK_IMPORTED_MODULE_2__/* .getThisCodebaseRootDirPath */ .J)(), 'package.json')).toString('utf8'))['version'];
|
|
98
|
-
(0,tsafe_assert__WEBPACK_IMPORTED_MODULE_3__/* .assert */ .v)(typeof version === 'string');
|
|
99
|
-
cache = version;
|
|
100
|
-
return version;
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
|
|
104
106
|
/***/ }),
|
|
105
107
|
|
|
106
108
|
/***/ 479:
|
|
@@ -111,19 +113,17 @@ function readThisNpmPackageVersion() {
|
|
|
111
113
|
/* harmony export */ L: () => (/* binding */ getIsPrettierAvailable)
|
|
112
114
|
/* harmony export */ });
|
|
113
115
|
/* unused harmony export getPrettier */
|
|
114
|
-
/* harmony import */ var
|
|
115
|
-
/* harmony import */ var
|
|
116
|
-
/* harmony import */ var
|
|
117
|
-
/* harmony import */ var
|
|
118
|
-
/* harmony import */ var
|
|
119
|
-
/* harmony import */ var
|
|
120
|
-
/* harmony import */ var
|
|
121
|
-
/* harmony import */ var
|
|
122
|
-
/* harmony import */ var
|
|
123
|
-
/* harmony import */ var
|
|
124
|
-
/* harmony import */ var
|
|
125
|
-
/* harmony import */ var _nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(399);
|
|
126
|
-
/* harmony import */ var _readThisNpmPackageVersion__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(704);
|
|
116
|
+
/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(276);
|
|
117
|
+
/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(982);
|
|
118
|
+
/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_0__);
|
|
119
|
+
/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(943);
|
|
120
|
+
/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_1__);
|
|
121
|
+
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(928);
|
|
122
|
+
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_2__);
|
|
123
|
+
/* harmony import */ var tsafe_assert__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(966);
|
|
124
|
+
/* harmony import */ var tsafe_id__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(94);
|
|
125
|
+
/* harmony import */ var tsafe_symToStr__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(886);
|
|
126
|
+
/* harmony import */ var _nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(399);
|
|
127
127
|
/* module decorator */ module = __webpack_require__.hmd(module);
|
|
128
128
|
|
|
129
129
|
|
|
@@ -133,59 +133,53 @@ function readThisNpmPackageVersion() {
|
|
|
133
133
|
|
|
134
134
|
|
|
135
135
|
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
getIsPrettierAvailable.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_4__.id)(undefined);
|
|
136
|
+
getIsPrettierAvailable.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_3__.id)(undefined);
|
|
139
137
|
async function getIsPrettierAvailable() {
|
|
140
138
|
var _a;
|
|
141
139
|
if (getIsPrettierAvailable.cache !== undefined) {
|
|
142
140
|
return getIsPrettierAvailable.cache;
|
|
143
141
|
}
|
|
144
|
-
const nodeModulesBinDirPath = (0,
|
|
145
|
-
const prettierBinPath = (0,
|
|
146
|
-
const stats = await
|
|
142
|
+
const nodeModulesBinDirPath = (0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_4__/* .getNodeModulesBinDirPath */ .p)();
|
|
143
|
+
const prettierBinPath = (0,path__WEBPACK_IMPORTED_MODULE_2__.join)(nodeModulesBinDirPath, 'prettier');
|
|
144
|
+
const stats = await fs_promises__WEBPACK_IMPORTED_MODULE_1__.stat(prettierBinPath).catch(() => undefined);
|
|
147
145
|
const isPrettierAvailable = (_a = stats === null || stats === void 0 ? void 0 : stats.isFile()) !== null && _a !== void 0 ? _a : false;
|
|
148
146
|
getIsPrettierAvailable.cache = isPrettierAvailable;
|
|
149
147
|
return isPrettierAvailable;
|
|
150
148
|
}
|
|
151
|
-
getPrettier.cache = (0,
|
|
149
|
+
getPrettier.cache = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_3__.id)(undefined);
|
|
152
150
|
async function getPrettier() {
|
|
153
|
-
(0,
|
|
151
|
+
(0,tsafe_assert__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(getIsPrettierAvailable());
|
|
154
152
|
if (getPrettier.cache !== undefined) {
|
|
155
153
|
return getPrettier.cache;
|
|
156
154
|
}
|
|
157
|
-
let prettier = (0,
|
|
155
|
+
let prettier = (0,tsafe_id__WEBPACK_IMPORTED_MODULE_3__.id)(undefined);
|
|
158
156
|
import_prettier: {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
if ((0,_readThisNpmPackageVersion__WEBPACK_IMPORTED_MODULE_7__/* .readThisNpmPackageVersion */ .M)().startsWith('0.0.0')) {
|
|
164
|
-
const prettierDirPath = (0,path__WEBPACK_IMPORTED_MODULE_3__.resolve)((0,path__WEBPACK_IMPORTED_MODULE_3__.join)((0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_5__/* .getNodeModulesBinDirPath */ .p)(), '..', 'prettier'));
|
|
165
|
-
const isCJS = true && module.exports;
|
|
166
|
-
if (isCJS) {
|
|
167
|
-
eval(`${(0,tsafe_symToStr__WEBPACK_IMPORTED_MODULE_8__/* .symToStr */ .I)({ prettier })} = require("${prettierDirPath}")`);
|
|
168
|
-
}
|
|
169
|
-
else {
|
|
170
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
171
|
-
prettier = await new Promise((_resolve) => {
|
|
172
|
-
eval(`import("file:///${(0,path__WEBPACK_IMPORTED_MODULE_3__.join)(prettierDirPath, 'index.mjs').replace(/\\/g, '/')}").then(prettier => _resolve(prettier))`);
|
|
173
|
-
});
|
|
174
|
-
}
|
|
175
|
-
(0,tsafe_assert__WEBPACK_IMPORTED_MODULE_6__/* .assert */ .v)(!(0,tsafe_assert__WEBPACK_IMPORTED_MODULE_6__.is)(prettier));
|
|
176
|
-
break import_prettier;
|
|
157
|
+
const prettierDirPath = (0,path__WEBPACK_IMPORTED_MODULE_2__.resolve)((0,path__WEBPACK_IMPORTED_MODULE_2__.join)((0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_4__/* .getNodeModulesBinDirPath */ .p)(), '..', 'prettier'));
|
|
158
|
+
const isCJS = true && module.exports;
|
|
159
|
+
if (isCJS) {
|
|
160
|
+
eval(`${(0,tsafe_symToStr__WEBPACK_IMPORTED_MODULE_6__/* .symToStr */ .I)({ prettier })} = require("${prettierDirPath}")`);
|
|
177
161
|
}
|
|
178
|
-
|
|
162
|
+
else {
|
|
163
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
164
|
+
prettier = await new Promise((_resolve) => {
|
|
165
|
+
eval(`import("file:///${(0,path__WEBPACK_IMPORTED_MODULE_2__.join)(prettierDirPath, 'index.mjs').replace(/\\/g, '/')}").then(prettier => _resolve(prettier))`);
|
|
166
|
+
});
|
|
167
|
+
}
|
|
168
|
+
(0,tsafe_assert__WEBPACK_IMPORTED_MODULE_5__/* .assert */ .v)(!(0,tsafe_assert__WEBPACK_IMPORTED_MODULE_5__.is)(prettier));
|
|
169
|
+
break import_prettier;
|
|
179
170
|
}
|
|
180
171
|
const configHash = await (async () => {
|
|
181
|
-
const configFilePath = await prettier.resolveConfigFile((0,
|
|
172
|
+
const configFilePath = await prettier.resolveConfigFile((0,path__WEBPACK_IMPORTED_MODULE_2__.join)((0,_nodeModulesBinDirPath__WEBPACK_IMPORTED_MODULE_4__/* .getNodeModulesBinDirPath */ .p)(), '..', '..'));
|
|
182
173
|
if (configFilePath === null) {
|
|
183
174
|
return '';
|
|
184
175
|
}
|
|
185
|
-
const data = await
|
|
186
|
-
return
|
|
176
|
+
const data = await fs_promises__WEBPACK_IMPORTED_MODULE_1__.readFile(configFilePath);
|
|
177
|
+
return crypto__WEBPACK_IMPORTED_MODULE_0__.createHash('sha256').update(data).digest('hex');
|
|
187
178
|
})();
|
|
188
|
-
const prettierAndConfig = {
|
|
179
|
+
const prettierAndConfig = {
|
|
180
|
+
prettier,
|
|
181
|
+
configHash,
|
|
182
|
+
};
|
|
189
183
|
getPrettier.cache = prettierAndConfig;
|
|
190
184
|
return prettierAndConfig;
|
|
191
185
|
}
|
|
@@ -194,24 +188,26 @@ async function runPrettier(params) {
|
|
|
194
188
|
let formattedSourceCode;
|
|
195
189
|
try {
|
|
196
190
|
const { prettier } = await getPrettier();
|
|
197
|
-
const { ignored, inferredParser } = await prettier.getFileInfo(filePath, {
|
|
198
|
-
|
|
191
|
+
const { ignored, inferredParser } = await prettier.getFileInfo(filePath, {
|
|
192
|
+
resolveConfig: true,
|
|
193
|
+
});
|
|
194
|
+
if (ignored || inferredParser === null) {
|
|
199
195
|
return sourceCode;
|
|
200
196
|
}
|
|
201
197
|
const config = await prettier.resolveConfig(filePath);
|
|
202
|
-
formattedSourceCode = await prettier.format(sourceCode, Object.assign(Object.assign({}, config), { filePath, parser: inferredParser
|
|
198
|
+
formattedSourceCode = await prettier.format(typeof sourceCode === 'string' ? sourceCode : sourceCode.toString('utf8'), Object.assign(Object.assign({}, config), { filePath, parser: inferredParser }));
|
|
203
199
|
}
|
|
204
200
|
catch (error) {
|
|
205
|
-
console.log(
|
|
201
|
+
console.log(chalk__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Ay.red(`You probably need to upgrade the version of prettier in your project`));
|
|
206
202
|
throw error;
|
|
207
203
|
}
|
|
208
|
-
return formattedSourceCode;
|
|
204
|
+
return typeof sourceCode === 'string' ? formattedSourceCode : Buffer.from(formattedSourceCode, 'utf8');
|
|
209
205
|
}
|
|
210
206
|
|
|
211
207
|
|
|
212
208
|
/***/ }),
|
|
213
209
|
|
|
214
|
-
/***/
|
|
210
|
+
/***/ 200:
|
|
215
211
|
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
216
212
|
|
|
217
213
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|