57 Commits

Author SHA1 Message Date
Simon Bailey
f26f4c268e Merge pull request #86 from DanielMSchmidt/bugfix/sass-loader-now-expects-sass
Sass loader now expects sass files to contain sass instead of scss
2015-04-11 11:11:09 +01:00
Daniel Schmidt
ab25717ed9 updated the sass loader version, so installations stops failing 2015-04-10 08:18:11 -04:00
Daniel Schmidt
deeee48760 Fixed sass loader, it now expects sass files to contain sass instead of scss 2015-04-10 08:14:27 -04:00
Yonatan Schreiber
f7bb3c2b80 add 'architecture' question, Reflux option, and related store and actionCreator 2015-04-04 14:42:52 +03:00
Justin Niessner
7721c59253 Merge from upstream/master and resolve merge conflicts. 2015-04-02 15:38:38 -04:00
Simon Bailey
140e0d3fb2 Merge pull request #82 from Semigradsky/master
Moved `normalize.css` to dependencies
2015-04-02 12:02:46 +01:00
Semigradsky
ba61ca1bfb Moved normalize.css to dependencies 2015-03-31 18:42:16 +03:00
Justin Niessner
53b262ae3c Switch the generation of everything so we generate tests and they can actually pass. 2015-03-26 23:09:45 -04:00
Justin Niessner
3cf4d739e3 Add flux support including generators 2015-03-25 22:42:02 -04:00
Raymond Ha
9f89b6a23b Use babel-loader instead of jsx-loader 2015-03-19 12:03:21 -04:00
Kevin Vicrey
df5cab23d5 Fixed path error for test Grunt task 2015-03-15 14:27:57 -04:00
Federico Rampazzo
3c2a2402c5 Merge pull request #1 from framp/patch-1
merge
2015-02-22 19:23:17 +00:00
Federico Rampazzo
b172bdac7f fix _webpack.config.js 2015-02-22 19:21:23 +00:00
Federico Rampazzo
2f88faf693 fix _webpack.dist.config.js alias 2015-02-22 19:18:42 +00:00
Simon Bailey
58a8f74b92 Merge pull request #61 from pherris/master
make jsx hint default to resolve warnings when compiling
2015-02-20 17:52:44 +00:00
ColCh
12e16a61a4 Provide 'components' alias within configs 2015-02-20 17:09:32 +03:00
ColCh
4980430552 Added alias definition for 'styles' in configs 2015-02-20 16:56:00 +03:00
Andrew
9c3473b8d1 make jsx hint default to resolve warnings when compiling 2015-02-17 13:58:27 -08:00
Simon Bailey
c5aa8e1e1a Merge branch 'exclude-node_modules' of https://github.com/Shraymonks/generator-react-webpack into Shraymonks-exclude-node_modules
Signed-off-by: Simon Bailey <simon@newtriks.com>

Conflicts:
	templates/common/_webpack.config.js
	templates/common/_webpack.dist.config.js
2015-02-17 09:55:40 +00:00
Simon Bailey
e9a3391918 Merge pull request #58 from Shraymonks/fix-jshint-preloader
Fix jshint preloader
2015-02-17 09:51:16 +00:00
Simon Bailey
a6444f37b5 Merge pull request #56 from jamesmanning/patch-1
simple typo fix
2015-02-17 09:50:50 +00:00
Raymond Ha
43736a3d36 Exclude node_modules from js loaders 2015-02-17 02:01:01 -05:00
Raymond Ha
945bb11da6 Fix jshint preloader 2015-02-17 01:58:10 -05:00
James Manning
58b4d073e1 simple typo fix 2015-02-17 00:29:27 -05:00
Raymond Ha
8715689944 6to5 rename to Babel 2015-02-15 15:25:07 -05:00
Simon Bailey
ee8003a48f fix: fixes #46
Signed-off-by: Simon Bailey <simon@newtriks.com>
2015-02-05 13:56:19 +00:00
Chris Olsen
0734dace64 add scss format 2015-01-17 14:56:19 -07:00
Victor Homyakov
ac3ad84cbd Use jsx-loader?harmony as in webpack.config.js 2015-01-09 20:07:31 +03:00
andrewliebchen
83454b5886 Update to React 0.12.2 2015-01-06 21:43:19 -08:00
Emil Stenberg
7421ef680f added 6to5 loader in webpack configs 2014-12-10 12:26:46 +01:00
Emil Stenberg
c3f6abc95e adding 6to5 loader 2014-12-10 10:45:45 +01:00
Emil Stenberg
188b523629 passing es6 option to template 2014-12-10 10:42:06 +01:00
Emil Stenberg
33e42f3ede added flag --es6 2014-12-10 09:48:37 +01:00
ColCh
651ff70086 Inline pkg.mainInput 2014-11-02 16:16:56 +03:00
ColCh
ab98751f90 Use styles within templates 2014-11-02 16:08:48 +03:00
ColCh
6442075d71 Move webpack configs to tempates 2014-11-02 16:03:43 +03:00
Simon Bailey
286d175757 Merge pull request #29 from ColCh/feature/live-edit
Use HMR api (livereload for app)
2014-10-03 22:04:33 +01:00
ColCh
026455c4e7 Backport 58dddfd80d 2014-09-29 19:32:18 +04:00
ColCh
18ff31dd61 Move react-hot-loader to devDependencies 2014-09-29 19:19:01 +04:00
Brandon Smyth
83b06593c5 Update karma-webpack depency to fix confusing error
Using karma-webpack-plugin 1.0.0 led to the following error from grunt
test immediately after generating.  I found the following fix in
karma-webpack that had not been included in karma-webpack-plugin because
it has since become karma-webpack.

error:
INFO [PhantomJS 1.9.7 (Mac OS X)]: Connected on socket 33J3dAUsvdMT6Io38nxm with id 51124214
PhantomJS 1.9.7 (Mac OS X) ERROR
  TEST RUN WAS CANCELLED because this file contains some errors:
      /.../eventlist/test/spec/components/EventlistApp.js

fix:
ad3be8452f
2014-09-28 23:05:42 -07:00
ColCh
43f7dbffdc Add and use Hot Module Replacement plugin and react-hot-loader 2014-09-27 19:23:34 +04:00
Simon Bailey
a111b5bf5d fix: space in package.json mainInput field
Signed-off-by: Simon Bailey <simon@newtriks.com>
2014-09-26 14:34:55 +01:00
Simon Bailey
967706e942 feat: added react-router
Signed-off-by: Simon Bailey <simon@newtriks.com>
2014-09-26 14:23:08 +01:00
Simon Bailey
9728ed0efe chore: update react patch version
Signed-off-by: Simon Bailey <simon@newtriks.com>
2014-09-25 21:07:06 +01:00
Simon Bailey
c3d968e979 chore: update project deps
Signed-off-by: Simon Bailey <simon@newtriks.com>
2014-09-25 21:04:39 +01:00
Simon Bailey
652ea1f97c Merge branch 'master' into version-updates 2014-09-01 08:35:02 +01:00
Simon Bailey
69c7f91ff0 Merge pull request #24 from teawaterwire/url-loader
Use url-loader
2014-09-01 08:32:42 +01:00
Theophile Villard
26c229682d Use url-loader 2014-08-24 19:11:46 +02:00
Gigi
609c56fe88 add missing resolve section 2014-08-22 15:39:29 -07:00
Simon Bailey
94e4aff2fa Untested updates for project package versions
Signed-off-by: Simon Bailey <simon@newtriks.com>
2014-08-17 10:53:49 +01:00