Add pr number to version

sonic16x · Nov 25, 2024 · 2d282e8 · 2d282e8
1 parent 9b9279f
commit 2d282e8
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -132,8 +132,8 @@ jobs:
 
       - name: Build
         env:
-          DEMO: true
           NODE_ENV: production
+          PR_NUMBER: ${{ env.GITHUB_REF_NAME }}
         run: |
           npm run generate-dictionary
           npx webpack --config webpack.config.prod.js

diff --git a/build-manifest.js b/build-manifest.js
@@ -0,0 +1,8 @@
+const fs = require('fs');
+const manifest = require('./src/manifest.json');
+
+if (process.env.PR_NUMBER && process.env.PR_NUMBER.length) {
+    manifest.name = manifest.short_name =`Test ${process.env.PR_NUMBER}`
+}
+
+fs.writeFileSync('./dist/manifest.json', JSON.stringify(manifest));
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "main": "./dist/worker.js",
   "scripts": {
-    "build": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js",
+    "build": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js && node build-manifest.js",
     "build-storybook": "storybook build",
     "deploy-api": "wrangler deploy ./src/server/index.ts --name api --compatibility-date 2024-11-12",
     "dev": "cross-env NODE_ENV=development webpack serve --config webpack.config.dev.js --progress",

diff --git a/src/components/Pages/About/About.tsx b/src/components/Pages/About/About.tsx
@@ -14,6 +14,7 @@ export const About =
         const worksheetUrl = getTablePublicUrl(tablesData[0].spreadsheetId, tablesData[0].sheetId);
         const email = '[email protected]';
         const source = 'http://steen.free.fr/interslavic';
+        const version = [VERSION, PR_NUMBER].filter((item) => item && item.length).join('-')
 
         return (
             <div className="about-page">
@@ -113,40 +114,8 @@ export const About =
                             </a>
                         </div>
                         <hr/>
-                        <div className="about-page__badges">
-                            {/*<a
-                                href="https://play.google.com/store/apps/details?id=org.interslavicdictionary.twa&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1"
-                                className="badge_google-play"
-                                title="Get it on Google Play"
-                                target="_blank"
-                                rel="noreferrer"
-                            >
-                                <img
-                                    alt="Get it on Google Play"
-                                    width="200px"
-                                    src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"
-                                />
-                            </a>*/}
-
-                            {IS_COM && (
-                                <a
-                                    href="https://discord.com/invite/n3saqm27QW"
-                                    title="Get it on Discord"
-                                    className="badge_discord"
-                                    target="_blank"
-                                    rel="noreferrer"
-                                >
-                                    <img
-                                        alt="Get it on Discord"
-                                        width="165px"
-                                        style={{ padding: "13px 0px" }}
-                                        src="icons/discord-icon-330x102.png"
-                                    />
-                                </a>
-                            )}
-                        </div>
                     </div>
-                    <div className="about-page__release-date">v{VERSION}</div>
+                    <div className="about-page__release-date">v{version}</div>
                 </div>
             </div>
         );

diff --git a/src/custom.d.ts b/src/custom.d.ts
@@ -6,4 +6,5 @@ declare module '*.svg' {
 
 declare const FB: any;
 declare const IS_COM: boolean;
+declare const PR_NUMBER: string;
 declare const Az: any;
diff --git a/static/manifest.json → src/manifest.json b/static/manifest.json → src/manifest.json
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
@@ -80,6 +80,7 @@ module.exports = {
             'process.env.NODE_ENV': JSON.stringify('development'),
             IS_COM: true,
             VERSION: JSON.stringify(require('./package.json').version),
+            PR_NUMBER: '123',
         }),
         new CopyWebpackPlugin({
             patterns: [

diff --git a/webpack.config.prod.js b/webpack.config.prod.js
@@ -89,6 +89,7 @@ module.exports = {
         new webpack.DefinePlugin({
             'process.env.NODE_ENV': JSON.stringify('production'),
             VERSION: JSON.stringify(require('./package.json').version),
+            PR_NUMBER: process.env.PR_NUMBER,
         }),
         new CopyWebpackPlugin({
             patterns: [