Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
Fix #3771 Update dependencies except webpack (#3815)
Browse files Browse the repository at this point in the history
This commit was authored by meandavejustice, but there was some git weirdness, so I am helping out by squashing it into a new commit on top of master.
  • Loading branch information
fzzzy authored and Dave Justice committed Aug 22, 2018
1 parent 94faa7a commit 60bdfd2
Show file tree
Hide file tree
Showing 86 changed files with 4,831 additions and 4,435 deletions.
7 changes: 5 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ env:
node: true
browser: true

settings:
react:
version: "16.0.0"

globals:
navigator: true
document: true
Expand All @@ -23,11 +27,10 @@ globals:
Promise: true

parserOptions:
ecmaVersion: 6
ecmaVersion: 9
sourceType: module
ecmaFeatures:
jsx: true
experimentalObjectRestSpread: true

rules:
"import/prefer-default-export": [0]
Expand Down
2 changes: 1 addition & 1 deletion addon/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function getInstalledTxpAddons() {
const txpAddons = resources.experiments.map((exp) => exp.id);

return installed.filter(function(n) {
return txpAddons.indexOf(n) !== -1;
return txpAddons.includes(n);
});
});
}
Expand Down
207 changes: 205 additions & 2 deletions addon/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"author": "Mozilla (https://mozilla.org/)",
"license": "MPL-2.0",
"devDependencies": {
"babel-eslint": "^8.2.6",
"cross-env": "5.0.1",
"eslint": "4.15.0",
"eslint-plugin-import": "2.8.0",
Expand Down
1 change: 0 additions & 1 deletion bin/build-content-json.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env node
const globby = require('globby');
const YAML = require("yamljs");
const ContentTransformerPlugin = require(__dirname + "/../frontend/lib/content-transformer-plugin");
const buildJSON = require(__dirname + "/../frontend/lib/content/json");
Expand Down
1 change: 0 additions & 1 deletion bin/extract-strings.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env node
const globby = require('globby');
const YAML = require("yamljs");
const ContentTransformerPlugin = require(__dirname + "/../frontend/lib/content-transformer-plugin");
const buildL10N = require(__dirname + "/../frontend/lib/content/l10n");
Expand Down
1 change: 1 addition & 0 deletions docs/metrics/ga.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ Here are the current events on the website as of this writing, grouped by their
| Cancel Firefox permission dialog | Cancel From Permission | `{experiment title}`
| Send experiment app link to device | mobile send click | `{experiment title}` |
| Click app store links on experiment page | mobile store click | `{experiment title}` `{ios \|\| android}` |
| Click Download Firefox in Promo on experiment page | download firefox click | Download Firefox at `${title}`|

#### `SMS Modal Interactions`
| Description | `eventAction` | `eventLabel` |
Expand Down
13 changes: 0 additions & 13 deletions flow-typed/classnames.js

This file was deleted.

4 changes: 0 additions & 4 deletions flow-typed/html-react-parser.js

This file was deleted.

73 changes: 73 additions & 0 deletions flow-typed/html-react-parser_vx.x.x.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// flow-typed signature: e2997cda0412ba771b3b6d9f311e9650
// flow-typed version: <<STUB>>/html-react-parser_v^0.4.1/flow_v0.64.0

/**
* This is an autogenerated libdef stub for:
*
* 'html-react-parser'
*
* Fill this stub out by replacing all the `any` types.
*
* Once filled out, we encourage you to share your work with the
* community by sending a pull request to:
* https://github.com/flowtype/flow-typed
*/

declare module 'html-react-parser' {
declare module.exports: any;
}

/**
* We include stubs for each file inside this npm package in case you need to
* require those files directly. Feel free to delete any files that aren't
* needed.
*/
declare module 'html-react-parser/dist/html-react-parser' {
declare module.exports: any;
}

declare module 'html-react-parser/dist/html-react-parser.min' {
declare module.exports: any;
}

declare module 'html-react-parser/lib/attributes-to-props' {
declare module.exports: any;
}

declare module 'html-react-parser/lib/dom-to-react' {
declare module.exports: any;
}

declare module 'html-react-parser/lib/property-config' {
declare module.exports: any;
}

declare module 'html-react-parser/lib/utilities' {
declare module.exports: any;
}

// Filename aliases
declare module 'html-react-parser/dist/html-react-parser.js' {
declare module.exports: $Exports<'html-react-parser/dist/html-react-parser'>;
}
declare module 'html-react-parser/dist/html-react-parser.min.js' {
declare module.exports: $Exports<'html-react-parser/dist/html-react-parser.min'>;
}
declare module 'html-react-parser/index' {
declare module.exports: $Exports<'html-react-parser'>;
}
declare module 'html-react-parser/index.js' {
declare module.exports: $Exports<'html-react-parser'>;
}
declare module 'html-react-parser/lib/attributes-to-props.js' {
declare module.exports: $Exports<'html-react-parser/lib/attributes-to-props'>;
}
declare module 'html-react-parser/lib/dom-to-react.js' {
declare module.exports: $Exports<'html-react-parser/lib/dom-to-react'>;
}
declare module 'html-react-parser/lib/property-config.js' {
declare module.exports: $Exports<'html-react-parser/lib/property-config'>;
}
declare module 'html-react-parser/lib/utilities.js' {
declare module.exports: $Exports<'html-react-parser/lib/utilities'>;
}
Loading

0 comments on commit 60bdfd2

Please sign in to comment.