Version the bundled @nimiq/core version to avoid cache issues

The @nimiq/core files are not versioned or hashed otherwise.
nimiq · Dec 1, 2024 · 09edfa6 · 09edfa6
1 parent 4f613af
commit 09edfa6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 12 deletions.
diff --git a/demos/index.html b/demos/index.html
@@ -182,7 +182,7 @@ <h2>Result</h2>
     crossorigin="anonymous"></script>
 
 <script type="module">
-    import init, * as Nimiq from '/albatross-client/web/index.js';
+    import init, * as Nimiq from '/nimiq/v<%= htmlWebpackPlugin.options.coreVersion %>/web/index.js';
 
     /** @type {Promise<Nimiq> | undefined} */
     let initPromise;

diff --git a/public/cashlink.html b/public/cashlink.html
@@ -22,7 +22,7 @@
     <link rel="icon" href="<%= htmlWebpackPlugin.options.domain %>/favicon.ico">
 
     <script type="module">
-        import init, * as Nimiq from '/albatross-client/web/index.js';
+        import init, * as Nimiq from '/nimiq/v<%= htmlWebpackPlugin.options.coreVersion %>/web/index.js';
 
         /** @type {Promise<Nimiq> | undefined} */
         let initPromise;

diff --git a/public/export.html b/public/export.html
@@ -13,7 +13,7 @@
     </style>
 
     <script type="module">
-        import init, * as Nimiq from '/albatross-client/web/index.js';
+        import init, * as Nimiq from '/nimiq/v<%= htmlWebpackPlugin.options.coreVersion %>/web/index.js';
 
         /** @type {Promise<Nimiq> | undefined} */
         let initPromise;

diff --git a/public/iframe.html b/public/iframe.html
@@ -6,7 +6,7 @@
     <meta name="robots" content="noindex">
     <title>Nimiq Hub IFrame</title>
     <script type="module">
-      import init, * as Nimiq from '/albatross-client/web/index.js';
+      import init, * as Nimiq from '/nimiq/v<%= htmlWebpackPlugin.options.coreVersion %>/web/index.js';
 
       /** @type {Promise<Nimiq> | undefined} */
       let initPromise;

diff --git a/public/index.html b/public/index.html
@@ -20,7 +20,7 @@
     <link rel="icon" href="<%= htmlWebpackPlugin.options.domain %>/favicon.ico">
 
     <script type="module">
-        import init, * as Nimiq from '/albatross-client/web/index.js';
+        import init, * as Nimiq from '/nimiq/v<%= htmlWebpackPlugin.options.coreVersion %>/web/index.js';
 
         /** @type {Promise<Nimiq> | undefined} */
         let initPromise;

diff --git a/vue.config.js b/vue.config.js
@@ -8,6 +8,18 @@ const createHash = require('crypto').createHash;
 // const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const PoLoaderOptimizer = require('webpack-i18n-tools')();
 
+let coreVersion = '';
+try {
+    // Will fail until @nimiq/core export map is updated to also make the package.json file available
+    coreVersion = require('@nimiq/core/package.json').version;
+} catch (e) {
+    // Fallback to reading the package.json file directly
+    pkgJson = require('fs').readFileSync(path.join(__dirname, 'node_modules/@nimiq/core/package.json'));
+    coreVersion = JSON.parse(pkgJson).version;
+}
+
+if (!coreVersion) throw new Error('Could not determine @nimiq/core version');
+
 const crypto = require('crypto');
 
 // Fix build for Node version with OpenSSL 3
@@ -28,8 +40,6 @@ const domain = buildName === 'mainnet'
         ? process.env.VUE_APP_HUB_URL
         : 'http://localhost:8080';
 
-const cdnDomain = 'https://cdn.nimiq-testnet.com';
-
 const browserWarningTemplate = fs.readFileSync(
     path.join(__dirname, 'node_modules/@nimiq/browser-warning/dist/browser-warning.html.template'));
 
@@ -73,7 +83,7 @@ const configureWebpack = {
             },
             {
                 from: 'node_modules/@nimiq/core',
-                to: './albatross-client/',
+                to: `./nimiq/v${coreVersion}/`,
             },
         ]}),
         new WriteFileWebpackPlugin(),
@@ -130,7 +140,7 @@ const pages = {
         browserWarningTemplate,
         browserWarningIntegrityHash,
         domain,
-        cdnDomain,
+        coreversion,
         // output as dist/index.html
         filename: 'index.html',
         // chunks to include on this page, by default includes
@@ -142,6 +152,7 @@ const pages = {
         entry: 'src/iframe.ts',
         // the source template
         template: 'public/iframe.html',
+        coreVersion,
         // output as dist/iframe.html
         filename: 'iframe.html',
         // chunks to include on this page, by default includes
@@ -157,7 +168,7 @@ const pages = {
         browserWarningTemplate,
         browserWarningIntegrityHash,
         domain,
-        cdnDomain,
+        coreversion,
         // output as dist/cashlink/index.html
         filename: 'cashlink/index.html',
         // chunks to include on this page, by default includes
@@ -169,7 +180,7 @@ const pages = {
         entry: 'src/export.ts',
         // the source template
         template: 'public/export.html',
-        cdnDomain,
+        coreversion,
         // output as dist/iframe.html
         filename: 'export.html',
     },
@@ -181,7 +192,7 @@ if (buildName === 'local' || buildName === 'testnet') {
         entry: 'demos/Demo.ts',
         // the source template
         template: 'demos/index.html',
-        cdnDomain,
+        coreversion,
         bitcoinJsIntegrityHash,
         // output as dist/demos.html
         filename: 'demos.html',