74 Commits

Author SHA1 Message Date
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
Simon Bailey
9a16ff8dfb Merge pull request #70 from oliveiraethales/oliveiraethales-use-strict-main
Add 'use strict' to main.js
2015-03-07 10:24:50 +00:00
Simon Bailey
41ab559e7f Merge pull request #66 from joe5yellow/master
Fix missing comma and styles paths issue in #36
2015-03-07 10:24:39 +00:00
Tháles de Oliveira
3d1984f755 Adding 'use strict' to main.js 2015-03-06 00:12:38 -03:00
Zhao Min
5ea31a6035 Fix styles paths in template App.js 2015-02-25 15:42:59 +08:00
Zhao Min
4f61fa4e2e Fix missing comma 2015-02-25 15:42:15 +08: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
cbef965577 Use provided 'components' alias within app files 2015-02-20 17:09:55 +03:00
ColCh
12e16a61a4 Provide 'components' alias within configs 2015-02-20 17:09:32 +03:00
ColCh
dde3dd7b73 Use provided 'style' alias within Component file 2015-02-20 16:56:43 +03:00
ColCh
68a1dcf447 Use provided 'style' alias within App file 2015-02-20 16:56:33 +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
2659849c44 refactor: remove exposing React to devtools
https://github.com/newtriks/generator-react-webpack/pull/57#issuecomment-74627216
Signed-off-by: Simon Bailey <simon@newtriks.com>
2015-02-17 09:58:34 +00: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
509a23d0ab fix the require's style path when creating sub-foldered components
Currently `yo react-webpack:component Foo/Bar/Blam` will create a
component that containing an invalid require path of `'../../styles/Blam.scss'` instead of
`'../../styles/Foo/Bar/Blam.scss'`
2015-02-04 13:29:42 -07:00
Chris Olsen
fa3caf854e add whitespace between style name and opening curly brace 2015-02-01 09:42:23 -07:00
Chris Olsen
de96b238eb prevent unwanted linebreaks from being added to generated component js file 2015-02-01 09:39:46 -07:00
Chris Olsen
0734dace64 add scss format 2015-01-17 14:56:19 -07:00
andrewliebchen
4c93d0c1e9 Fix React Router after upgrade 2015-01-10 16:59:02 -08:00
Victor Homyakov
ff6f9d5360 Fix warning "Something is calling a React component directly" 2015-01-09 20:29:51 +03:00
Simon Bailey
014bb0266d Merge pull request #40 from victor-homyakov/patch-2
Fix error and warning in test
2015-01-09 17:27:01 +00:00
Victor Homyakov
d3218561b7 Fix error and warning in test
Fix `jsx` extension
Fix warning "Something is calling a React component directly"
2015-01-09 20:25:47 +03: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
505d7277e9 generating es6 modules if --es6 flag is used 2014-12-10 12:45:17 +01: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
ColCh
ac43179354 Use corresponding stylesheet depending on config variable 2014-11-02 12:22:28 +03:00