@jetshop/template-trend 6.3.8-alpha.33 → 6.3.8
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/index.html +2 -1
- package/package.json +6 -9
- package/src/components/Cart/CartItem.js +1 -1
- package/src/components/CategoryPage/CategoryHeader.js +1 -1
- package/src/components/CategoryPage/ProductCard.js +1 -1
- package/src/components/MyPages/Orders/OrderDetail/ListDetail.js +1 -1
- package/src/components/ProductPage/AddToCart/ProductToast.js +1 -1
- package/src/components/ProductPage/PackageProduct/PackageProductItem.js +1 -1
- package/src/components/SearchPage/CategoryList.js +1 -1
- package/src/components/StartPage/Content/StartPageCampaign.js +1 -1
- package/src/components/StartPage/Content/StartPageCategories.js +1 -1
- package/src/components/StartPage/Content/StartPageHero.js +1 -1
- package/src/shop.config.js +12 -0
- package/src/shop.config.js.rej +5 -0
- package/translations/default.json +7 -7
- package/deploy.sh +0 -53
- package/src/server-worker.js +0 -16
- package/wrangler.jsonc +0 -23
package/index.html
CHANGED
package/package.json
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jetshop/template-trend",
|
|
3
|
-
"version": "6.3.8
|
|
3
|
+
"version": "6.3.8",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"scripts": {
|
|
6
|
-
"preview": "wrangler dev build/worker/worker.js --no-bundle",
|
|
7
|
-
"deploy": "wrangler deploy --no-bundle",
|
|
8
6
|
"build": "react-scripts build",
|
|
9
7
|
"build:analyze": "ANALYZE=web yarn build",
|
|
10
8
|
"cypress": "cypress run",
|
|
@@ -45,11 +43,11 @@
|
|
|
45
43
|
]
|
|
46
44
|
},
|
|
47
45
|
"dependencies": {
|
|
48
|
-
"@jetshop/core": "^6.3.8
|
|
46
|
+
"@jetshop/core": "^6.3.8",
|
|
49
47
|
"@jetshop/flight-shortcodes": "^2.0.10",
|
|
50
|
-
"@jetshop/intl": "^6.3.8
|
|
51
|
-
"@jetshop/react-scripts": "^6.3.8
|
|
52
|
-
"@jetshop/ui": "^6.3.8
|
|
48
|
+
"@jetshop/intl": "^6.3.8",
|
|
49
|
+
"@jetshop/react-scripts": "^6.3.8",
|
|
50
|
+
"@jetshop/ui": "^6.3.8",
|
|
53
51
|
"@react-google-maps/api": "~2.18.1",
|
|
54
52
|
"prop-types": "^15.6.2",
|
|
55
53
|
"react": "^18",
|
|
@@ -68,12 +66,11 @@
|
|
|
68
66
|
"lint-staged": "^8.1.5",
|
|
69
67
|
"prettier": "^2.3.2",
|
|
70
68
|
"typescript": "^4.8.3",
|
|
71
|
-
"wrangler": "^4.51.0",
|
|
72
69
|
"yargs": "16.0.3"
|
|
73
70
|
},
|
|
74
71
|
"resolutions": {
|
|
75
72
|
"format-message-estree-util": "npm:@jetshop/format-message-estree-util",
|
|
76
73
|
"**/@babel/helper-module-transforms": "7.22.5"
|
|
77
74
|
},
|
|
78
|
-
"gitHead": "
|
|
75
|
+
"gitHead": "74e5c206d33c37e973bb0ca8c650a1c22a7bb0ad"
|
|
79
76
|
}
|
|
@@ -6,7 +6,7 @@ import useDecrementQuantity from '@jetshop/core/components/Mutation/useDecrement
|
|
|
6
6
|
import useIncrementQuantity from '@jetshop/core/components/Mutation/useIncrementQuantity';
|
|
7
7
|
import useRemoveFromCart from '@jetshop/core/components/Mutation/useRemoveFromCart';
|
|
8
8
|
import getCartItemVariant from '@jetshop/core/helpers/getCartItemVariant';
|
|
9
|
-
import Image from '@jetshop/ui/
|
|
9
|
+
import Image from '@jetshop/ui/Image';
|
|
10
10
|
import { Price } from '@jetshop/ui/Price';
|
|
11
11
|
import { ReactComponent as CrossIcon } from '@jetshop/ui/svg/Cross.svg';
|
|
12
12
|
import { FlyoutTrigger } from '@jetshop/ui/Modal/Flyout';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { default as Breadcrumbs } from '@jetshop/ui/Breadcrumbs';
|
|
2
|
-
import Image from '@jetshop/ui/
|
|
2
|
+
import Image from '@jetshop/ui/Image/Image';
|
|
3
3
|
import React from 'react';
|
|
4
4
|
import { styled } from 'linaria/react';
|
|
5
5
|
import { css } from 'linaria';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import t from '@jetshop/intl';
|
|
2
|
-
import Image, { transparentDataImg } from '@jetshop/ui/
|
|
2
|
+
import Image, { transparentDataImg } from '@jetshop/ui/Image/Image';
|
|
3
3
|
import { Price } from '@jetshop/ui/Price';
|
|
4
4
|
import ProductLink from '@jetshop/ui/ProductLink';
|
|
5
5
|
import Badges from '@jetshop/ui/ProductList/Badges';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import useOrderDetailQuery from '@jetshop/core/hooks/useOrderDetailQuery';
|
|
2
|
-
import Image from '@jetshop/ui/
|
|
2
|
+
import Image from '@jetshop/ui/Image';
|
|
3
3
|
import React from 'react';
|
|
4
4
|
import { css, cx } from 'linaria';
|
|
5
5
|
import { Price } from '@jetshop/ui/Price';
|
|
@@ -6,7 +6,7 @@ import { trackCartCheckoutEvent } from '@jetshop/core/analytics/tracking';
|
|
|
6
6
|
import ChannelContext from '@jetshop/core/components/ChannelContext';
|
|
7
7
|
import CartProvider from '@jetshop/core/components/Query/CartProvider';
|
|
8
8
|
import t from '@jetshop/intl';
|
|
9
|
-
import Image from '@jetshop/ui/
|
|
9
|
+
import Image from '@jetshop/ui/Image/Image';
|
|
10
10
|
import { Price } from '@jetshop/ui/Price';
|
|
11
11
|
import useProductToast from './useProductToast';
|
|
12
12
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { usePackageProductItem } from '@jetshop/core/hooks/PackageProducts';
|
|
2
|
-
import Image from '@jetshop/ui/
|
|
2
|
+
import Image from '@jetshop/ui/Image';
|
|
3
3
|
import { Price } from '@jetshop/ui/Price';
|
|
4
4
|
import ProductLink from '@jetshop/ui/ProductLink';
|
|
5
5
|
import React from 'react';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { styled } from 'linaria/react';
|
|
3
3
|
import CategoryLink from '@jetshop/ui/CategoryLink';
|
|
4
|
-
import Image from '@jetshop/ui/
|
|
4
|
+
import Image from '@jetshop/ui/Image';
|
|
5
5
|
import { theme } from '../Theme';
|
|
6
6
|
import MaxWidth from '../Layout/MaxWidth';
|
|
7
7
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { styled } from 'linaria/react';
|
|
3
3
|
import MaxWidth from '../../Layout/MaxWidth';
|
|
4
|
-
import Image from '@jetshop/ui/
|
|
4
|
+
import Image from '@jetshop/ui/Image/Image';
|
|
5
5
|
import { TrendLink } from '../../ui/Button';
|
|
6
6
|
import { Above } from '@jetshop/ui/Breakpoints';
|
|
7
7
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { styled } from 'linaria/react';
|
|
3
|
-
import Image from '@jetshop/ui/
|
|
3
|
+
import Image from '@jetshop/ui/Image/Image';
|
|
4
4
|
import CategoryLink from '@jetshop/ui/CategoryLink';
|
|
5
5
|
import { theme } from '../../Theme';
|
|
6
6
|
import Row from './Row';
|
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import { styled } from 'linaria/react';
|
|
3
3
|
import { css } from 'linaria';
|
|
4
4
|
import MaxWidth from '../../Layout/MaxWidth';
|
|
5
|
-
import Image from '@jetshop/ui/
|
|
5
|
+
import Image from '@jetshop/ui/Image/Image';
|
|
6
6
|
import { TrendLink } from '../../ui/Button';
|
|
7
7
|
|
|
8
8
|
import { theme } from '../../Theme';
|
package/src/shop.config.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as translations from '../translations';
|
|
2
2
|
import channelsQuery from './ChannelsQuery.gql';
|
|
3
|
+
import homeCategoriesQuery from './components/Layout/Header/HomeCategoriesQuery.gql';
|
|
3
4
|
import routeQuery from './components/RouteQuery.gql';
|
|
4
5
|
import {
|
|
5
6
|
LoadableStandardCategoryPage,
|
|
@@ -22,9 +23,20 @@ const config = {
|
|
|
22
23
|
engineApiKey: process.env.ENGINE_API_KEY || '',
|
|
23
24
|
enableGateway: false,
|
|
24
25
|
channelsQuery,
|
|
26
|
+
persistedQueries: [
|
|
27
|
+
{
|
|
28
|
+
query: homeCategoriesQuery,
|
|
29
|
+
variables: { levels: 1 }
|
|
30
|
+
}
|
|
31
|
+
]
|
|
25
32
|
},
|
|
26
33
|
additionalGtagTrackingIds: [],
|
|
27
34
|
relewareEnabled: true,
|
|
35
|
+
sentry: {
|
|
36
|
+
clientDSN: process.env.FLIGHT_SENTRY_CLIENT_DSN,
|
|
37
|
+
serverDSN: process.env.FLIGHT_SENTRY_SERVER_DSN,
|
|
38
|
+
ignoreErrors: []
|
|
39
|
+
},
|
|
28
40
|
intl: {
|
|
29
41
|
translations,
|
|
30
42
|
defaultLocale: 'en',
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
diff a/packages/template-trend/src/shop.config.js b/packages/template-trend/src/shop.config.js (rejected hunks)
|
|
2
|
+
@@ -73 +73,2 @@ const config = {
|
|
3
|
+
- useIndefinitelySavedCart: process.env.REACT_APP_USE_INDEFINITELY_SAVED_CART || true,
|
|
4
|
+
+ useIndefinitelySavedCart:
|
|
5
|
+
+ process.env.REACT_APP_USE_INDEFINITELY_SAVED_CART || true,
|
|
@@ -104,6 +104,9 @@
|
|
|
104
104
|
"currency_d6b3d5f6": {
|
|
105
105
|
"message": "Currency"
|
|
106
106
|
},
|
|
107
|
+
"current_price_3f582d1e": {
|
|
108
|
+
"message": "Current price"
|
|
109
|
+
},
|
|
107
110
|
"customercommentname_is_required_f5c2f377": {
|
|
108
111
|
"message": "{ customerCommentName } is required"
|
|
109
112
|
},
|
|
@@ -476,6 +479,9 @@
|
|
|
476
479
|
"prev_f82cbc48": {
|
|
477
480
|
"message": "Prev"
|
|
478
481
|
},
|
|
482
|
+
"previous_price_3ea1215f": {
|
|
483
|
+
"message": "Previous price"
|
|
484
|
+
},
|
|
479
485
|
"price_ffd8b80": {
|
|
480
486
|
"message": "Price"
|
|
481
487
|
},
|
|
@@ -799,11 +805,5 @@
|
|
|
799
805
|
},
|
|
800
806
|
"z_to_a_75ce9568": {
|
|
801
807
|
"message": "Z to A"
|
|
802
|
-
},
|
|
803
|
-
"current_price_3f582d1e": {
|
|
804
|
-
"message": "Current price"
|
|
805
|
-
},
|
|
806
|
-
"previous_price_3ea1215f": {
|
|
807
|
-
"message": "Previous price"
|
|
808
808
|
}
|
|
809
|
-
}
|
|
809
|
+
}
|
package/deploy.sh
DELETED
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
#!/bin/bash
|
|
2
|
-
|
|
3
|
-
# Deployment script for Cloudflare Workers + R2
|
|
4
|
-
# Usage: ./deploy.sh [staging|production]
|
|
5
|
-
|
|
6
|
-
set -e
|
|
7
|
-
|
|
8
|
-
ENV=${1:-staging}
|
|
9
|
-
|
|
10
|
-
echo "🚀 Deploying to $ENV environment..."
|
|
11
|
-
|
|
12
|
-
# Step 1: Build the application
|
|
13
|
-
echo "📦 Building application..."
|
|
14
|
-
yarn build
|
|
15
|
-
|
|
16
|
-
# Step 2: Deploy assets to R2
|
|
17
|
-
echo "📤 Uploading assets to R2..."
|
|
18
|
-
|
|
19
|
-
BUCKET_NAME="core-workout-assets-$ENV"
|
|
20
|
-
|
|
21
|
-
# Upload static directory (JS, CSS, fonts, images)
|
|
22
|
-
echo " ↳ Uploading static files..."
|
|
23
|
-
wrangler r2 object put "$BUCKET_NAME/static" \
|
|
24
|
-
--file=build/client/static \
|
|
25
|
-
--recursive \
|
|
26
|
-
--content-type-detect
|
|
27
|
-
|
|
28
|
-
# Upload root files
|
|
29
|
-
echo " ↳ Uploading manifest and favicon..."
|
|
30
|
-
wrangler r2 object put "$BUCKET_NAME/manifest.json" \
|
|
31
|
-
--file=build/client/manifest.json \
|
|
32
|
-
--content-type="application/json"
|
|
33
|
-
|
|
34
|
-
wrangler r2 object put "$BUCKET_NAME/favicon.ico" \
|
|
35
|
-
--file=build/client/favicon.ico \
|
|
36
|
-
--content-type="image/x-icon"
|
|
37
|
-
|
|
38
|
-
if [ -f "build/client/robots.txt" ]; then
|
|
39
|
-
wrangler r2 object put "$BUCKET_NAME/robots.txt" \
|
|
40
|
-
--file=build/client/robots.txt \
|
|
41
|
-
--content-type="text/plain"
|
|
42
|
-
fi
|
|
43
|
-
|
|
44
|
-
# Step 3: Deploy worker
|
|
45
|
-
echo "🌐 Deploying worker..."
|
|
46
|
-
wrangler deploy --env "$ENV"
|
|
47
|
-
|
|
48
|
-
echo "✅ Deployment complete!"
|
|
49
|
-
echo ""
|
|
50
|
-
echo "Worker URL: https://core-workout-worker-$ENV.your-subdomain.workers.dev"
|
|
51
|
-
echo ""
|
|
52
|
-
echo "To set up custom domain, run:"
|
|
53
|
-
echo " wrangler domains add your-domain.com --env $ENV"
|
package/src/server-worker.js
DELETED
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
import { createWorkerApp } from '@jetshop/core/boot/worker';
|
|
3
|
-
import Shop from './components/Shop';
|
|
4
|
-
import config from './shop.config';
|
|
5
|
-
|
|
6
|
-
// Initialize the worker handler once (async)
|
|
7
|
-
const handlerPromise = createWorkerApp(<Shop />, config);
|
|
8
|
-
|
|
9
|
-
// Export default handler for Cloudflare Workers
|
|
10
|
-
// eslint-disable-next-line import/no-anonymous-default-export
|
|
11
|
-
export default {
|
|
12
|
-
async fetch(request, env, ctx) {
|
|
13
|
-
const handler = await handlerPromise;
|
|
14
|
-
return handler(request, env, ctx);
|
|
15
|
-
}
|
|
16
|
-
};
|
package/wrangler.jsonc
DELETED
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"$schema": "../../node_modules/wrangler/config-schema.json",
|
|
3
|
-
"name": "core-workout",
|
|
4
|
-
"main": "build/worker/worker.js",
|
|
5
|
-
"compatibility_date": "2024-09-23",
|
|
6
|
-
"compatibility_flags": ["nodejs_compat"],
|
|
7
|
-
"observability": {
|
|
8
|
-
"enabled": true
|
|
9
|
-
},
|
|
10
|
-
"upload_source_maps": false,
|
|
11
|
-
"assets": {
|
|
12
|
-
"binding": "ASSETS",
|
|
13
|
-
"directory": "./build/client"
|
|
14
|
-
},
|
|
15
|
-
"build": {
|
|
16
|
-
"command": "yarn build --worker",
|
|
17
|
-
"cwd": ".",
|
|
18
|
-
"watch_dir": "src"
|
|
19
|
-
},
|
|
20
|
-
"vars": {
|
|
21
|
-
"REACT_APP_SHOP_ID": "scorett",
|
|
22
|
-
}
|
|
23
|
-
}
|