diff --git a/assets/styles/components.scss b/assets/styles/components.scss index 73bc30071..881557afe 100644 --- a/assets/styles/components.scss +++ b/assets/styles/components.scss @@ -435,12 +435,6 @@ margin-bottom: var(--spacing-card-md); } } - - //> .label:first-child :where(> :first-child, .label__title), - //> label:first-child :where(> :first-child, .label__title), - //> .adjacent-input:first-child :where(> :first-child, .label__title) { - // margin-block-start: 0; - //} } .universal-card { diff --git a/helpers/package.js b/helpers/package.js index 850205667..dc26cd888 100644 --- a/helpers/package.js +++ b/helpers/package.js @@ -137,7 +137,9 @@ export const createDataPackVersion = async function ( primaryZipReader.file('quilt.mod.json', JSON.stringify(quiltModJson)) } if (loaders.includes('forge')) { - primaryZipReader.file('META-INF/mods.toml', TOML.stringify(forgeModsToml)) + console.log(forgeModsToml) + console.log(TOML.stringify(forgeModsToml, { newline: '\n' })) + primaryZipReader.file('META-INF/mods.toml', TOML.stringify(forgeModsToml, { newline: '\n' })) } if (!newForge && loaders.includes('forge')) { diff --git a/nuxt.config.js b/nuxt.config.js index 19832531c..0dce86996 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -256,9 +256,6 @@ export default defineNuxtConfig({ children: [], }) }, - 'app:created'() { - console.log('beforeeeee') - }, }, runtimeConfig: { apiBaseUrl: process.env.BASE_URL ?? getApiUrl(), diff --git a/pages/[type]/[id]/version/[version].vue b/pages/[type]/[id]/version/[version].vue index b78f07f19..1bc68078c 100644 --- a/pages/[type]/[id]/version/[version].vue +++ b/pages/[type]/[id]/version/[version].vue @@ -1123,19 +1123,7 @@ export default defineNuxtComponent({ }) } - const [versions, featuredVersions, dependencies] = await Promise.all([ - useBaseFetch(`project/${this.version.project_id}/version`, this.$defaultHeaders()), - useBaseFetch( - `project/${this.version.project_id}/version?featured=true`, - this.$defaultHeaders() - ), - useBaseFetch(`project/${this.version.project_id}/dependencies`, this.$defaultHeaders()), - ]) - - const newEditedVersions = this.$computeVersions(versions, this.members) - this.$emit('update:versions', newEditedVersions) - this.$emit('update:featuredVersions', this.$computeVersions(featuredVersions, this.members)) - this.$emit('update:dependencies', dependencies) + const newEditedVersions = await this.resetProjectVersions() await this.$router.replace( `/${this.project.project_type}/${ @@ -1240,19 +1228,7 @@ export default defineNuxtComponent({ }, }) - const [versions, featuredVersions, dependencies] = await Promise.all([ - useBaseFetch(`project/${this.version.project_id}/version`, this.$defaultHeaders()), - useBaseFetch( - `project/${this.version.project_id}/version?featured=true`, - this.$defaultHeaders() - ), - useBaseFetch(`project/${this.version.project_id}/dependencies`, this.$defaultHeaders()), - ]) - - const newCreatedVersions = this.$computeVersions(versions, this.members) - this.$emit('update:versions', newCreatedVersions) - this.$emit('update:featuredVersions', this.$computeVersions(featuredVersions, this.members)) - this.$emit('update:dependencies', dependencies) + await this.resetProjectVersions() await this.$router.push( `/${this.project.project_type}/${ @@ -1268,6 +1244,7 @@ export default defineNuxtComponent({ ...this.$defaultHeaders(), }) + await this.resetProjectVersions() await this.$router.replace(`/${this.project.project_type}/${this.project.id}/versions`) stopLoading() }, @@ -1323,6 +1300,23 @@ export default defineNuxtComponent({ stopLoading() this.shouldPreventActions = false }, + async resetProjectVersions() { + const [versions, featuredVersions, dependencies] = await Promise.all([ + useBaseFetch(`project/${this.version.project_id}/version`, this.$defaultHeaders()), + useBaseFetch( + `project/${this.version.project_id}/version?featured=true`, + this.$defaultHeaders() + ), + useBaseFetch(`project/${this.version.project_id}/dependencies`, this.$defaultHeaders()), + ]) + + const newCreatedVersions = this.$computeVersions(versions, this.members) + this.$emit('update:versions', newCreatedVersions) + this.$emit('update:featuredVersions', this.$computeVersions(featuredVersions, this.members)) + this.$emit('update:dependencies', dependencies) + + return newCreatedVersions + }, }, })