48 Commits

Author SHA1 Message Date
Semigradsky
ba61ca1bfb Moved normalize.css to dependencies 2015-03-31 18:42:16 +03: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
Stefan Sobering
c699088dca Fix incorrect spelling of "mimetype" 2014-08-16 18:56:14 -05:00
Ryan Swanson
e970c362b7 Adding resolve to the config so it can find new Jsx components. 2014-08-03 10:25:45 -06:00
Simon Bailey
f8e3d3c6eb Removed manual wrapping of JSX code to bypass jshint errors and advised usage of JSXHint.
Signed-off-by: Simon Bailey <simon@newtriks.com>
2014-05-15 20:49:21 +01:00
Simon Bailey
d6d216d05d Squashed commit of the following:
commit 25ef9a176ee9bab902579f79415bd6047a77a62f
Author: Simon Bailey <simon@newtriks.com>
Date:   Thu May 15 19:51:45 2014 +0100

    Updated README

    Signed-off-by: Simon Bailey <simon@newtriks.com>

commit 1b0020c8fd248bc0dc892bed1f3e315867378274
Merge: d8fd494 c468b98
Author: Edd <accounts@edd.fm>
Date:   Sat Apr 26 11:13:52 2014 +0100

    Merged with Master

commit d8fd494478cb7fd0d97a47a90986f4c1b29eb996
Author: Edd <accounts@edd.fm>
Date:   Thu Apr 24 22:09:19 2014 +0100

    Trimming redundant options from Gruntfile

commit b5015ae42b0beb770ae1b146f152b5f38764987e
Author: Edd <accounts@edd.fm>
Date:   Sun Mar 30 21:32:14 2014 +0100

    Moved development mode to webpack-dev-server to imrove rebuild times

commit 7d31ade8085a8d415b95c67dba69ae5157ebf9b4
Author: Edd <accounts@edd.fm>
Date:   Wed Feb 26 00:18:56 2014 +0000

    Changed JSX filenames to .jsx over .js

commit 00faa6182b6cb4ae46b05dd12db1e73da4b47953
Author: Edd <accounts@edd.fm>
Date:   Mon Feb 24 23:39:18 2014 +0000

    Updated engines & Travis build targets

commit e58e0d70639f3c3e9acc7d085b6a795365a140a6
Author: Edd <accounts@edd.fm>
Date:   Mon Feb 24 23:26:04 2014 +0000

    Added auto generation of a template CSS file for a component

commit f6c67351aead570224b2457261d457a1954277dc
Author: Edd <accounts@edd.fm>
Date:   Mon Feb 24 00:06:42 2014 +0000

    Updated default app test

commit 996d769685d1a4f20ae2c4117422790bbc347594
Author: Edd <accounts@edd.fm>
Date:   Sun Feb 23 23:32:37 2014 +0000

    Added test for default main component (currently identical to any other component tests)

commit 31dfcbaff6ee9aef339886897e053a339f98021b
Author: Edd <accounts@edd.fm>
Date:   Sun Feb 23 22:54:04 2014 +0000

    Moved webpack configuration to a separate file

    - Added webpack config file
    - Added Uglify to webpack config
    - Added source maps in webpack config

    Moved entry file back in to Gruntfile

commit 6b3a3e92b80f3121e1128e4f166cf36aa32cfa26
Author: Edd <accounts@edd.fm>
Date:   Sun Feb 23 17:23:07 2014 +0000

    Added distribution folder & Grunt tasks to deal with it

    - Created Distribution build folder (script link broken)
    - Added grunt-contrib-copy
    - Added grunt-uglify
    - Bumped React version number
    - Switched source map types

Signed-off-by: Simon Bailey <simon@newtriks.com>
2014-05-15 19:52:23 +01:00
Simon Bailey
73a21873ee Updated react, grunt and web pack. Removed jsx-loader pulling from github.
Signed-off-by: Simon Bailey <simon@newtriks.com>
2014-04-02 07:02:49 +01:00
Simon Bailey
fb2e98d63e Project test configuration and updated README
Signed-off-by: Simon Bailey <simon@newtriks.com>
2014-01-08 11:10:07 +00:00
Simon Bailey
b1562cd74c Basic project generator setup
TODO:

- App tests
- Generator tests
- Component generator

Signed-off-by: Simon Bailey <simon@newtriks.com>
2014-01-07 20:00:49 +00:00