Skip to content

Commit

Permalink
feat(mozaik-2): init mozaik 2 migration
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphael Benitte committed Aug 25, 2016
1 parent 1d9a48d commit a2e13a3
Show file tree
Hide file tree
Showing 11 changed files with 71 additions and 222 deletions.
12 changes: 10 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"presets": [
"es2015",
"stage-2",
"react"
]
}
],
"env": {
"development": {
"presets": [
"react-hmre"
]
}
}
}
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
language: node_js
node_js:
- '0.12'
- '4'
- '5'
before_install:
- npm install -g npm
- '6'
script:
- npm run build
25 changes: 17 additions & 8 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
require('babel-register')({
only: [
/node_modules\/mozaik[^/]*\/src/,
/src\/server\.js/
]
});

require('./src/server');
require('dotenv').load({ silent: true })

const path = require('path')
const Mozaik = require('mozaik')


Mozaik.configureFromFile(path.join(__dirname, 'config.yml'))
.then(() => {
Mozaik.registerApi('github', require('mozaik-ext-github/client'))
Mozaik.registerApi('gitlab', require('mozaik-ext-gitlab/client'))
Mozaik.registerApi('travis', require('mozaik-ext-travis/client'))

Mozaik.start()
})
.catch(err => {
console.error(err)
})
148 changes: 0 additions & 148 deletions config.js

This file was deleted.

1 change: 1 addition & 0 deletions devServer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('mozaik/devServer')
7 changes: 0 additions & 7 deletions gulpfile.js

This file was deleted.

39 changes: 22 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "mozaik-dashboard",
"name": "mozaik-demo",
"version": "2.0.0-alpha.1",
"description": "Mozaïk demo dashboard",
"repository": {
"type": "git",
Expand All @@ -11,28 +12,32 @@
"url": "https://github.com/plouc"
},
"engines": {
"node": "0.12.x",
"npm" : ">=3.0.0"
"node": ">=6.0.0",
"npm": ">=3.0.0"
},
"dependencies": {
"babel-preset-es2015": "6.6.0",
"babel-preset-react": "6.5.0",
"babel-register": "6.7.2",
"dotenv": "^0.5.1",
"gulp": "^3.9.0",
"lodash": "^3.10.0",
"mozaik": "1.4.4",
"mozaik-ext-github": "1.2.2",
"mozaik-ext-time": "1.1.0",
"mozaik-ext-travis": "1.1.0",
"mozaik-ext-weather": "1.2.0",
"react": "^0.13.3"
"mozaik": "2.0.0-alpha.1",
"mozaik-ext-github": "2.0.0-alpha.1",
"mozaik-ext-gitlab": "2.0.0-alpha.1",
"mozaik-ext-travis": "2.0.0-alpha.1",
"react": "15.3.0",
"react-dom": "15.3.0"
},
"devDependencies": {
"babel-core": "6.13.2",
"babel-loader": "6.2.5",
"babel-preset-es2015": "6.13.2",
"babel-preset-react": "6.11.1",
"babel-preset-react-hmre": "1.1.1",
"babel-preset-stage-2": "6.13.0",
"webpack": "1.13.2",
"webpack-dev-server": "1.14.1"
},
"scripts": {
"test": "npm run build-assets",
"test": "npm run build",
"start": "node app.js",
"postinstall": "if $BUILD_ASSETS; then npm run build-assets; fi",
"build-assets": "gulp build",
"watch": "gulp watch"
"build": "NODE_ENV=production webpack"
}
}
22 changes: 0 additions & 22 deletions src/App.jsx

This file was deleted.

17 changes: 17 additions & 0 deletions src/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react'
import { render } from 'react-dom'
import Mozaik from 'mozaik/ui'
import github from 'mozaik-ext-github'
import gitlab from 'mozaik-ext-gitlab'
import time from 'mozaik-ext-time'
import travis from 'mozaik-ext-travis'


Mozaik.Registry.addExtensions({
github,
gitlab,
time,
travis,
});

render(<Mozaik.Mozaik />, document.getElementById('mozaik'))
13 changes: 0 additions & 13 deletions src/server.js

This file was deleted.

1 change: 1 addition & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = require('mozaik/webpack.config')

0 comments on commit a2e13a3

Please sign in to comment.