denwa-web-shared 1.0.13 → 1.0.14

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.
@@ -154,19 +154,23 @@ const prepareLocalMetaData = ({
154
154
  alternates.canonical = `https://${correctHost}${canonical}`;
155
155
  }
156
156
  if (lang) {
157
+ console.log(lang);
157
158
  const langs = lang.locales.filter((item) => item !== lang.locale);
158
159
  const languages = {};
159
160
  langs.forEach((item) => {
160
- let url2 = `https://${correctHost}`;
161
+ let url2 = `https://${correctHost}/${item}`;
161
162
  if (lang.city) {
162
163
  url2 += `/${lang.city}`;
163
164
  }
164
165
  url2 += lang.route[0] === "/" ? lang.route : `/${lang.route}`;
165
- languages[item] = item === lang.defaultLocale ? url2 : `/${item}${url2}`;
166
+ languages[item] = url2;
166
167
  });
167
- let url = "";
168
+ let url = ``;
169
+ if (lang.locale !== lang.defaultLocale) {
170
+ url += `/${lang.locale}`;
171
+ }
168
172
  if (lang.city) {
169
- url = `/${lang.city}`;
173
+ url += `/${lang.city}`;
170
174
  }
171
175
  url += lang.route[0] === "/" ? lang.route : `/${lang.route}`;
172
176
  alternates.canonical = `https://${correctHost}${url}`;
@@ -152,19 +152,23 @@ const prepareLocalMetaData = ({
152
152
  alternates.canonical = `https://${correctHost}${canonical}`;
153
153
  }
154
154
  if (lang) {
155
+ console.log(lang);
155
156
  const langs = lang.locales.filter((item) => item !== lang.locale);
156
157
  const languages = {};
157
158
  langs.forEach((item) => {
158
- let url2 = `https://${correctHost}`;
159
+ let url2 = `https://${correctHost}/${item}`;
159
160
  if (lang.city) {
160
161
  url2 += `/${lang.city}`;
161
162
  }
162
163
  url2 += lang.route[0] === "/" ? lang.route : `/${lang.route}`;
163
- languages[item] = item === lang.defaultLocale ? url2 : `/${item}${url2}`;
164
+ languages[item] = url2;
164
165
  });
165
- let url = "";
166
+ let url = ``;
167
+ if (lang.locale !== lang.defaultLocale) {
168
+ url += `/${lang.locale}`;
169
+ }
166
170
  if (lang.city) {
167
- url = `/${lang.city}`;
171
+ url += `/${lang.city}`;
168
172
  }
169
173
  url += lang.route[0] === "/" ? lang.route : `/${lang.route}`;
170
174
  alternates.canonical = `https://${correctHost}${url}`;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "denwa-web-shared",
3
3
  "private": false,
4
- "version": "1.0.13",
4
+ "version": "1.0.14",
5
5
  "type": "module",
6
6
  "author": "Denwa",
7
7
  "main": "dist/denwa-web-shared.cjs.js",