Skip to content
Snippets Groups Projects
Commit 10278d09 authored by Cam Saül's avatar Cam Saül
Browse files

Merge branch 'master' into 2635-failing-test [ci skip]

parents 8abafbb8 f1af87c6
No related branches found
No related tags found
No related merge requests found
Showing
with 28 additions and 7 deletions
{ {
"plugins": ["transform-decorators-legacy"], "plugins": ["transform-flow-strip-types", "transform-decorators-legacy"],
"presets": ["es2015", "stage-0", "react"], "presets": ["es2015", "stage-0", "react"],
"env": { "env": {
"development": { "development": {
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
(match 1) (match 1)
(match-$ 1) (match-$ 1)
(org-perms-case 1) (org-perms-case 1)
(post-insert 1)
(post-select 1) (post-select 1)
(pre-cascade-delete 1) (pre-cascade-delete 1)
(pre-insert 1) (pre-insert 1)
......
...@@ -34,7 +34,9 @@ ...@@ -34,7 +34,9 @@
"react/display-name": 1, "react/display-name": 1,
"react/prop-types": 0, "react/prop-types": 0,
"react/no-did-mount-set-state": 0, "react/no-did-mount-set-state": 0,
"react/no-did-update-set-state": 0 "react/no-did-update-set-state": 0,
"flow-vars/define-flow-type": 1,
"flow-vars/use-flow-type": 1
}, },
"globals": { "globals": {
"angular": false "angular": false
...@@ -46,7 +48,8 @@ ...@@ -46,7 +48,8 @@
}, },
"parser": "babel-eslint", "parser": "babel-eslint",
"plugins": [ "plugins": [
"react" "react",
"flow-vars"
], ],
"extends": ["eslint:recommended", "plugin:react/recommended"] "extends": ["eslint:recommended", "plugin:react/recommended"]
} }
[ignore]
.*/node_modules/react/node_modules/.*
.*/node_modules/postcss-import/node_modules/.*
.*/node_modules/fixed-data-table/.*
.*/node_modules/@kadira/storybook/node_modules/.*
[include]
[libs]
./frontend/interfaces
[options]
module.system.node.resolve_dirname=node_modules
module.system.node.resolve_dirname=frontend/src
esproposal.decorators=ignore
esproposal.class_static_fields=enable
esproposal.class_instance_fields=enable
suppress_comment= \\(.\\|\n\\)*\\$FlowFixMe
{ {
"sourceBase":"frontend/src", "sourceBase":"frontend/src/metabase",
"testBase":"frontend/test/unit", "testBase":"frontend/test/unit",
"smartPath":"containers", "smartPath":"containers",
"dumbPath":"components", "dumbPath":"components",
......
...@@ -2,7 +2,7 @@ const path = require('path'); ...@@ -2,7 +2,7 @@ const path = require('path');
const WEBPACK_CONFIG = require("../webpack.config"); const WEBPACK_CONFIG = require("../webpack.config");
var SRC_PATH = path.resolve(__dirname, '../frontend/src'); var SRC_PATH = path.resolve(__dirname, '../frontend/src/metabase');
var CSS_CONFIG = { var CSS_CONFIG = {
localIdentName: "[name]__[local]___[hash:base64:5]", localIdentName: "[name]__[local]___[hash:base64:5]",
......
...@@ -44,4 +44,4 @@ orderedEmoji.forEach(function(emoji) { ...@@ -44,4 +44,4 @@ orderedEmoji.forEach(function(emoji) {
} }
}); });
fs.writeFileSync("frontend/src/lib/emoji.json", JSON.stringify(results)); fs.writeFileSync("frontend/src/metabase/lib/emoji.json", JSON.stringify(results));
declare var angular: any;
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment