fix build
This commit is contained in:
parent
11bf4d4b32
commit
5e256b8bce
|
@ -1,21 +1,21 @@
|
||||||
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
||||||
include ':capacitor-android'
|
include ':capacitor-android'
|
||||||
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@4.7.3_@capacitor+core@4.7.3/node_modules/@capacitor/android/capacitor')
|
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/android/capacitor')
|
||||||
|
|
||||||
include ':capacitor-app'
|
include ':capacitor-app'
|
||||||
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@4.1.1_@capacitor+core@4.7.3/node_modules/@capacitor/app/android')
|
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/app/android')
|
||||||
|
|
||||||
include ':capacitor-camera'
|
include ':capacitor-camera'
|
||||||
project(':capacitor-camera').projectDir = new File('../../../node_modules/.pnpm/@capacitor+camera@4.1.4_@capacitor+core@4.7.3/node_modules/@capacitor/camera/android')
|
project(':capacitor-camera').projectDir = new File('../../../node_modules/.pnpm/@capacitor+camera@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/camera/android')
|
||||||
|
|
||||||
include ':capacitor-device'
|
include ':capacitor-device'
|
||||||
project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@4.1.0_@capacitor+core@4.7.3/node_modules/@capacitor/device/android')
|
project(':capacitor-device').projectDir = new File('../../../node_modules/.pnpm/@capacitor+device@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/device/android')
|
||||||
|
|
||||||
include ':capacitor-preferences'
|
include ':capacitor-preferences'
|
||||||
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@4.0.2_@capacitor+core@4.7.3/node_modules/@capacitor/preferences/android')
|
project(':capacitor-preferences').projectDir = new File('../../../node_modules/.pnpm/@capacitor+preferences@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/preferences/android')
|
||||||
|
|
||||||
include ':capacitor-push-notifications'
|
include ':capacitor-push-notifications'
|
||||||
project(':capacitor-push-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+push-notifications@4.1.2_@capacitor+core@4.7.3/node_modules/@capacitor/push-notifications/android')
|
project(':capacitor-push-notifications').projectDir = new File('../../../node_modules/.pnpm/@capacitor+push-notifications@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/push-notifications/android')
|
||||||
|
|
||||||
include ':capacitor-status-bar'
|
include ':capacitor-status-bar'
|
||||||
project(':capacitor-status-bar').projectDir = new File('../../../node_modules/.pnpm/@capacitor+status-bar@4.1.1_@capacitor+core@4.7.3/node_modules/@capacitor/status-bar/android')
|
project(':capacitor-status-bar').projectDir = new File('../../../node_modules/.pnpm/@capacitor+status-bar@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/status-bar/android')
|
||||||
|
|
|
@ -9,14 +9,14 @@ use_frameworks!
|
||||||
install! 'cocoapods', :disable_input_output_paths => true
|
install! 'cocoapods', :disable_input_output_paths => true
|
||||||
|
|
||||||
def capacitor_pods
|
def capacitor_pods
|
||||||
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@4.7.3_@capacitor+core@4.7.3/node_modules/@capacitor/ios'
|
pod 'Capacitor', :path => '../../../../node_modules/.pnpm/@capacitor+ios@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/ios'
|
||||||
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@4.7.3_@capacitor+core@4.7.3/node_modules/@capacitor/ios'
|
pod 'CapacitorCordova', :path => '../../../../node_modules/.pnpm/@capacitor+ios@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/ios'
|
||||||
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@4.1.1_@capacitor+core@4.7.3/node_modules/@capacitor/app'
|
pod 'CapacitorApp', :path => '../../../../node_modules/.pnpm/@capacitor+app@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/app'
|
||||||
pod 'CapacitorCamera', :path => '../../../../node_modules/.pnpm/@capacitor+camera@4.1.4_@capacitor+core@4.7.3/node_modules/@capacitor/camera'
|
pod 'CapacitorCamera', :path => '../../../../node_modules/.pnpm/@capacitor+camera@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/camera'
|
||||||
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@4.1.0_@capacitor+core@4.7.3/node_modules/@capacitor/device'
|
pod 'CapacitorDevice', :path => '../../../../node_modules/.pnpm/@capacitor+device@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/device'
|
||||||
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@4.0.2_@capacitor+core@4.7.3/node_modules/@capacitor/preferences'
|
pod 'CapacitorPreferences', :path => '../../../../node_modules/.pnpm/@capacitor+preferences@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/preferences'
|
||||||
pod 'CapacitorPushNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+push-notifications@4.1.2_@capacitor+core@4.7.3/node_modules/@capacitor/push-notifications'
|
pod 'CapacitorPushNotifications', :path => '../../../../node_modules/.pnpm/@capacitor+push-notifications@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/push-notifications'
|
||||||
pod 'CapacitorStatusBar', :path => '../../../../node_modules/.pnpm/@capacitor+status-bar@4.1.1_@capacitor+core@4.7.3/node_modules/@capacitor/status-bar'
|
pod 'CapacitorStatusBar', :path => '../../../../node_modules/.pnpm/@capacitor+status-bar@4.0.0_@capacitor+core@4.0.0/node_modules/@capacitor/status-bar'
|
||||||
pod 'CordovaPluginsStatic', :path => '../capacitor-cordova-ios-plugins'
|
pod 'CordovaPluginsStatic', :path => '../capacitor-cordova-ios-plugins'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -410,19 +410,7 @@ function queryKey() {
|
||||||
"g-recaptcha-response": reCaptchaResponse,
|
"g-recaptcha-response": reCaptchaResponse,
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.then((res) => {
|
.then(res => {
|
||||||
emit("login", res);
|
|
||||||
return onLogin(res);
|
|
||||||
})
|
|
||||||
.catch((err) => {
|
|
||||||
if (err === null) return;
|
|
||||||
os.alert({
|
|
||||||
type: "error",
|
|
||||||
text: i18n.ts.signinFailed,
|
|
||||||
});
|
|
||||||
signing = false;
|
|
||||||
});
|
|
||||||
}).then(res => {
|
|
||||||
// #v-ifdef VITE_CAPACITOR
|
// #v-ifdef VITE_CAPACITOR
|
||||||
emit("login", { ...res, instance: instanceUrl });
|
emit("login", { ...res, instance: instanceUrl });
|
||||||
return onLogin({ ...res, instance: instanceUrl });
|
return onLogin({ ...res, instance: instanceUrl });
|
||||||
|
|
|
@ -93,6 +93,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
|
|
|
@ -34,24 +34,25 @@ export default defineConfig(({ command, mode }) => {
|
||||||
"utf-8",
|
"utf-8",
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
const plugins = [
|
||||||
base: "/assets/",
|
|
||||||
|
|
||||||
plugins: [
|
|
||||||
ConditionalCompile(),
|
ConditionalCompile(),
|
||||||
pluginVue({
|
pluginVue({
|
||||||
reactivityTransform: true,
|
reactivityTransform: true,
|
||||||
}),
|
}),
|
||||||
pluginJson5(),
|
pluginJson5(),
|
||||||
tsconfigPaths(),
|
tsconfigPaths()
|
||||||
// #v-ifdef VITE_CAPACITOR
|
];
|
||||||
// ...
|
|
||||||
// #v-else
|
if (!process.env.VITE_CAPACITOR) {
|
||||||
viteCompression({
|
plugins.push(viteCompression({
|
||||||
algorithm: "brotliCompress",
|
algorithm: "brotliCompress",
|
||||||
}),
|
}));
|
||||||
// #v-endif
|
}
|
||||||
],
|
|
||||||
|
return {
|
||||||
|
base: "/assets/",
|
||||||
|
|
||||||
|
plugins,
|
||||||
|
|
||||||
resolve: {
|
resolve: {
|
||||||
extensions,
|
extensions,
|
||||||
|
|
Loading…
Reference in New Issue