Skip to content

Commit

Permalink
Merge pull request #1040 from GnsP/migrate-bower-packages
Browse files Browse the repository at this point in the history 
remove bower
  • Loading branch information
@GnsP
GnsP authored Jun 7, 2023
2 parents 2723378 + 896eb9a commit 09fd264
Show file tree
Hide file tree
Showing 38 changed files with 724 additions and 396 deletions.
3 changes: 0 additions & 3 deletions .bowerrc
View file

This file was deleted.

1 change: 0 additions & 1 deletion .eslintignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ dist/
cdap_dist/
common_dist/
node_modules/
bower_components/
commmon/
directives/
features/
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ jobs:
run: |
npm install -g yarn # Install Yarn globally
yarn --frozen-lockfile
yarn run bower-root # Install Bower dependencies
- name: Start CDAP-UI and run the tests
env:
Expand Down
157 changes: 77 additions & 80 deletions Gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,12 @@ function getBabelBuildPipeline() {
gulp.task('css:library', function() {
return merge(
gulp.src([
'./bower_components/angular/angular-csp.css',
'./bower_components/angular-loading-bar/build/loading-bar.min.css',
'./bower_components/angular-motion/dist/angular-motion.min.css',
'./node_modules/@bower_components/angular/angular-csp.css',
'./node_modules/@bower_components/angular-loading-bar/build/loading-bar.min.css',
'./node_modules/@bower_components/angular-motion/dist/angular-motion.min.css',
'./node_modules/font-awesome/css/font-awesome.min.css',
'./bower_components/c3/c3.min.css',
'./bower_components/angular-gridster/dist/angular-gridster.min.css',
'./bower_components/angular-cron-jobs/dist/angular-cron-jobs.min.css',
'./node_modules/@bower_components/angular-gridster/dist/angular-gridster.min.css',
'./node_modules/@bower_components/angular-cron-jobs/dist/angular-cron-jobs.min.css',
]),
gulp.src('./app/styles/bootstrap.less').pipe(plug.less())
)
Expand Down Expand Up @@ -158,74 +157,73 @@ gulp.task('css:app', gulp.series('css:application', 'css:lint'));
gulp.task('js:lib', function() {
return gulp
.src([
'./bower_components/angular/angular.js',

'./bower_components/angular-sanitize/angular-sanitize.js',
'./bower_components/angular-animate/angular-animate.js',
'./bower_components/angular-resource/angular-resource.js',

'./bower_components/angular-ui-router/release/angular-ui-router.js',

'./bower_components/angular-strap/dist/modules/compiler.js',
'./bower_components/angular-strap/dist/modules/dimensions.js',
'./bower_components/angular-strap/dist/modules/tooltip.js',
'./bower_components/angular-strap/dist/modules/tooltip.tpl.js',
'./bower_components/angular-strap/dist/modules/dropdown.js',
'./bower_components/angular-strap/dist/modules/dropdown.tpl.js',
'./bower_components/angular-strap/dist/modules/modal.js',
'./bower_components/angular-strap/dist/modules/modal.tpl.js',
'./bower_components/angular-strap/dist/modules/alert.js',
'./bower_components/angular-strap/dist/modules/alert.tpl.js',
'./bower_components/angular-strap/dist/modules/popover.js',
'./bower_components/angular-strap/dist/modules/popover.tpl.js',
'./bower_components/angular-strap/dist/modules/collapse.js',
'./bower_components/angular-strap/dist/modules/parse-options.js',
'./bower_components/angular-strap/dist/modules/typeahead.js',
'./bower_components/angular-strap/dist/modules/typeahead.tpl.js',
'./bower_components/angular-strap/dist/modules/select.js',
'./bower_components/angular-strap/dist/modules/select.tpl.js',

'./bower_components/angular-strap/dist/modules/date-parser.js',
'./bower_components/angular-strap/dist/modules/date-formatter.js',
'./bower_components/angular-strap/dist/modules/datepicker.js',
'./bower_components/angular-strap/dist/modules/datepicker.tpl.js',
'./bower_components/angular-strap/dist/modules/timepicker.js',
'./bower_components/angular-strap/dist/modules/timepicker.tpl.js',

'./bower_components/angular-breadcrumb/release/angular-breadcrumb.js',

'./bower_components/ngstorage/ngStorage.js',
'./bower_components/angular-loading-bar/build/loading-bar.js',

'./bower_components/d3/d3.js',
'./bower_components/d3-timeline/src/d3-timeline.js',
'./bower_components/lodash/lodash.js',
'./bower_components/graphlib/dist/graphlib.core.js',
'./bower_components/dagre/dist/dagre.core.js',
'./bower_components/dagre-d3/dist/dagre-d3.core.js',
'./bower_components/moment/moment.js',
'./bower_components/angular-moment/angular-moment.js',
'./bower_components/angular-bootstrap/ui-bootstrap-tpls.js',

'./bower_components/node-uuid/uuid.js',

'./bower_components/angular-cookies/angular-cookies.min.js',
'./node_modules/@bower_components/angular/angular.js',

'./node_modules/@bower_components/angular-sanitize/angular-sanitize.js',
'./node_modules/@bower_components/angular-animate/angular-animate.js',
'./node_modules/@bower_components/angular-resource/angular-resource.js',

'./node_modules/@bower_components/angular-ui-router/release/angular-ui-router.js',

'./node_modules/@bower_components/angular-strap/dist/modules/compiler.js',
'./node_modules/@bower_components/angular-strap/dist/modules/dimensions.js',
'./node_modules/@bower_components/angular-strap/dist/modules/tooltip.js',
'./node_modules/@bower_components/angular-strap/dist/modules/tooltip.tpl.js',
'./node_modules/@bower_components/angular-strap/dist/modules/dropdown.js',
'./node_modules/@bower_components/angular-strap/dist/modules/dropdown.tpl.js',
'./node_modules/@bower_components/angular-strap/dist/modules/modal.js',
'./node_modules/@bower_components/angular-strap/dist/modules/modal.tpl.js',
'./node_modules/@bower_components/angular-strap/dist/modules/alert.js',
'./node_modules/@bower_components/angular-strap/dist/modules/alert.tpl.js',
'./node_modules/@bower_components/angular-strap/dist/modules/popover.js',
'./node_modules/@bower_components/angular-strap/dist/modules/popover.tpl.js',
'./node_modules/@bower_components/angular-strap/dist/modules/collapse.js',
'./node_modules/@bower_components/angular-strap/dist/modules/parse-options.js',
'./node_modules/@bower_components/angular-strap/dist/modules/typeahead.js',
'./node_modules/@bower_components/angular-strap/dist/modules/typeahead.tpl.js',
'./node_modules/@bower_components/angular-strap/dist/modules/select.js',
'./node_modules/@bower_components/angular-strap/dist/modules/select.tpl.js',

'./node_modules/@bower_components/angular-strap/dist/modules/date-parser.js',
'./node_modules/@bower_components/angular-strap/dist/modules/date-formatter.js',
'./node_modules/@bower_components/angular-strap/dist/modules/datepicker.js',
'./node_modules/@bower_components/angular-strap/dist/modules/datepicker.tpl.js',
'./node_modules/@bower_components/angular-strap/dist/modules/timepicker.js',
'./node_modules/@bower_components/angular-strap/dist/modules/timepicker.tpl.js',

'./node_modules/@bower_components/angular-breadcrumb/release/angular-breadcrumb.js',

'./node_modules/@bower_components/ngstorage/ngStorage.js',
'./node_modules/@bower_components/angular-loading-bar/build/loading-bar.js',

'./node_modules/@bower_components/d3/d3.js',
'./node_modules/@bower_components/d3-timeline/src/d3-timeline.js',
'./node_modules/@bower_components/lodash/lodash.js',
'./node_modules/@bower_components/graphlib/dist/graphlib.core.js',
'./node_modules/@bower_components/dagre/dist/dagre.core.js',
'./node_modules/@bower_components/dagre-d3/dist/dagre-d3.core.js',
'./node_modules/@bower_components/moment/moment.js',
'./node_modules/@bower_components/angular-moment/angular-moment.js',
'./node_modules/@bower_components/angular-bootstrap/ui-bootstrap-tpls.js',

'./node_modules/@bower_components/node-uuid/uuid.js',

'./node_modules/@bower_components/angular-cookies/angular-cookies.min.js',
'./node_modules/redux/dist/redux.min.js',
'./node_modules/redux-thunk/dist/redux-thunk.min.js',
'./bower_components/ace-builds/src-min-noconflict/ace.js',
'./bower_components/angular-ui-ace/ui-ace.js',
'./bower_components/jsPlumb/dist/js/jsPlumb-2.0.6-min.js',
'./bower_components/angular-gridster/dist/angular-gridster.min.js',
'./bower_components/angular-cron-jobs/dist/angular-cron-jobs.min.js',
'./bower_components/angularjs-dropdown-multiselect/dist/angularjs-dropdown-multiselect.min.js',
'./bower_components/marked/marked.min.js',
'./bower_components/angular-marked/dist/angular-marked.min.js',

'./bower_components/js-beautify/js/lib/beautify.js',
'./bower_components/angular-file-saver/dist/angular-file-saver.bundle.js',
'./bower_components/ngInfiniteScroll/build/ng-infinite-scroll.min.js',
'./bower_components/angular-inview/angular-inview.js',
'./bower_components/esprima/esprima.js',
'./node_modules/@bower_components/ace-builds/src-min-noconflict/ace.js',
'./node_modules/@bower_components/angular-ui-ace/ui-ace.js',
'./node_modules/@bower_components/jsPlumb/dist/js/jsPlumb-2.0.6-min.js',
'./node_modules/@bower_components/angular-gridster/dist/angular-gridster.min.js',
'./node_modules/@bower_components/angular-cron-jobs/dist/angular-cron-jobs.min.js',
'./node_modules/@bower_components/marked/marked.min.js',
'./node_modules/@bower_components/angular-marked/dist/angular-marked.min.js',

'./node_modules/@bower_components/js-beautify/js/lib/beautify.js',
'./node_modules/@bower_components/angular-file-saver/dist/angular-file-saver.bundle.js',
'./node_modules/@bower_components/ngInfiniteScroll/build/ng-infinite-scroll.min.js',
'./node_modules/@bower_components/angular-inview/angular-inview.js',
'./node_modules/@bower_components/esprima/esprima.js',
'./node_modules/react/umd/react.production.min.js',
'./node_modules/react-dom/umd/react-dom.production.min.js',
'./node_modules/ngreact/ngReact.min.js',
Expand All @@ -242,15 +240,15 @@ gulp.task('js:aceworkers', function(cb) {
gulp
.src([
/** FIXME: (CDAP-15419): Unify ace-builds dependency */
'./bower_components/ace-builds/src-min-noconflict/ace.js',
'./bower_components/ace-builds/src-min-noconflict/mode-javascript.js',
'./bower_components/ace-builds/src-min-noconflict/worker-javascript.js',
'./node_modules/@bower_components/ace-builds/src-min-noconflict/ace.js',
'./node_modules/@bower_components/ace-builds/src-min-noconflict/mode-javascript.js',
'./node_modules/@bower_components/ace-builds/src-min-noconflict/worker-javascript.js',
'./node_modules/ace-builds/src-min-noconflict/mode-json.js',
'./node_modules/ace-builds/src-min-noconflict/worker-json.js',
'./bower_components/ace-builds/src-min-noconflict/mode-python.js',
'./bower_components/ace-builds/src-min-noconflict/mode-sql.js',
'./bower_components/ace-builds/src-min-noconflict/mode-scala.js',
'./bower_components/ace-builds/src-min-noconflict/mode-plain_text.js',
'./node_modules/@bower_components/ace-builds/src-min-noconflict/mode-python.js',
'./node_modules/@bower_components/ace-builds/src-min-noconflict/mode-sql.js',
'./node_modules/@bower_components/ace-builds/src-min-noconflict/mode-scala.js',
'./node_modules/@bower_components/ace-builds/src-min-noconflict/mode-plain_text.js',
])
.pipe(gulp.dest('./packaged/public/dist/assets/bundle/ace-editor-worker-scripts/'));
cb();
Expand All @@ -259,7 +257,6 @@ gulp.task('js:aceworkers', function(cb) {
gulp.task('fonts', function() {
return gulp
.src([
// './bower_components/bootstrap/dist/fonts/*',
'./app/styles/fonts/*',
'./node_modules/font-awesome/fonts/*',
])
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ root directory of the repo:

```
yarn
bower install
```

Download the CDAP sandbox and start it. By default, the sandbox's UI
Expand Down
2 changes: 1 addition & 1 deletion app/directives/cask-angular-dropdown-text-combo/dropdown-text-combo.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
@import "../../../bower_components/bootstrap/less/mixins/clearfix.less";
@import "../../../node_modules/@bower_components/bootstrap/less/mixins/clearfix.less";
cask-dropdown-text-combo {
.dropdown-control-group {
div.input-group {
Expand Down
2 changes: 1 addition & 1 deletion app/directives/complex-schema/complex-schema.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

@import "../../../bower_components/bootstrap/less/mixins.less";
@import "../../../node_modules/@bower_components/bootstrap/less/mixins.less";
@import '../../styles/variables.less';
@import '../../styles/themes/cdap/mixins.less';

Expand Down
2 changes: 1 addition & 1 deletion app/directives/dag-plus/my-dag.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

@import "../../styles/variables.less";
@import "../../../bower_components/bootstrap/less/mixins.less";
@import "../../../node_modules/@bower_components/bootstrap/less/mixins.less";
@import "../../styles/themes/cdap/mixins.less";
@import "./color-constants.less";

Expand Down
2 changes: 1 addition & 1 deletion app/directives/datetime-range/datetime-range.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

@import "../../styles/variables.less";
@import "../../styles/themes/cdap/mixins.less";
@import "../../../bower_components/bootstrap/less/mixins.less";
@import "../../../node_modules/@bower_components/bootstrap/less/mixins.less";

my-datetime-range {
.date-text-input {
Expand Down
2 changes: 1 addition & 1 deletion app/directives/group-side-panel/group-side-panel.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

@import "../../styles/variables.less";
@import "../../../bower_components/bootstrap/less/mixins.less";
@import "../../../node_modules/@bower_components/bootstrap/less/mixins.less";
@import "../../styles/themes/cdap/mixins.less";

my-side-panel,
Expand Down
27 changes: 0 additions & 27 deletions ...irectives/widget-container/widget-multi-select-dropdown/widget-multi-select-dropdown.html
View file

This file was deleted.

72 changes: 0 additions & 72 deletions app/directives/widget-container/widget-multi-select-dropdown/widget-multi-select-dropdown.js
View file

This file was deleted.

30 changes: 0 additions & 30 deletions ...irectives/widget-container/widget-multi-select-dropdown/widget-multi-select-dropdown.less
View file

This file was deleted.

Loading

0 comments on commit 09fd264

Please sign in to comment.