Skip to content
Snippets Groups Projects
Commit bdcf33af authored by Tom Robinson's avatar Tom Robinson
Browse files

Merge branch 'flow' of github.com:metabase/metabase into dashboard-filters

parents 67a7f04a 6fc53a7e
No related branches found
No related tags found
No related merge requests found
Showing
with 29 additions and 7 deletions
{
"plugins": ["transform-decorators-legacy"],
"plugins": ["transform-flow-strip-types", "transform-decorators-legacy"],
"presets": ["es2015", "stage-0", "react"],
"env": {
"development": {
......
......@@ -34,7 +34,9 @@
"react/display-name": 1,
"react/prop-types": 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": {
"angular": false
......@@ -46,7 +48,8 @@
},
"parser": "babel-eslint",
"plugins": [
"react"
"react",
"flow-vars"
],
"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",
"smartPath":"containers",
"dumbPath":"components",
......
......@@ -2,7 +2,7 @@ const path = require('path');
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 = {
localIdentName: "[name]__[local]___[hash:base64:5]",
......
......@@ -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));
......@@ -37,7 +37,7 @@ test:
# 4) runs Eastwood linter, Bikeshed linter, docstring-checker & ./bin/reflection-linter
# 5) runs JS linter + JS test
# 6) runs lein uberjar. (We don't run bin/build because we're not really concerned about `npm install` (etc) in this test, which runs elsewhere)
- case $CIRCLE_NODE_INDEX in 0) ENGINES=h2,mongo,mysql,bigquery lein test ;; 1) ENGINES=h2,sqlserver MB_DB_TYPE=postgres MB_DB_DBNAME=circle_test MB_DB_PORT=5432 MB_DB_USER=ubuntu MB_DB_HOST=localhost lein test ;; 2) ENGINES=h2,crate,postgres,sqlite MB_DB_TYPE=mysql MB_DB_DBNAME=circle_test MB_DB_PORT=3306 MB_DB_USER=ubuntu MB_DB_HOST=localhost lein test ;; 3) ENGINES=h2,redshift,druid lein test ;; 4) lein eastwood && lein bikeshed && lein docstring-checker && ./bin/reflection-linter ;; 5) npm install && npm run lint && npm run build && npm run test ;; 6) lein uberjar ;; esac:
- case $CIRCLE_NODE_INDEX in 0) ENGINES=h2,mongo,mysql,bigquery lein test ;; 1) ENGINES=h2,sqlserver MB_DB_TYPE=postgres MB_DB_DBNAME=circle_test MB_DB_PORT=5432 MB_DB_USER=ubuntu MB_DB_HOST=localhost lein test ;; 2) ENGINES=h2,crate,postgres,sqlite MB_DB_TYPE=mysql MB_DB_DBNAME=circle_test MB_DB_PORT=3306 MB_DB_USER=ubuntu MB_DB_HOST=localhost lein test ;; 3) ENGINES=h2,redshift,druid lein test ;; 4) lein eastwood && lein bikeshed && lein docstring-checker && ./bin/reflection-linter ;; 5) npm install && npm run lint && npm run flow && npm run build && npm run test ;; 6) lein uberjar ;; esac:
parallel: true
deployment:
master:
......
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