V5.2.0 release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gofynd/fdk-cli",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "main": "index.js",
   "license": "MIT",
   "bin": {

sample-upload.js

@@ -0,0 +1,2 @@
+// ! DO NOT REMOVE
+// This file is used to get CDN base path

src/__tests__/auth.spec.ts

@@ -52,7 +52,6 @@ describe('Auth Commands', () => {
         setEnv();
         program = await init('fdk');
         const mock = new MockAdapter(axios);
-        mock.onGet(`${URLS.IS_VERSION_COMPATIBLE()}`).reply(200);
         await login();
     });
 

src/__tests__/theme.spec.ts

@@ -137,7 +137,6 @@ describe('Theme Commands', () => {
         const mockInstance = new MockAdapter(
             uninterceptedApiClient.axiosInstance,
         );
-        mock.onGet(`${URLS.IS_VERSION_COMPATIBLE()}`).reply(200);
         mock.onGet(
             `${URLS.GET_APPLICATION_DETAILS(
                 appConfig.company_id,

src/__tests__/themeContext.spec.ts

@@ -61,7 +61,6 @@ describe('Theme Context Commands', () => {
         setEnv();
         program = await init('fdk');
         const mock = new MockAdapter(axios);
-        mock.onGet(`${URLS.IS_VERSION_COMPATIBLE()}`).reply(200);
         mock.onGet(
             `${URLS.GET_APPLICATION_DETAILS(
                 appConfig.company_id,

src/helper/build.ts

@@ -6,9 +6,32 @@ import webpack, { MultiStats } from 'webpack';
 import createBaseWebpackConfig from '../helper/theme.react.config';
 import fs from 'fs';
 import rimraf from 'rimraf';
+import Logger from '../lib/Logger';
 
 export const THEME_ENTRY_FILE = path.join('theme', 'index.js');
+export const VUE_THEME_ENTRY_FILE = path.join("..",'theme', 'index.js');
+export const DEV_VUE_THEME_ENTRY_FILE = path.join('theme', 'index.js');
 
+export const CDN_ENTRY_FILE =  path.join('.fdk', 'cdn_index.js');
+
+export const dynamicCDNScript = ({assetNormalizedBasePath,vueJs }) => {
+    return `function getCDNurl() {
+        \n let cdnUrl; 
+        \n try{ 
+            \n if(fynd_platform_cdn) { 
+                \n cdnUrl = fynd_platform_cdn 
+                \n } else { 
+                    \n throw new Error("undefiend variable")}  
+        \n } catch(error){ 
+            \n cdnUrl = '${assetNormalizedBasePath}'} 
+        \n return cdnUrl; 
+            \n  }   
+    \n __webpack_public_path__ =  getCDNurl() ${vueJs ? `\n
+    import bundle from "../theme/index.js";
+    \n export default bundle;
+    `
+    : ''}`
+}
 export function build({
     buildFolder,
     imageCdnUrl,
@@ -23,13 +46,23 @@ export function build({
         'bin',
         'vue-cli-service.js',
     );
+    fs.stat(CDN_ENTRY_FILE, function (err, stat) {
+        if (err == null) {
+            //deleting file if exist
+            fs.unlink(CDN_ENTRY_FILE, function (err) {
+                if (err) return console.log(err);
+                Logger.debug(' \n Existing file deleted successfully');
+            });
+        }
+        fs.appendFileSync(CDN_ENTRY_FILE, dynamicCDNScript({ assetNormalizedBasePath:(imageCdnUrl|| assetCdnUrl),vueJs: true }));
+    });
     const spinner = new Spinner('Building assets using vue-cli-service');
     return new Promise((resolve, reject) => {
         spinner.start();
         const isNodeVersionIsGreaterThan18 =
             +process.version.split('.')[0].slice(1) >= 18;
         let b = exec(
-            `node ${VUE_CLI_PATH} build --target lib --dest ${buildFolder} --name themeBundle --filename ${assetHash}_themeBundle ${THEME_ENTRY_FILE}`,
+            `node ${VUE_CLI_PATH} build --target lib --dest ${buildFolder} --name themeBundle --filename ${assetHash}_themeBundle ${CDN_ENTRY_FILE}`,
             {
                 cwd: process.cwd(),
                 env: {
@@ -53,6 +86,10 @@ export function build({
         b.stdout.pipe(process.stdout);
         b.stderr.pipe(process.stderr);
         b.on('exit', function (code) {
+            fs.unlink(CDN_ENTRY_FILE, function (err) {
+                if (err) return console.log(err);
+                Logger.debug(' \n Existing file deleted successfully');
+            });
             if (!code) {
                 spinner.succeed();
                 return resolve(true);
@@ -75,6 +112,7 @@ interface DevReactBuild {
     imageCdnUrl?: string;
     localThemePort?: string;
     isHMREnabled: boolean;
+    targetDirectory?:string
 }
 
 export function devBuild({ buildFolder, imageCdnUrl, isProd }: DevBuild) {
@@ -91,7 +129,7 @@ export function devBuild({ buildFolder, imageCdnUrl, isProd }: DevBuild) {
 
     return new Promise((resolve, reject) => {
         let b = exec(
-            `node ${VUE_CLI_PATH} build --target lib --dest ${buildFolder} --name themeBundle ${THEME_ENTRY_FILE}`,
+            `node ${VUE_CLI_PATH} build --target lib --dest ${buildFolder} --name themeBundle ${DEV_VUE_THEME_ENTRY_FILE}`,
             {
                 cwd: process.cwd(),
                 env: {
@@ -125,10 +163,11 @@ export function devBuild({ buildFolder, imageCdnUrl, isProd }: DevBuild) {
 export async function devReactBuild({
     buildFolder,
     runOnLocal,
-    assetBasePath,
+    assetBasePath = '',
     localThemePort,
     imageCdnUrl,
     isHMREnabled,
+    targetDirectory
 }: DevReactBuild): Promise<MultiStats> {
     const buildPath = path.join(process.cwd(), buildFolder);
     try {
@@ -145,7 +184,6 @@ export async function devReactBuild({
                 themeWebpackConfigPath
             ));
         }
-
         const ctx = {
             buildPath: buildPath,
             NODE_ENV: (!runOnLocal && 'production') || 'development',
@@ -154,15 +192,39 @@ export async function devReactBuild({
             localThemePort: localThemePort,
             context: process.cwd(),
             isHMREnabled,
+            targetDirectory
         };
         const baseWebpackConfig = createBaseWebpackConfig(
             ctx,
             webpackConfigFromTheme,
         );
+        const assetNormalizedBasePath =
+            assetBasePath[assetBasePath.length - 1] === '/'
+                ? assetBasePath
+                : assetBasePath + '/';
         return new Promise((resolve, reject) => {
+            if(!runOnLocal) {
+                fs.stat(path.resolve((targetDirectory || process.cwd()), CDN_ENTRY_FILE), function (err, stat) {
+                    if (err == null) {
+                        //deleting file if exist
+                        fs.unlink(path.resolve((targetDirectory || process.cwd()), CDN_ENTRY_FILE), function (err) {
+                            if (err) return console.log(err);
+                            Logger.debug(' \n Existing file deleted successfully');
+                        });
+                    }
+                    fs.appendFileSync(path.resolve((targetDirectory || process.cwd()), CDN_ENTRY_FILE), dynamicCDNScript({assetNormalizedBasePath, vueJs: false }));
+
+                });
+            }
             webpack(baseWebpackConfig, (err, stats) => {
                 console.log(err);
                 console.log(stats.toString());
+                if(!runOnLocal) {
+                    fs.unlink(path.resolve((targetDirectory || process.cwd()), CDN_ENTRY_FILE), function (err) {
+                        if (err) return console.log(err);
+                        Logger.debug(' \n file deleted successfully');
+                    });
+                }
                 if (err || stats.hasErrors()) {
                     reject();
                 }

src/helper/serve.utils.ts

@@ -218,7 +218,7 @@ export async function startServer({ domain, host, isSSR, port }) {
                     'fdk-cli-dev-files',
                     User.current_user._id,
                 )
-            ).start.cdn.url;
+            ).complete.cdn.url;
         } else {
             jetfireUrl.searchParams.set('__csr', 'true');
         }

src/helper/theme.react.config.ts

@@ -1,8 +1,11 @@
+import path from "path"
 import TerserPlugin from 'terser-webpack-plugin';
 import webpack, { Configuration } from 'webpack';
 import { mergeWithRules, merge } from 'webpack-merge';
 import { getLocalBaseUrl } from './serve.utils';
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
+import { CDN_ENTRY_FILE } from './build';
+const context = process.cwd();
 
 const baseConfig = (configOptions) => {
     const {
@@ -15,7 +18,6 @@ const baseConfig = (configOptions) => {
 
     return {
         mode: isLocal ? 'development' : 'production',
-
         devtool: isLocal ? 'source-map' : false,
         optimization: {
             minimizer: [
@@ -83,6 +85,7 @@ export default (ctx, extendedWebpackConfig): Configuration[] => {
         imageCdnUrl = '',
         localThemePort = 5500,
         isHMREnabled = true,
+        targetDirectory
     } = ctx;
 
     const assetNormalizedBasePath =
@@ -109,7 +112,6 @@ export default (ctx, extendedWebpackConfig): Configuration[] => {
     };
     const baseWebpackConfig = baseConfig(configOptions);
     const extendedWebpackResolved = extendedWebpackConfig(configOptions);
-
     const mergedBaseConfig: Configuration = mergeWithRules({
         module: {
             rules: {
@@ -120,14 +122,14 @@ export default (ctx, extendedWebpackConfig): Configuration[] => {
     })(extendedWebpackResolved, baseWebpackConfig);
 
     if (mergedBaseConfig.entry.hasOwnProperty('themeBundle')) {
-        mergedBaseConfig.entry['themeBundle'] =
-            isLocal && isHMREnabled
-                ? [
-                      require.resolve('webpack-hot-middleware/client'),
-                      ...mergedBaseConfig.entry['themeBundle'],
-                  ]
-                : mergedBaseConfig.entry['themeBundle'];
+        let entryPoints = [...mergedBaseConfig.entry['themeBundle']];
+        if (isLocal && isHMREnabled) {
+            entryPoints.unshift(require.resolve('webpack-hot-middleware/client'));
+        } else if (!isLocal) {
+            entryPoints.unshift(path.resolve(targetDirectory || context, CDN_ENTRY_FILE));
+        }
+        mergedBaseConfig.entry['themeBundle'] = entryPoints;
     }
-
+    
     return [mergedBaseConfig];
 };

src/lib/Auth.ts

@@ -61,16 +61,11 @@ export const startServer = async () => {
     return Auth.server;
 };
 
-async function checkVersionCompatibility() {
-    const response = await ThemeService.checkCompatibleVersion();
-}
-
 export default class Auth {
     static server = null;
     static isOrganizationChange = false;
     constructor() {}
     public static async login() {
-        await checkVersionCompatibility();
         Logger.info(
             chalk.green(
                 'Current env: ',

src/lib/CommandError.ts

@@ -53,11 +53,6 @@ export const ErrorCodes = {
             `No themes are created, Please create/add a theme under the sales channel. For more details, refer to the documentation link: ${domain}/help/docs/partners/themes/vuejs/overview`,
         code: 'FDK-00011',
     },
-    DOWNGRADE_CLI_VERSION: {
-        message:
-            'Seems like current Fynd Platform version is not compatible with installed CLI version.\n\nIn order to continue with current FP version, Please use previous version of CLI `npm install -g @gofynd/fdk-cli@3.0.4` command.',
-        code: 'FDK-00012',
-    },
 
     // generic
     ECONN_RESET: {