Develop (#186)

* Angular upgrade to v19 and critical vuln fixes (#183)

* #SS-I12: fix - ng 19 upgrade

* #SS-I12: fix - ng 19 upgrade

* #SS-I12: fix - ng 19 upgrade

* #SS-I12: fix - ng 19 upgrade

* #SS-I21: fix - angular upgrade to 19

* #SS-I21: fix - removed unused workflow

* #SS-I21: fix - linting fix

* Changes in asset allocation druid build (#184)

* refactor: Consolidate web component assets and scripts into a new `assets/video-player` folder.

* refactor: relocate web component build output and assets into dedicated `assets/video-player` subdirectories.

* refactor: Updated package version

* refactor: Relocate video player web component files and assets to a dedicated directory.

* End event (#185)

* fix: trigger end event

* package name

* Version change

* reverted changes

* feedbacks

---------

Co-authored-by: yashash <126703764+yashashkumar@users.noreply.github.com>

Author: JeraldJF

.circleci/config.yml

@@ -46,6 +46,40 @@
         "plugin:@angular-eslint/template/recommended"
       ],
       "rules": {}
+    },
+    {
+      "files": [
+        "projects/sunbird-video-player/**/*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "projects/sunbird-video-player/tsconfig.lib.json",
+          "projects/sunbird-video-player/tsconfig.spec.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates",
+        "plugin:@typescript-eslint/recommended"
+      ],
+      "rules": {}
+    },
+    {
+      "files": [
+        "projects/video-player-wc/**/*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "projects/video-player-wc/tsconfig.app.json",
+          "projects/video-player-wc/tsconfig.spec.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/recommended"
+      ],
+      "rules": {}
     }
   ]
 }

.eslintrc.json

@@ -15,10 +15,10 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '22.15.0'
+          node-version: '22.21.1'
 
       - name: Install dependencies
-        run: npm ci --legacy-peer-deps
+        run: npm i --legacy-peer-deps
 
       - name: Build and publish package
         env:
@@ -27,5 +27,5 @@ jobs:
           npm run build-lib
           npm pack ./dist/sunbird-video-player
           echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" > ~/.npmrc
-          npm publish project-sunbird-sunbird-video-player-v9-*
+          npm publish project-sunbird-sunbird-video-player-v9-* --access public
       

.github/workflows/jira-description-action.yml

@@ -15,10 +15,10 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '22.15.0'
+          node-version: '22.21.1'
 
       - name: Install dependencies
-        run: npm ci --legacy-peer-deps
+        run: npm i --legacy-peer-deps
 
       - name: Build and publish package
         env:

.github/workflows/publish_module.yml

@@ -1,16 +1,19 @@
 const fs = require('fs-extra');
 (async () => {
     try {
-      var source = "projects/sunbird-video-player/node_modules/@project-sunbird/sunbird-player-sdk-v9/lib/assets";
-        const dest = "dist/sunbird-video-player/lib/assets/";
-        const isAssetsExists = await fs.pathExists(dest)
-        var libsource = "projects/sunbird-video-player/src/lib/assets";
-        if (isAssetsExists) {
-            await fs.remove(dest);
-        }
-        await fs.ensureDir(dest);
-        await fs.copy(source, dest)
-        await fs.copy(libsource, dest)
+            var source = "projects/sunbird-video-player/node_modules/@project-sunbird/sunbird-player-sdk-v9/lib/assets";
+                const dest = "dist/sunbird-video-player/lib/assets/";
+                const isAssetsExists = await fs.pathExists(dest)
+                var libsource = "projects/sunbird-video-player/src/lib/assets";
+                if (isAssetsExists) {
+                        await fs.remove(dest);
+                }
+                await fs.ensureDir(dest);
+                const isSdkAssetsExists = await fs.pathExists(source);
+                if (isSdkAssetsExists) {
+                    await fs.copy(source, dest);
+                }
+                await fs.copy(libsource, dest)
         console.log('Assets copied successfully')
     } catch (err) {
         console.error("Error while copying assets", err)

.github/workflows/publish_web_component.yml

@@ -1,5 +1,6 @@
 const fs = require("fs-extra");
 const concat = require("concat");
+const path = require("path");
 
 const build = async () => {
   const files = [
@@ -11,24 +12,85 @@ const build = async () => {
     "projects/sunbird-video-player/src/lib/assets/videojs-markers.js",
     "projects/sunbird-video-player/src/lib/assets/videojs-transcript-click.min.js"
   ];
+
   const cssFiles = [
     "./dist/video-player-wc/styles.css",
     "projects/sunbird-video-player/src/lib/assets/videojs.markers.min.css",
   ];
-  await fs.ensureDir("dist/video-player-wc");
-  // make signle js file for web component
-  await concat(files, "web-component/sunbird-video-player.js");
-  await fs.copy("./dist/video-player-wc/assets", "web-component/assets");
-  const assetFilesToBeDeleted = ["videojs-markers.js", "videojs-transcript-click.min.js", "videojs.markers.min.css"]
-
-  assetFilesToBeDeleted.forEach(async (file) => {
-    await fs.remove(`web-component/assets/${file}`)
-    await fs.remove(`web-component-demo/assets/${file}`)
-  })
-  await fs.copy("README.md", "web-component/README.md")
-
-  // make signle css file for web component
-  await concat(cssFiles, "web-component/styles.css");
-  console.log("Files concatenated successfully!!!");
+
+  const outputDir = "web-component/assets/video-player";
+  const packageJsonSource = "web-component/package.json";
+
+  // Backup package.json if it exists
+  let packageJsonContent = null;
+  if (await fs.pathExists(packageJsonSource)) {
+    packageJsonContent = await fs.readJson(packageJsonSource);
+  }
+
+  // Clean and create directory
+  await fs.remove("web-component");
+  await fs.ensureDir(outputDir);
+
+  // Copy all web component files to assets/video-player/
+  await concat(files, `${outputDir}/sunbird-video-player.js`);
+  await concat(cssFiles, `${outputDir}/styles.css`);
+
+  // Ensure dist assets directory exists and copy from source
+  await fs.ensureDir("./dist/video-player-wc/assets");
+  await fs.copy("projects/sunbird-video-player/src/lib/assets", "./dist/video-player-wc/assets");
+
+  // Copy assets contents to assets/video-player/
+  if (await fs.pathExists("./dist/video-player-wc/assets")) {
+    await fs.copy("./dist/video-player-wc/assets", outputDir);
+  }
+
+  // Remove the bundled asset files that were already concatenated
+  const assetFilesToBeDeleted = [
+    "videojs-markers.js",
+    "videojs-transcript-click.min.js",
+    "videojs.markers.min.css"
+  ];
+
+  for (const file of assetFilesToBeDeleted) {
+    await fs.remove(`${outputDir}/${file}`);
+  }
+
+  // Copy README to web-component root
+  await fs.copy("README.md", "web-component/README.md");
+
+  // Restore package.json to both locations
+  if (packageJsonContent) {
+    // Keep package.json at web-component root
+    await fs.writeJson(packageJsonSource, packageJsonContent, { spaces: 2 });
+    console.log("✅ package.json restored to web-component/");
+
+    // Also copy to assets/video-player directory
+    await fs.writeJson(`${outputDir}/package.json`, packageJsonContent, { spaces: 2 });
+    console.log("✅ package.json copied to web-component/assets/video-player/");
+  }
+
+  // Also copy to demo folder with same structure
+  const demoDir = "web-component-demo/assets/video-player";
+  await fs.remove("web-component-demo/assets");
+  await fs.ensureDir(demoDir);
+  await concat(files, `${demoDir}/sunbird-video-player.js`);
+  await concat(cssFiles, `${demoDir}/styles.css`);
+
+  // Copy assets to demo directory
+  if (await fs.pathExists("./dist/video-player-wc/assets")) {
+    await fs.copy("./dist/video-player-wc/assets", demoDir);
+  }
+
+  // Remove the bundled asset files from demo as well
+  for (const file of assetFilesToBeDeleted) {
+    await fs.remove(`${demoDir}/${file}`);
+  }
+
+  // Clean up old files from previous build structure (if they exist)
+  await fs.remove("web-component-demo/sunbird-video-player.js");
+  await fs.remove("web-component-demo/styles.css");
+
+  console.log("✅ Files organized successfully!");
+  console.log(`📁 Output: ${outputDir}/`);
 };
 build();