From bb5cd14e37ba033f2aad97585f3916afcf12e760 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Sep 2018 13:00:34 +0530 Subject: [PATCH 1/5] Issue #9 feat: Added bower-installer package --- bin/updateFrameworkDependencies.js | 2 +- bower.json | 24 +++++++++++++++++------- package.json | 3 ++- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/bin/updateFrameworkDependencies.js b/bin/updateFrameworkDependencies.js index 514f58c..5451ca2 100755 --- a/bin/updateFrameworkDependencies.js +++ b/bin/updateFrameworkDependencies.js @@ -1,7 +1,7 @@ #!/usr/bin/env node var rimraf = require('rimraf'); -var execSync = require('child_process').execSync; +var execSync = require('child_process').exec; rimraf.sync('bower_components/content-editor*'); rimraf.sync('bower_components/renderer*'); diff --git a/bower.json b/bower.json index ee824e0..7d04c6b 100644 --- a/bower.json +++ b/bower.json @@ -5,14 +5,24 @@ "jasmine-jquery": "^2.1.1", "angular": "1.5.9", "angular-mocks": "1.5.9", - "content-editor": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/content-editor/scripts/script.min.1.35.859.js", - "content-player": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/script.min.1.9.686.js", + "content-editor": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/content-editor/*.js", + "content-player": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/*.js", "toastr": "https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js", - "renderer-createjs": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/createjs.min.js", - "renderer-creatine": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/creatine-1.0.0.min.js", - "renderer": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/renderer.min.js", "pollyfill": "https://cdn.jsdelivr.net/npm/promise-polyfill@7/dist/polyfill.min.js", - "renderer-cordovaplugin" : "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/cordovaaudioplugin-0.6.1.min.js", - "renderer-angular-mocks": "https://cdn.jsdelivr.net/npm/angular-mocks@1.5.9/angular-mocks.min.js" + "renderer-angular-mocks": "https://cdn.jsdelivr.net/npm/angular-mocks@1.5.9/angular-mocks.min.js", + "coreplugins": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/*" + }, + "install": { + "path": "", + "sources": { + "content-editor": "bower_components/content-editor/*.*", + "content-player": "bower_components/content-player/*.*", + "coreplugins": { + "mapping": [ + {"bower_components/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/createjs.min.js": "renderer-createjs"}, + {"bower_components/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/creatine-1.0.0.min.js": "renderer-creatine"} + ] + } + } } } \ No newline at end of file diff --git a/package.json b/package.json index 3eb4364..6c04d1d 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,8 @@ "author": "ekstep", "license": "MIT", "devDependencies": { + "bower-installer": "^1.3.6", "gulp-jasmine-node": "^1.0.7", "jasmine-node": "^1.14.5" } -} \ No newline at end of file +} From b2930c18625d25bab05e956bfd9c13261c141c86 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Sep 2018 13:41:05 +0530 Subject: [PATCH 2/5] Issue #9 fix: coreplugins dependency modified --- bower.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index 7d04c6b..7eb20d8 100644 --- a/bower.json +++ b/bower.json @@ -8,9 +8,9 @@ "content-editor": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/content-editor/*.js", "content-player": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/*.js", "toastr": "https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js", + "coreplugins": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/*.js", "pollyfill": "https://cdn.jsdelivr.net/npm/promise-polyfill@7/dist/polyfill.min.js", - "renderer-angular-mocks": "https://cdn.jsdelivr.net/npm/angular-mocks@1.5.9/angular-mocks.min.js", - "coreplugins": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/*" + "renderer-angular-mocks": "https://cdn.jsdelivr.net/npm/angular-mocks@1.5.9/angular-mocks.min.js" }, "install": { "path": "", @@ -19,8 +19,10 @@ "content-player": "bower_components/content-player/*.*", "coreplugins": { "mapping": [ - {"bower_components/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/createjs.min.js": "renderer-createjs"}, - {"bower_components/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/creatine-1.0.0.min.js": "renderer-creatine"} + {"bower_components/renderer-createjs/createjs.min.js": "renderer-createjs"}, + {"bower_components/renderer-creatine/creatine-1.0.0.min.js": "renderer-creatine"}, + {"bower_components/renderer/renderer.min.js": "renderer"}, + {"bower_components/renderer-cordovaplugin/cordovaaudioplugin-0.6.1.min.js": "renderer-cordovaplugin"} ] } } From 694106604151833cc2eac95d271c68d195325a05 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Sep 2018 13:51:58 +0530 Subject: [PATCH 3/5] Issue #9 fix: modified dependency --- bower.json | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/bower.json b/bower.json index 7eb20d8..9750e95 100644 --- a/bower.json +++ b/bower.json @@ -5,26 +5,14 @@ "jasmine-jquery": "^2.1.1", "angular": "1.5.9", "angular-mocks": "1.5.9", - "content-editor": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/content-editor/*.js", - "content-player": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/*.js", + "content-editor": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/content-editor/script.min.*.js", + "content-player": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/script.min.*.js", "toastr": "https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js", - "coreplugins": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/*.js", + "renderer-createjs": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/createjs.min.js", + "renderer-creatine": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/creatine-1.0.0.min.js", + "renderer": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/renderer.min.js", "pollyfill": "https://cdn.jsdelivr.net/npm/promise-polyfill@7/dist/polyfill.min.js", + "renderer-cordovaplugin" : "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/cordovaaudioplugin-0.6.1.min.js", "renderer-angular-mocks": "https://cdn.jsdelivr.net/npm/angular-mocks@1.5.9/angular-mocks.min.js" - }, - "install": { - "path": "", - "sources": { - "content-editor": "bower_components/content-editor/*.*", - "content-player": "bower_components/content-player/*.*", - "coreplugins": { - "mapping": [ - {"bower_components/renderer-createjs/createjs.min.js": "renderer-createjs"}, - {"bower_components/renderer-creatine/creatine-1.0.0.min.js": "renderer-creatine"}, - {"bower_components/renderer/renderer.min.js": "renderer"}, - {"bower_components/renderer-cordovaplugin/cordovaaudioplugin-0.6.1.min.js": "renderer-cordovaplugin"} - ] - } - } } } \ No newline at end of file From 37ed213dc13ee4b11f797e5eceec3a72f14f7d66 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 3 Sep 2018 13:57:33 +0530 Subject: [PATCH 4/5] Issue #9 fix: modified dependency --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 9750e95..ee824e0 100644 --- a/bower.json +++ b/bower.json @@ -5,8 +5,8 @@ "jasmine-jquery": "^2.1.1", "angular": "1.5.9", "angular-mocks": "1.5.9", - "content-editor": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/content-editor/script.min.*.js", - "content-player": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/script.min.*.js", + "content-editor": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/content-editor/scripts/script.min.1.35.859.js", + "content-player": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/script.min.1.9.686.js", "toastr": "https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js", "renderer-createjs": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/createjs.min.js", "renderer-creatine": "https://s3.ap-south-1.amazonaws.com/ekstep-public-prod/v3/preview/coreplugins/org.ekstep.ecmlrenderer-1.0/renderer/libs/creatine-1.0.0.min.js", From 12c2e75043876aa4f2639cea7894af1333ed3407 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 12 Oct 2018 14:48:30 +0530 Subject: [PATCH 5/5] Issue #9 fix: content framework dependency changed --- bin/updateFrameworkDependencies.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/updateFrameworkDependencies.js b/bin/updateFrameworkDependencies.js index 5451ca2..191c495 100755 --- a/bin/updateFrameworkDependencies.js +++ b/bin/updateFrameworkDependencies.js @@ -4,8 +4,8 @@ var rimraf = require('rimraf'); var execSync = require('child_process').exec; rimraf.sync('bower_components/content-editor*'); -rimraf.sync('bower_components/renderer*'); -rimraf.sync('node_modules/eslint-config-ekstep-content-plugin'); +rimraf.sync('bower_components/content-player*'); + execSync('node node_modules/bower/bin/bower cache clean', { stdio: 'inherit' }); execSync('node node_modules/bower/bin/bower install', { stdio: 'inherit' }); execSync('npm install', { stdio: 'inherit' });