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
5 changes: 2 additions & 3 deletions js/app.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
window.React = require('react');
// combine react & react-dom/server to emulate React 0.12.x
window.React = Object.assign(require('react'), require('react-dom/server'));
var App = require('./components/App.react');
var css = require('./../css/app.css');
require('../img/social_media.png');

React.initializeTouchEvents(true);

// Render the app component (js/components/App.react.js)
React.render(
<App />,
Expand Down
2 changes: 1 addition & 1 deletion js/constants/AppConstants.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var keyMirror = require('react/lib/keyMirror');
var keyMirror = obj => Object.keys(obj).reduce( (acc, key) => ((acc[key]=key), acc), {} );

// Define actions
module.exports = keyMirror({
Expand Down
2 changes: 1 addition & 1 deletion js/stores/AppStore.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions makewebpackconfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ module.exports = function(options) {
path: path.resolve(__dirname, 'build'),
filename: "js/bundle.js"
},
resolve: {
alias: {
react: 'preact-compat',
'react-dom': 'preact-compat'
}
},
module: {
loaders: [{
test: /\.js$/, // Transform all .js files required somewhere within an entry point...
Expand Down
10 changes: 2 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"main": "js/app.js",
"dependencies": {
"flux": "^2.0.0",
"react": "^0.12.0"
"preact": "^6.0.0",
"preact-compat": "^3.0.0"
},
"devDependencies": {
"appcache-webpack-plugin": "1.2.1",
Expand All @@ -31,7 +32,6 @@
"postcss-nested": "^1.0.0",
"postcss-reporter": "^0.4.0",
"postcss-simple-vars": "^0.3.0",
"react-hot-loader": "^1.2.8",
"style-loader": "^0.12.3",
"url-loader": "^0.5.6",
"webpack": "^1.10.5",
Expand All @@ -41,12 +41,6 @@
"start": "node server.js",
"build": "rm -rf build | webpack --config webpack.build.config.js --progress --colors -p"
},
"browserify": {
"transform": [
"reactify",
"envify"
]
},
"repository": {
"type": "git",
"url": "git://github.com/mstoiber/sharing.git"
Expand Down