Merge branch 'develop' of github.com:tracim/tracim_v2 into develop

frontend_app_html-document/package.json

@@ -36,7 +36,6 @@
     "style-loader": "^0.19.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.1",
-    "tracim_frontend_lib": "git://github.com/tracim/tracim_lib.git",
     "url-loader": "^0.6.2",
     "webpack": "^3.8.1",
     "whatwg-fetch": "^2.0.3"

frontend_app_thread/package.json

@@ -36,7 +36,6 @@
     "style-loader": "^0.19.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.1",
-    "tracim_lib": "git://github.com/tracim/tracim_lib.git",
     "url-loader": "^0.6.2",
     "webpack": "^3.8.1",
     "whatwg-fetch": "^2.0.3"

frontend_app_thread/src/container/PopupCreateThread.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import {
   CardPopupCreateContent,
   handleFetchResult
-} from 'tracim_lib'
+} from 'tracim_frontend_lib'
 import { postThreadContent } from '../action.async.js'
 
 const debug = { // outdated

frontend_app_thread/src/container/Thread.jsx

@@ -10,7 +10,7 @@ import {
   Timeline,
   SelectStatus,
   ArchiveDeleteContent
-} from 'tracim_lib'
+} from 'tracim_frontend_lib'
 import {
   getThreadContent,
   getThreadComment,

frontend_app_thread/src/css/index.styl

@@ -1,4 +1,4 @@
-@import "../../node_modules/tracim_lib/src/css/Variable.styl"
+@import "../../node_modules/tracim_frontend_lib/src/css/Variable.styl"
 
 .thread
   width 70%

frontend_app_thread/src/i18n.js

@@ -1,6 +1,6 @@
 import i18n from 'i18next'
 import { reactI18nextModule } from 'react-i18next'
-import { langFr, langEn } from 'tracim_lib'
+import { langFr, langEn } from 'tracim_frontend_lib'
 import fr from './translate/fr.js'
 import en from './translate/en.js'
 

frontend_app_thread/webpack.config.js

@@ -21,7 +21,7 @@ module.exports = {
   //   'react-dom': {commonjs: 'react-dom', commonjs2: 'react-dom', amd: 'react-dom', root: '_'},
   //   classnames: {commonjs: 'classnames', commonjs2: 'classnames', amd: 'classnames', root: '_'},
   //   'prop-types': {commonjs: 'prop-types', commonjs2: 'prop-types', amd: 'prop-types', root: '_'},
-  //   tracim_lib: {commonjs: 'tracim_lib', commonjs2: 'tracim_lib', amd: 'tracim_lib', root: '_'}
+  //   tracim_frontend_lib: {commonjs: 'tracim_frontend_lib', commonjs2: 'tracim_frontend_lib', amd: 'tracim_frontend_lib', root: '_'}
   // }
   // : {},
   devServer: {

rebuild_full_frontend.sh

@@ -21,3 +21,11 @@ log "npm run build$windoz # for frontend_app_html-document"
 npm run build$windoz
 log "cp dist/html-document.app.js"
 cp dist/html-document.app.js ../frontend/dist/app
+cd -
+
+log "cd frontend_app_thread"
+cd frontend_app_thread
+log "npm run build$windoz # for frontend_app_thread"
+npm run build$windoz
+log "cp dist/thread.app.js"
+cp dist/thread.app.js ../frontend/dist/app