Skip to content
This repository has been archived by the owner on Mar 18, 2024. It is now read-only.

Commit

Permalink
Merge pull request #249 from Financial-Times/ftdomdelegate-bump
Browse files Browse the repository at this point in the history
Allow version 2 or 3 of ftdomdelegate.
  • Loading branch information
notlee committed Apr 9, 2019
2 parents 75e3bba + cbece0e commit b820c89
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
],
"ignore": [],
"dependencies": {
"ftdomdelegate": "^2.0.3",
"ftdomdelegate": ">=2.2.0 <4.0.0",
"o-viewport": ">=1.5.0 < 4",
"o-grid": "^4.0.0",
"o-visual-effects": "^2.0.0",
Expand Down
6 changes: 5 additions & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ let options = {
webpack: {
resolve: {
plugins: [new BowerResolvePlugin()],
modules: ['bower_components', 'node_modules']
modules: ['bower_components', 'node_modules'],
descriptionFiles: ['bower.json', 'package.json'],
mainFields: ['browser', 'main'],
mainFiles: ['index', 'main'],
extensions: ['.js', '.json']
},
mode: 'development'
},
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
"bundlesize": "^0.17.0",
"cypress": "^3.1.5",
"dotenv": "^6.1.0",
"eslint": "^5.9.0",
"eslint": "^5.16.0",
"fetch-mock": "^5.1.1",
"geckodriver": "^1.16.0",
"geckodriver": "^1.16.1",
"genversion": "^2.1.0",
"isomorphic-fetch": "^2.0.0",
"istanbul": "^0.4.2",
Expand All @@ -56,7 +56,7 @@
"pre-git": "^3.17.1",
"qunitjs": "^1.20.0",
"release-it": "^7.6.1",
"snyk": "^1.110.2",
"snyk": "^1.149.0",
"watchify": "^3.11.0",
"webpack": "^4.26.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/js/data-providers/krux.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint new-cap: 0 */
import utils from '../utils';
import config from '../config';
import { Delegate } from 'ftdomdelegate';
import Delegate from 'ftdomdelegate';

/**
* The Krux class defines an FT.ads.krux instance
Expand Down

0 comments on commit b820c89

Please sign in to comment.