Skip to content

Commit

Permalink
Merge pull request #168 from visual-framework/Issue-2023
Browse files Browse the repository at this point in the history
Chore: Issue 2023 - Updated code with latest packages, fixed lint errors
  • Loading branch information
bhushan-ebi authored Aug 19, 2024
2 parents 2f30f0e + a5177a0 commit 2ca863d
Show file tree
Hide file tree
Showing 6 changed files with 3,825 additions and 3,992 deletions.
21 changes: 21 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module.exports = {
env: {
es6: true,
node: true,
browser: true
},
extends: "eslint:recommended",
parserOptions: {
sourceType: "module",
ecmaVersion: 2020,
ecmaFeatures: {
jsx: true
}
},
rules: {
indent: ["error", 2],
"linebreak-style": ["error", "unix"],
quotes: ["error", "double"],
semi: ["error", "always"]
}
};
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
env:
CI: true
- name: Deploy to GH Pages 🚀
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: public
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,44 +28,44 @@
"@11ty/eleventy": "2.0.1",
"@node-sass/node-module-importer": "1.2.3",
"@visual-framework/embl-grid": "2.2.0",
"@visual-framework/vf-analytics-google": "1.0.4",
"@visual-framework/vf-banner": "1.9.2",
"@visual-framework/vf-analytics-google": "1.1.2",
"@visual-framework/vf-banner": "2.0.3",
"@visual-framework/vf-body": "1.2.0",
"@visual-framework/vf-box": "2.4.0",
"@visual-framework/vf-card": "2.7.1",
"@visual-framework/vf-card-container": "3.2.3",
"@visual-framework/vf-cluster": "^1.0.2",
"@visual-framework/vf-code-example": "1.3.0",
"@visual-framework/vf-config": "1.0.1-alpha.0",
"@visual-framework/vf-content": "1.6.11",
"@visual-framework/vf-core": "2.2.39",
"@visual-framework/vf-design-tokens": "3.6.3",
"@visual-framework/vf-content": "1.6.16",
"@visual-framework/vf-core": "2.2.45",
"@visual-framework/vf-design-tokens": "3.6.4",
"@visual-framework/vf-divider": "2.0.1",
"@visual-framework/vf-extensions": "1.0.1",
"@visual-framework/vf-extensions": "2.1.2",
"@visual-framework/vf-favicon": "1.0.3",
"@visual-framework/vf-flag": "1.0.0-alpha.2",
"@visual-framework/vf-font-plex-mono": "1.1.1",
"@visual-framework/vf-font-plex-sans": "1.1.1",
"@visual-framework/vf-form": "2.0.0-alpha.2",
"@visual-framework/vf-global-header": "3.1.2",
"@visual-framework/vf-form": "2.0.2",
"@visual-framework/vf-global-header": "3.1.6",
"@visual-framework/vf-grid": "1.4.1",
"@visual-framework/vf-heading": "1.1.0",
"@visual-framework/vf-heading": "1.1.1",
"@visual-framework/vf-intro": "1.5.1",
"@visual-framework/vf-lede": "1.0.1",
"@visual-framework/vf-link": "2.0.1",
"@visual-framework/vf-lede": "1.0.2",
"@visual-framework/vf-link": "2.0.2",
"@visual-framework/vf-logo": "1.5.1",
"@visual-framework/vf-navigation": "5.0.0",
"@visual-framework/vf-navigation": "5.0.3",
"@visual-framework/vf-no-js": "1.0.1",
"@visual-framework/vf-polyfill-js": "1.0.0-alpha.1",
"@visual-framework/vf-sass-config": "2.7.1",
"@visual-framework/vf-sass-config": "2.7.2",
"@visual-framework/vf-sass-utilities": "1.0.1",
"@visual-framework/vf-section-header": "1.5.5",
"@visual-framework/vf-stack": "3.0.0",
"@visual-framework/vf-summary": "1.6.1",
"@visual-framework/vf-summary-container": "1.0.0",
"@visual-framework/vf-table": "1.2.0-rc.3",
"@visual-framework/vf-tabs": "2.1.1",
"@visual-framework/vf-text": "1.1.0",
"@visual-framework/vf-table": "1.2.1",
"@visual-framework/vf-tabs": "2.1.5",
"@visual-framework/vf-text": "1.1.1",
"@visual-framework/vf-u-fullbleed": "1.2.2",
"@visual-framework/vf-utility-classes": "2.0.0",
"gulp-image-resize": "0.13.1",
Expand All @@ -79,9 +79,9 @@
"homepage": "https://github.com/visual-framework/vf-eleventy#readme",
"keywords": [],
"devDependencies": {
"@visual-framework/vf-badge": "2.0.1",
"@visual-framework/vf-button": "2.0.0-alpha.6",
"@visual-framework/vf-hero": "3.3.5",
"@visual-framework/vf-badge": "3.0.3",
"@visual-framework/vf-button": "3.0.1",
"@visual-framework/vf-hero": "4.0.3",
"@visual-framework/vf-link-list": "1.5.0"
}
}
76 changes: 38 additions & 38 deletions src/components/vf-componenet-rollup/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,62 +43,62 @@ button {
@import 'vf-cluster/vf-cluster.scss';
@import 'vf-stack/vf-stack.scss';
@import 'vf-flag/vf-flag.scss';
@import 'vf-sidebar/vf-sidebar.scss';
// @import 'vf-sidebar/vf-sidebar.scss';

@import 'embl-grid/embl-grid.scss';

/* All Visual Framework Elements */

@import 'vf-badge/vf-badge.scss';
@import 'vf-bookmark/vf-bookmark.scss';
@import 'vf-collapse/vf-collapse.scss';
// @import 'vf-bookmark/vf-bookmark.scss';
// @import 'vf-collapse/vf-collapse.scss';
@import 'vf-link/vf-link.scss';
@import 'vf-logo/vf-logo.scss';
@import 'vf-embed/vf-embed.scss';
@import 'embl-logo/embl-logo.scss';
@import 'vf-explainer/vf-explainer.scss';
// @import 'vf-embed/vf-embed.scss';
// @import 'embl-logo/embl-logo.scss';
// @import 'vf-explainer/vf-explainer.scss';
@import 'vf-form/vf-form.scss';
@import 'vf-button/vf-button.scss';
@import 'vf-figure/vf-figure.scss';
@import 'vf-list/vf-list.scss';
@import 'vf-blockquote/vf-blockquote.scss';
@import 'vf-divider/vf-divider.scss';
@import 'embl-conditional-edit/embl-conditional-edit.scss';
// @import 'embl-conditional-edit/embl-conditional-edit.scss';

/* All Visual Framework Blocks */

@import 'vf-box/vf-box.scss';

@import 'vf-breadcrumbs/vf-breadcrumbs.scss';
@import 'vf-breadcrumbs/vf-breadcrumbs--with-related.scss';
// @import 'vf-breadcrumbs/vf-breadcrumbs.scss';
// @import 'vf-breadcrumbs/vf-breadcrumbs--with-related.scss';

@import 'vf-card/vf-card.scss';
@import 'vf-card-container/vf-card-container.scss';

@import 'vf-discussion/vf-discussion.scss';
// @import 'vf-discussion/vf-discussion.scss';

@import 'vf-code-example/vf-code-example.scss';
@import 'vf-page-header/vf-page-header.scss';
// @import 'vf-page-header/vf-page-header.scss';
@import 'vf-link-list/vf-link-list.scss';
@import 'vf-hero/vf-hero.scss';

@import 'vf-lede/vf-lede.scss';

/* The vf-masthead is deprecated, but still (currently) compiled */
/* https://github.com/visual-framework/vf-core/pull/1406/ */
@import 'vf-masthead/vf-masthead.scss';
// @import 'vf-masthead/vf-masthead.scss';

@import 'vf-navigation/vf-navigation.scss';

@import 'vf-section-header/vf-section-header.scss';
@import 'vf-activity-list/vf-activity-list.scss';
@import 'vf-article-meta-information/vf-article-meta-information.scss';
// @import 'vf-activity-list/vf-activity-list.scss';
// @import 'vf-article-meta-information/vf-article-meta-information.scss';

@import 'vf-profile/vf-profile.scss';

@import 'vf-search/vf-search.scss';
// @import 'vf-search/vf-search.scss';

@import 'vf-social-links/vf-social-links.scss';
// @import 'vf-social-links/vf-social-links.scss';

@import 'vf-summary/vf-summary.scss';
@import 'vf-summary/vf-summary--article.scss';
Expand All @@ -109,71 +109,71 @@ button {
@import 'vf-summary/vf-summary--news.scss';
@import 'vf-summary/vf-summary--has-image.scss';

@import 'vf-video/vf-video.scss';
@import 'vf-video-teaser/vf-video-teaser.scss';
// @import 'vf-video/vf-video.scss';
// @import 'vf-video-teaser/vf-video-teaser.scss';
@import 'vf-global-header/vf-global-header.scss';
@import 'vf-tabs/vf-tabs.scss';
@import 'vf-table/vf-table.scss';
@import 'embl-breadcrumbs-lookup/embl-breadcrumbs-lookup.scss';
@import 'vf-pagination/vf-pagination.scss';
@import 'vf-pagination/vf-pagination--full.scss';
@import 'vf-back-to-top/vf-back-to-top.scss';
@import 'vf-progress-indicator/vf-progress-indicator.scss';
@import 'vf-dropdown/vf-dropdown.scss';
// @import 'embl-breadcrumbs-lookup/embl-breadcrumbs-lookup.scss';
// @import 'vf-pagination/vf-pagination.scss';
// @import 'vf-pagination/vf-pagination--full.scss';
// @import 'vf-back-to-top/vf-back-to-top.scss';
// @import 'vf-progress-indicator/vf-progress-indicator.scss';
// @import 'vf-dropdown/vf-dropdown.scss';

/* All Visual Framework Containers */

@import 'vf-activity-group/vf-activity-group.scss';
// @import 'vf-activity-group/vf-activity-group.scss';
@import 'vf-intro/vf-intro.scss';
@import 'embl-content-hub-loader/embl-content-hub-loader.scss';
// @import 'embl-content-hub-loader/embl-content-hub-loader.scss';

@import 'vf-banner/vf-banner.scss';
@import 'vf-banner/vf-banner--phase.scss';
@import 'vf-banner/vf-banner--alerts.scss';
@import 'vf-banner/vf-banner--fixed.scss';
@import 'vf-banner/vf-banner--gdpr.scss';

@import 'vf-banner/vf-banner-elixir.scss';
// @import 'vf-banner/vf-banner-elixir.scss';

@import 'vf-details/vf-details.scss';
// @import 'vf-details/vf-details.scss';

@import 'vf-news-container/vf-news-container.scss';
@import 'vf-video-container/vf-video-container.scss';
@import 'vf-footer/vf-footer.scss';
// @import 'vf-news-container/vf-news-container.scss';
// @import 'vf-video-container/vf-video-container.scss';
// @import 'vf-footer/vf-footer.scss';

@import 'vf-show-more/vf-show-more.scss';
// @import 'vf-show-more/vf-show-more.scss';

@import 'vf-mega-menu/vf-mega-menu.scss';
@import 'vf-tree/vf-tree.scss';
// @import 'vf-mega-menu/vf-mega-menu.scss';
// @import 'vf-tree/vf-tree.scss';

/* All Visual Framework Boilerplates */

// none here

/* All Visual Framework Deprecated components */

@import 'vf-deprecated/vf-deprecated.scss';
// @import 'vf-deprecated/vf-deprecated.scss';

/* EBI Specific components */
// ebi-header-footer is not enabled by default
// this may change as more EBI sites move to "pure" sVF 2.0
// @import 'ebi-header-footer/ebi-header-footer.scss';
@import 'ebi-vf1-integration/ebi-vf1-integration.scss';
// @import 'ebi-vf1-integration/ebi-vf1-integration.scss';

/* All Visual Framework Utility and high-specificity components */

@import 'vf-heading/vf-heading.scss';
@import 'vf-text/vf-text.scss';
@import 'vf-u-fullbleed/vf-u-fullbleed.scss';
@import 'vf-smooth-scroll/vf-smooth-scroll.scss';
// @import 'vf-smooth-scroll/vf-smooth-scroll.scss';

/* Visual Framework Utility Class Mixins */
@import 'vf-sass-config/mixins/vf-utility-mixins.scss';
@import 'vf-utility-classes/vf-utility-classes.scss';

// This is a demonstration of vf-core's ability to warn and proceed on missing
// sass imports
@import 'vf-somepattern/vf-i-dont-exist.scss';
// @import 'vf-somepattern/vf-i-dont-exist.scss';

// Local components
@import 'vf-sample/vf-sample.scss';
Expand Down
14 changes: 7 additions & 7 deletions src/components/vf-local-overrides/vf-local-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
// // if you need to import any other components' JS to use here
// import { vfOthercomponent } from 'vf-other-component/vf-other-component';

/**
* The global function for this component
* @example vfcomponentName(firstPassedVar)
* @param {string} [firstPassedVar] - An option to be passed
*/
/**
* The global function for this component
* @example vfcomponentName(firstPassedVar)
* @param {string} [firstPassedVar] - An option to be passed
*/
function vfLocalOverrides(firstPassedVar) {
firstPassedVar = firstPassedVar || 'defaultVal';
console.log('vfLocalOverrides invoked with a value of', firstPassedVar);
firstPassedVar = firstPassedVar || "defaultVal";
console.log("vfLocalOverrides invoked with a value of", firstPassedVar);
}

// // If you need to invoke the component by default
Expand Down
Loading

0 comments on commit 2ca863d

Please sign in to comment.