Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

fix frontend and fix deploy to dev-master with lerna

Browse Source
This commit is contained in:
sveisvei 2016-06-19 20:47:34 +02:00
parent 95c9c1ea60
commit 3ff7b671c8
9 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -22,8 +22,8 @@ coverage
build/Release build/Release
# webpack output # webpack output
packages/unleash-frontend/public/js/bundle.js packages/unleash-frontend/public/bundle.js
packages/unleash-frontend/public/js/bundle.js.map packages/unleash-frontend/public/bundle.js.map
# liquibase stuff # liquibase stuff
/sql /sql

2
Procfile
View File

@ -1 +1 @@
web: npm run db-migrate && npm run start web: npm run bootstrap && npm run db-migrate && npm run start

3
package.json
View File

@ -28,7 +28,8 @@
"start": "lerna --scope=unleash-server exec npm start", "start": "lerna --scope=unleash-server exec npm start",
"publish": "lerna publish", "publish": "lerna publish",
"publish:dry": "lerna publish --skip-git --skip-npm", "publish:dry": "lerna publish --skip-git --skip-npm",
"db-migrate": "lerna --scope=unleash-api exec npm run db-migrate" "db-migrate": "lerna --scope=unleash-api exec npm run db-migrate",
"heroku-postbuild": "npm run bootstrap && lerna --scope=unleash-frontend exec npm run build"
}, },
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {

3
packages/unleash-frontend/.babelrc Normal file
View File

@ -0,0 +1,3 @@
{
"presets": ["es2015", "stage-2", "react"]
}

2
packages/unleash-frontend/lib/server-dev.js
View File

@ -1,5 +1,5 @@
'use strict'; 'use strict';
const server = require('unleash-server'); const server = require('unleash-api');
const unleash = server.start({}); const unleash = server.start({});
const app = unleash.app; const app = unleash.app;

14
packages/unleash-frontend/package.json
View File

@ -31,17 +31,19 @@
}, },
"main": "./lib/index.js", "main": "./lib/index.js",
"dependencies": { "dependencies": {
"jsx-loader": "0.12.2",
"lodash": "^3.5.0", "lodash": "^3.5.0",
"moment": "^2.13.0", "moment": "^2.13.0",
"react": "^0.13.1", "react": "^0.13.1",
"react-router": "^0.13.2", "react-router": "^0.13.2",
"reflux": "^0.2.10", "reflux": "^0.2.10",
"reqwest": "^2.0.5", "reqwest": "^2.0.5"
"webpack": "^1.13.0",
"webpack-dev-middleware": "^1.6.1"
}, },
"devDependencies": { "devDependencies": {
"babel-core": "^6.9.1",
"babel-loader": "^6.2.4",
"babel-preset-es2015": "^6.9.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-2": "^6.5.0",
"chai": "3.5.0", "chai": "3.5.0",
"coveralls": "^2.11.9", "coveralls": "^2.11.9",
"istanbul": "^0.4.3", "istanbul": "^0.4.3",
@ -52,7 +54,9 @@
"react-tools": "^0.13.1", "react-tools": "^0.13.1",
"supertest": "^1.2.0", "supertest": "^1.2.0",
"supervisor": "^0.10.0", "supervisor": "^0.10.0",
"unleash-api": "1.0.0-alpha.2" "unleash-api": "1.0.0-alpha.2",
"webpack": "^2.1.0-beta.13",
"webpack-dev-middleware": "^1.6.1"
}, },
"jest": { "jest": {
"scriptPreprocessor": "<rootDir>/jest-preprocessor.js", "scriptPreprocessor": "<rootDir>/jest-preprocessor.js",

4
packages/unleash-frontend/public/index.html
View File

@ -8,10 +8,10 @@
<meta name="description" content="unleash"> <meta name="description" content="unleash">
<link rel="stylesheet" href="//finncdn.no/bb/css/so/5.5.28/so.min.css"> <link rel="stylesheet" href="//finncdn.no/bb/css/so/5.5.28/so.min.css">
<link rel="stylesheet" href="css/unleash.css"> <link rel="stylesheet" href="unleash.css">
</head> </head>
<body> <body>
<div id="content"></div> <div id="content"></div>
<script src="js/bundle.js"></script> <script src="bundle.js"></script>
</body> </body>
</html> </html>

0
packages/unleash-frontend/public/css/unleash.css → packages/unleash-frontend/public/unleash.css
View File

12
packages/unleash-frontend/webpack.config.js
View File

@ -4,15 +4,15 @@
const path = require('path'); const path = require('path');
const root = path.normalize(path.join(__dirname, '.')); const root = path.normalize(path.join(__dirname, '.'));
const jsroot = path.join(path.join(root, 'public'), 'js'); const jsroot = path.join(root, 'public', 'js');
module.exports = { module.exports = {
context: jsroot, context: jsroot,
entry: 'app', entry: './app.jsx',
output: { output: {
path: jsroot, path: path.join(root, 'public'),
filename: 'bundle.js', filename: 'bundle.js',
publicPath: '/js/', publicPath: '/js/',
}, },
@ -25,7 +25,11 @@ module.exports = {
module: { module: {
loaders: [ loaders: [
{ test: /\.jsx$/, loader: 'jsx?harmony' }, {
test: /\.jsx?$/,
exclude: /node_modules/,
loader: 'babel',
},
], ],
}, },