Skip to content
Open
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
3 changes: 0 additions & 3 deletions .babelrc

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ clean::
lib/%.js: src/%.js
@echo "Building $<"
@mkdir -p $(@D)
@$(BIN)/babel $(BABEL_OPTIONS) -o $@ $<
@(cross-env NODE_ENV=build $(BIN)/babel $(BABEL_OPTIONS) -o $@ $<)

lib/%.js.flow: src/%.js.flow
@echo "Building $<"
Expand Down
23 changes: 22 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,25 @@
"lib"
],
"scripts": {
"test": "make lint test"
"build": "make build",
"test": "yarn build && jest && eslint src"
},
"babel": {
"env": {
"build": {
"presets": [
"prometheusresearch"
]
},
"test": {
"presets": [
"react"
],
"plugins": [
"transform-class-properties"
]
}
}
},
"repository": {
"type": "git",
Expand All @@ -31,9 +49,12 @@
"babel-cli": "^6.10.1",
"babel-core": "^6.10.4",
"babel-jest": "^20.0.3",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-preset-prometheusresearch": "^0.1.0",
"babel-preset-react": "^6.24.1",
"benchmark": "^2.1.0",
"create-react-app": "^0.2.0",
"cross-env": "^5.1.1",
"derivable": "2.0.0-beta.1",
"doctoc": "^1.2.0",
"eslint": "^3.0.1",
Expand Down
12 changes: 6 additions & 6 deletions src/__tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
* @copyright 2016-present, Prometheus Research, LLC
*/

import React from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
import {atom} from 'derivable';
import * as Immutable from 'immutable';
const React = require('react');
const ReactDOM = require('react-dom');
const PropTypes = require('prop-types');
const {atom} = require('derivable');
const Immutable = require('immutable');

import {shallowEqual, reactive, pure} from '../index';
const {shallowEqual, reactive, pure} = require('../../');

function markup(element) {
return element.innerHTML.replace(/ data\-reactroot="[^"]*"/g, '');
Expand Down
31 changes: 30 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ babel-preset-prometheusresearch@^0.1.0:
babel-preset-react "^6.5.0"
babel-preset-stage-1 "^6.5.0"

babel-preset-react@^6.5.0:
babel-preset-react@^6.24.1, babel-preset-react@^6.5.0:
version "6.24.1"
resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
dependencies:
Expand Down Expand Up @@ -1234,13 +1234,28 @@ create-react-class@^15.6.0:
loose-envify "^1.3.1"
object-assign "^4.1.1"

cross-env@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.1.tgz#b6d8ab97f304c0f71dae7277b75fe424c08dfa74"
dependencies:
cross-spawn "^5.1.0"
is-windows "^1.0.0"

cross-spawn@^4.0.0:
version "4.0.2"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
dependencies:
lru-cache "^4.0.1"
which "^1.2.9"

cross-spawn@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
dependencies:
lru-cache "^4.0.1"
shebang-command "^1.2.0"
which "^1.2.9"

[email protected]:
version "2.0.5"
resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
Expand Down Expand Up @@ -2244,6 +2259,10 @@ is-utf8@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"

is-windows@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"

[email protected], isarray@^1.0.0, isarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
Expand Down Expand Up @@ -3451,6 +3470,16 @@ setimmediate@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"

shebang-command@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
dependencies:
shebang-regex "^1.0.0"

shebang-regex@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"

shelljs@^0.7.5:
version "0.7.8"
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
Expand Down