Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"presets": ["@knit/socks-react"],
"plugins": [
"transform-class-properties",
["transform-object-rest-spread", {
"useBuiltIns": true
}]
]
}
4 changes: 2 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
**/node_modules/*
dist/*
/node_modules
dist
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
extends: "@ncigdc/buildjs-react",
extends: "@knit/socks-react",
};
5 changes: 3 additions & 2 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[ignore]
.*\..*/.*
.*/node_modules/npm/.*
.*/node_modules/fbjs/.*
.*/node_modules/.*/test/.*
.*/dist/.*

[options]
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue
suppress_comment=\\(.\\|\n\\)*\\$FlowIgnore
suppress_comment=\\(.\\|\n\\)*\\$FlowIgnore
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarn.lock binary
39 changes: 11 additions & 28 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,53 +2,36 @@
logs
*.log
npm-debug.log*
lerna-debug.log
.history
yarn-error.log*
*.swp

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules
jspm_packages
bower_components
typings
/node_modules
/jspm_packages

# Optional npm cache directory
.npm
.jest
.history

# Optional REPL history
.node_repl_history

# Settings
.chrome
.vscode
# IDEs
.idea
.jest
*.iml
.vscode

# Output
# build folders
dist
umd

# OS
.DS_Store
lerna-debug.log
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__tests__
9 changes: 0 additions & 9 deletions Makefile

This file was deleted.

4 changes: 0 additions & 4 deletions lerna.json

This file was deleted.

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

9 changes: 9 additions & 0 deletions modules/node_modules/@oncojs/react-survivalplot/package.json

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

7 changes: 7 additions & 0 deletions modules/node_modules/@oncojs/survivalplot/package.json

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

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions modules/node_modules/webpack_entry/package.json

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

31 changes: 16 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
{
"private": true,
"version": "0.2.4-alpha.3",
"version": "0.3.3",
"repository": "oncojs/survivalplot",
"engines": {
"node": ">=5"
},
"author": {
"name": "OICR",
"url": "https://github.com/oncojs/"
},
"scripts": {
"postinstall": "lerna bootstrap --yes",
"start": "make watch-styles & make server",
"test": "make test-once"
"knit": "knit",
"styles:build": "node-sass modules/node_modules/webpack_entry/survivalplot.scss modules/node_modules/webpack_entry/survivalplot.css",
"styles:watch": "yarn styles:build -- -w",
"start": "yarn styles:watch & knit server",
"lint": "eslint --ext .js modules/node_modules || exit 0"
},
"dependencies": {
"d3": "3",
"react": "15",
"react-dom": "15"
"lodash": "^4.17.2",
"react": "^15.4.1"
},
"devDependencies": {
"@ncigdc/buildjs-dev-server": "0.3.8",
"@ncigdc/buildjs-scripts": "0.3.12",
"css-loader": "0.25.0",
"lerna": "2.0.0-beta.29",
"node-sass": "3.10.1",
"style-loader": "0.13.1"
"@knit/babel-preset-socks-react": "^0.0.37",
"@knit/eslint-config-socks-react": "^0.0.43",
"@knit/knit": "^0.0.43",
"babel-plugin-transform-class-properties": "^6.19.0",
"babel-plugin-transform-object-rest-spread": "^6.19.0",
"eslint": "^3.11.1",
"node-sass": "^3.13.0",
"react-dom": "^15.4.1"
}
}
3 changes: 0 additions & 3 deletions packages/react-survivalplot/.babelrc

This file was deleted.

16 changes: 0 additions & 16 deletions packages/react-survivalplot/package.json

This file was deleted.

13 changes: 0 additions & 13 deletions packages/root/package.json

This file was deleted.

3 changes: 0 additions & 3 deletions packages/survivalplot/.babelrc

This file was deleted.

17 changes: 0 additions & 17 deletions packages/survivalplot/package.json

This file was deleted.

Loading