Skip to content

Commit defb243

Browse files
committed
Still 9 tests failing but the build process is working now with webpack 2.
1 parent b88abe3 commit defb243

35 files changed

+3639
-4322
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"presets": [
3-
"es2015"
3+
["es2015", { "modules": false }]
44
]
55
}

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ We love contributions!
66

77
The reason for this is that we're trying to use
88
[git flow](http://danielkummer.github.io/git-flow-cheatsheet/), and it makes merging your pull
9-
request heck of a lot easier for us.
9+
request a heck of a lot easier for us.
1010

11-
Please avoid including anything from the `dist/` directory as that can make merging harder, and we
11+
Please **avoid including anything from the `dist/`** directory as that can make merging harder, and we
1212
always generate these files when we make a new release.
1313

14-
**We're currently in transitioning where a large part of the code, i.e. the bootstrap decorator, has been moved to it's own repo. It's here [github.com/Textalk/angular-schema-form-bootstrap](https://github.com/Textalk/angular-schema-form-bootstrap)**
14+
**The bootstrap decorator, has been moved to it's own repo. It's here [github.com/json-schema-form/angular-schema-form-bootstrap](https://github.com/json-schema-form/angular-schema-form-bootstrap)**
1515

1616
Feel free to submit issues on the main repo anyway though.
1717

@@ -23,4 +23,4 @@ easy and fast for us to merge it!
2323

2424
Also consider running any code through the code style checker [jscs](https://github.com/mdevils/node-jscs)
2525
(or even better use it in your editor) with preset set to `google`. You can also use `gulp jscs` to
26-
check your code.
26+
check your code. I hope to set up ESLint in the not too distant future.

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ obviously need the same version!
2222
The new Webpack compilation has made it easier to manage files and code and run build
2323
scripts, but it is still not easy enough for users unfamiliar with it... yet.
2424

25+
**NOTE** in order to work simultaneously with ```json-schema-form-core``` you must have it cloned
26+
as a sibling directory to this one to build this library **OR** npm install the version you wish to build with.
27+
28+
Webpack now generates a header to indicate version and date of build. **Do not create PR with the DIST folder.**
29+
2530
### Add-on
2631
To see how to make an **add-on** work I have now included the **calculate** add-on file within the **examples/add-on** directory.
2732

0 commit comments

Comments
 (0)