fix: remove versionid

Author: jotanarciso

lib/build/bundlers/bundler-base.js

@@ -11,7 +11,6 @@ class BundlerBase {
    * Represents a configuration object.
    * @typedef {object} BuilderConfig
    * @property {string} entry - The entry point for the configuration
-   * @property {string} buildId - The build ID
    * @property {boolean} useNodePolyfills - Indicates if Node polyfills are being used
    * @property {boolean} useOwnWorker - Indicates if a custom worker is being used
    * @property {object} custom - Custom configuration.

lib/build/bundlers/esbuild/index.js

@@ -18,9 +18,7 @@ class Esbuild extends BundlerBase {
   async run() {
     let config = lodash.cloneDeep(AzionEsbuildConfig);
     config.entryPoints = [this.builderConfig.entry];
-    config.define = {
-      AZION_VERSION_ID: JSON.stringify(this.builderConfig.buildId),
-    };
+
 
     if (!config.plugins) config.plugins = [];
 

lib/build/bundlers/esbuild/index.test.js

@@ -38,7 +38,6 @@ describe('Esbuild Bundler', () => {
       await fs.promises.writeFile(tmpEntry.name, code);
 
       const bundler = new Esbuild({
-        buildId: '12345',
         custom: {},
         entry: tmpEntry.name,
         localCustom: {
@@ -65,7 +64,6 @@ describe('Esbuild Bundler', () => {
     'should merge the config, in this case optimization.minimize false',
     async () => {
       const bundler = new Esbuild({
-        buildId: '12345',
         custom: {
           minify: true,
         },

lib/build/bundlers/webpack/index.js

@@ -22,9 +22,6 @@ class Webpack extends BundlerBase {
     let config = lodash.cloneDeep(AzionWebpackConfig);
     config.entry = this.builderConfig.entry;
     config.plugins = [
-      new webpack.DefinePlugin({
-        AZION_VERSION_ID: JSON.stringify(this.builderConfig.buildId),
-      }),
       ...config.plugins,
     ];
 

lib/build/bundlers/webpack/index.test.js

@@ -38,7 +38,6 @@ describe('Webpack Bundler', () => {
       await fs.promises.writeFile(tmpEntry.name, code);
 
       const bundler = new Webpack({
-        buildId: '12345',
         custom: {},
         entry: tmpEntry.name,
         localCustom: {
@@ -73,7 +72,6 @@ describe('Webpack Bundler', () => {
     'should merge the config, in this case optimization.minimize false',
     async () => {
       const bundler = new Webpack({
-        buildId: '123456',
         custom: {
           optimization: {
             minimize: true,

lib/build/dispatcher/dispatcher.js

@@ -42,12 +42,10 @@ class Dispatcher {
    * @param {boolean} [config.useOwnWorker] - Flag indicating whether the constructed code inserts its own worker expression without the need to inject a provider.
    * @param {string[]|undefined} [config.memoryFS] - Reference to dirs that contains files to be injected in worker memory.
    * @param {object} [config.custom] - Custom Bundle configuration.
-   * @param {string } buildId - Build ID
    * @param {string} vulcanLibPath - Vulcan lib absolute path
    */
   constructor(
     config,
-    buildId = generateTimestamp(),
     vulcanLibPath = getAbsoluteLibDirPath(),
   ) {
     /* configuration */
@@ -61,7 +59,6 @@ class Dispatcher {
     this.memoryFS = config.memoryFS;
     this.custom = config.custom;
     /* generate */
-    this.buildId = buildId;
     this.vulcanLibPath = vulcanLibPath;
   }
 
@@ -255,7 +252,6 @@ class Dispatcher {
    * @param {object} currentConfig.memoryFS - The current memoryFS.
    * @param {object} config - The configuration object.
    * @typedef {object} BuildConfig
-   * @property {string} buildId - Identifier for the build.
    * @property {boolean} useNodePolyfills - Indicates whether to use Node polyfills.
    * @property {boolean} useOwnWorker - Indicates whether to use a custom worker.
    * @property {*} localCustom - Custom configuration specific to the local environment.
@@ -265,7 +261,6 @@ class Dispatcher {
    */
   static configureBuild(currentConfig, config) {
     const {
-      buildId,
       useNodePolyfills,
       useOwnWorker,
       preset,
@@ -274,7 +269,6 @@ class Dispatcher {
     } = currentConfig;
     const buildConfig = { ...config };
 
-    buildConfig.buildId = buildId;
     // include config preset to priority
     buildConfig.useNodePolyfills =
       Dispatcher.checkBooleanValue(useNodePolyfills) ||
@@ -288,7 +282,7 @@ class Dispatcher {
     buildConfig.memoryFS = memoryFS || buildConfig?.memoryFS;
 
     const currentDir = process.cwd();
-    let tempEntryFile = `vulcan-${buildId}.temp.`;
+    let tempEntryFile = `vulcan-${generateTimestamp()}.temp.`;
     tempEntryFile += preset.name === 'typescript' ? 'ts' : 'js';
     const tempBuilderEntryPath = join(currentDir, tempEntryFile);
 
@@ -307,9 +301,8 @@ class Dispatcher {
    * @returns {Promise<object>} - A promise that resolves to an object containing the prebuild context.
    */
   static async runPrebuild(context, buildConfig) {
-    const { buildId, handler, prebuild } = context;
+    const { handler, prebuild } = context;
     const prebuildContext = {
-      buildId,
       entry: buildConfig.entry,
       useNodePolyfills: buildConfig.useNodePolyfills,
       useOwnWorker: buildConfig.useOwnWorker,
@@ -326,7 +319,7 @@ class Dispatcher {
     };
     feedback.prebuild.info(Messages.build.info.prebuild_starting);
     await prebuild(prebuildContext);
-    createDotEnvFile(buildId, isWindows);
+    createDotEnvFile(isWindows);
     feedback.prebuild.success(Messages.build.success.prebuild_succeeded);
 
     feedback.build.info(Messages.build.info.vulcan_build_starting);
@@ -401,7 +394,6 @@ class Dispatcher {
 
       const buildConfig = Dispatcher.configureBuild(
         {
-          buildId: this.buildId,
           localCustom: this.custom,
           preset: this.preset,
           useNodePolyfills: this.useNodePolyfills,
@@ -415,7 +407,7 @@ class Dispatcher {
       writeFileSync(buildConfig?.entry, handler);
 
       await Dispatcher.runPrebuild(
-        { buildId: this.buildId, handler, prebuild },
+        {  handler, prebuild },
         buildConfig,
       );
       await Dispatcher.executeBuild(this.entry, this.builder, buildConfig);

lib/build/dispatcher/dispatcher.test.js

@@ -1,12 +1,7 @@
 import MockFs from 'mock-fs';
-import fs from 'fs';
 import { expect } from '@jest/globals';
 import Dispatcher from './dispatcher.js';
-import {
-  createDotEnvFile,
-  folderExistsInProject,
-  getAliasPath,
-} from './helpers/helpers.js';
+import { folderExistsInProject, getAliasPath } from './helpers/helpers.js';
 
 describe('dispatcher', () => {
   const { env } = process;
@@ -41,18 +36,9 @@ describe('dispatcher', () => {
       useOwnWorker: false,
       memoryFS: undefined,
       custom: {},
-      buildId: '123456',
       vulcanLibPath: './vulcan',
     };
 
-    /**
-     * generate mocked timestamp
-     * @returns {string} - timestamp
-     */
-    function mockGenerateTimestamp() {
-      return '123456';
-    }
-
     /**
      * mock vulcan lib absolute path
      * @returns {string} - absolute path
@@ -61,11 +47,7 @@ describe('dispatcher', () => {
       return './vulcan';
     }
 
-    const newDispatcher = new Dispatcher(
-      config,
-      mockGenerateTimestamp(),
-      getAbsoluteLibDirPath(),
-    );
+    const newDispatcher = new Dispatcher(config, getAbsoluteLibDirPath());
     expect(newDispatcher).toBeInstanceOf(Dispatcher);
     expect(newDispatcher).toEqual(expectedDispatcher);
   });
@@ -88,22 +70,6 @@ describe('dispatcher', () => {
     MockFs.restore();
   });
 
-  it('should create dot env file', () => {
-    MockFs({});
-    createDotEnvFile('123456', false);
-    const vulcanEnvContent = fs.readFileSync('/.edge/.env', 'utf8');
-    expect(vulcanEnvContent).toEqual('VERSION_ID=123456');
-    MockFs.restore();
-  });
-
-  it('should create dot env file with windows enviroment', () => {
-    MockFs({});
-    createDotEnvFile('123456', true);
-    const vulcanEnvContent = fs.readFileSync('/.edge/.env', 'utf8');
-    expect(vulcanEnvContent).toEqual('VERSION_ID=123456');
-    MockFs.restore();
-  });
-
   it('Should verify if one directory exist in the project', async () => {
     MockFs({
       '/dist': {},

lib/build/dispatcher/helpers/helpers.js

@@ -29,19 +29,17 @@ function getAliasPath(alias, vulcanRootPath, isWindows) {
 
 /**
 Create a .env file in the build folder with specified parameters.
- * @param {string} buildId - The version ID to write into the .env file.
  * @param {boolean} isWindows - The boolean value indicates whether the current OS is Windows.
  */
-function createDotEnvFile(buildId, isWindows) {
+function createDotEnvFile(isWindows) {
   const projectRoot = process.cwd();
   const outputPath = isWindows
     ? fileURLToPath(new URL(`file:///${join(projectRoot, '.edge')}`))
     : join(projectRoot, '.edge');
   const envFilePath = join(outputPath, '.env');
-  const envContent = [`VERSION_ID=${buildId}`].join('\n');
 
   mkdirSync(outputPath, { recursive: true });
-  writeFileSync(envFilePath, envContent);
+  writeFileSync(envFilePath, '');
 }
 
 /**

lib/env/polyfills/fetch.polyfills.js

@@ -2,7 +2,7 @@ import { join } from 'path';
 import { readFileSync } from 'fs';
 import mime from 'mime-types';
 import { EdgeRuntime } from 'edge-runtime';
-import { getUrlFromResource, getVulcanBuildId } from '#utils';
+import { getUrlFromResource } from '#utils';
 
 /**
  * A custom fetch implementation that adds an additional path to the URL if it starts with 'file://'.
@@ -20,8 +20,7 @@ async function fetchPolyfill(context, resource, options) {
   const urlObj = getUrlFromResource(context, resource);
 
   if (urlObj.href.startsWith('file://')) {
-    const versionId = getVulcanBuildId();
-    const file = urlObj.pathname.replace(`/${versionId}`, '');
+    const file = urlObj.pathname;
     const filePath = join(process.cwd(), '.edge', 'storage', file);
 
     const fileContent = readFileSync(filePath);

lib/env/polyfills/fetch.polyfills.test.js

@@ -26,7 +26,7 @@ describe('fetchPolyfill', () => {
   it('should return a response when the begin with file://', async () => {
     mockFS({
       '.edge': {
-        '.env': 'VERSION_ID=123456',
+        '.env': '',
         storage: {
           data: { build: { 'file.js': "console.log('ops')" } },
         },

lib/platform/edgehooks/mountSPA/mountSPA.hooks.js

@@ -10,7 +10,6 @@ import { Edge } from '#namespaces';
  * asset or a route within the application,
  * and mounts the appropriate request URL for fetching the required resource from the origin server.
  * @param {string} requestURL - The original URL from the incoming request.
- * @param {string} versionId - The version ID representing the build/assets stored.
  * @returns {Promise<Response>} A promise that resolves to the response from the fetched resource.
  * @example
  * // Handle a request for a homepage
@@ -25,7 +24,7 @@ import { Edge } from '#namespaces';
  * // Input: mountSSG('https://example.com/about', 'v1');
  * // Output: fetch('file:///v1/index.html');
  */
-function mountSPA(requestURL, versionId) {
+function mountSPA(requestURL) {
   /**
    * The path extracted from the request URL.
    * @type {string}
@@ -44,11 +43,11 @@ function mountSPA(requestURL, versionId) {
   if (fileExtensionRegex.test(requestPath)) {
     // If the requestPath has a file extension, it is considered an asset.
     // Concatenate the versionId and requestPath to form the complete asset URL.
-    assetPath = new URL(`/${versionId}${requestPath}`, 'file://');
+    assetPath = new URL(`${requestPath}`, 'file://');
   } else {
     // If the requestPath does not have a file extension, it is treated as a route.
     // Append the versionId and the route "index.html" to form the complete asset URL.
-    assetPath = new URL(`/${versionId}/index.html`, 'file://');
+    assetPath = new URL(`index.html`, 'file://');
   }
 
   return fetch(assetPath);

lib/platform/edgehooks/mountSPA/mountSPA.hooks.test.js

@@ -12,29 +12,24 @@ describe('mountSPA', () => {
 
   it('should construct the assetPath for assets correctly', async () => {
     const requestURL = 'http://example.com/assets/image.png';
-    const versionId = '1234567890';
 
-    const expectedAssetPath = new URL(
-      `/${versionId}/assets/image.png`,
-      'file://',
-    );
+    const expectedAssetPath = new URL(`assets/image.png`, 'file://');
 
     global.fetch.mockResolvedValue({});
 
-    return mountSPA(requestURL, versionId).then(() => {
+    return mountSPA(requestURL).then(() => {
       expect(global.fetch).toHaveBeenCalledWith(expectedAssetPath);
     });
   });
 
   it('should construct a requestPath that does not have a file extension', async () => {
-    const requestURL = 'http://example.com/';
-    const versionId = '1234567890';
+    const requestURL = 'http://example.com';
 
-    const expectedAssetPath = new URL(`/${versionId}/index.html`, 'file://');
+    const expectedAssetPath = new URL(`index.html`, 'file://');
 
     global.fetch.mockResolvedValue({});
 
-    return mountSPA(requestURL, versionId).then(() => {
+    return mountSPA(requestURL).then(() => {
       expect(global.fetch).toHaveBeenCalledWith(expectedAssetPath);
     });
   });

lib/platform/edgehooks/mountSSG/mountSSG.hooks.js

@@ -9,7 +9,6 @@ import { Edge } from '#namespaces';
  * the appropriate asset path based on these parameters, and fetches the corresponding
  * response from the SSG.
  * @param {string} requestURL - The original URL from the event request.
- * @param {string} versionId - The version ID representing the build/assets stored.
  * @returns {Promise<Response>} A promise that resolves to the response from the SSG.
  * @example
  * // Handle a request for a homepage
@@ -24,7 +23,7 @@ import { Edge } from '#namespaces';
  * // Input: mountSSG('https://example.com/about', 'v1');
  * // Output: fetch('file:///v1/about/index.html');
  */
-function mountSSG(requestURL, versionId) {
+function mountSSG(requestURL) {
   /**
    * The path extracted from the request URL.
    * @type {string}
@@ -48,18 +47,15 @@ function mountSSG(requestURL, versionId) {
 
   if (cleanRequestPath === '/') {
     // If the requestPath is the root path, append the versionId and 'index.html' to the assetPath.
-    assetPath = new URL(`/${versionId}/index.html`, 'file://');
+    assetPath = new URL(`index.html`, 'file://');
   } else if (fileExtensionRegex.test(cleanRequestPath)) {
     // If the requestPath has a file extension, it is considered an asset.
     // Concatenate the versionId and requestPath to form the complete asset URL.
-    assetPath = new URL(`/${versionId}${cleanRequestPath}`, 'file://');
+    assetPath = new URL(`${cleanRequestPath}`, 'file://');
   } else {
     // If the requestPath is a route without a file extension,
     // Append the versionId and requestPath to the assetPath.
-    assetPath = new URL(
-      `/${versionId}${cleanRequestPath}/index.html`,
-      'file://',
-    );
+    assetPath = new URL(`${cleanRequestPath}/index.html`, 'file://');
   }
 
   return fetch(assetPath);