Browse Source

fixing pro-example-app, but don't remember those changes

pull/2/head
Marek Piasecki 6 years ago
parent
commit
322f14081f
  1. 2
      .gitignore
  2. 29
      tools/bundler/webpack/package.json
  3. 28
      tools/bundler/webpack/webpack.prod.config.js
  4. 2
      tools/clients/cordova/www
  5. 3
      tools/communication/primus/Dockerfile
  6. 8
      tools/containers/docker/start.sh

2
.gitignore

@ -4,7 +4,7 @@ node_modules/*
*.log* *.log*
services/init.coffee services/init.coffee
public/* public/*
!public/.gitignore !public/.gitkeep
.byebug_history .byebug_history
.vagrant .vagrant
_site _site

29
tools/bundler/webpack/package.json

@ -11,24 +11,25 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"autoprefixer-loader": "^3.2.0", "autoprefixer-loader": "^3.2.0",
"backbone-events-standalone": "^0.2.7",
"coffee-loader": "^0.9.0", "coffee-loader": "^0.9.0",
"coffee-script": "^1.10.0", "coffeescript": ">= 1.x < 2",
"css-loader": "^0.28.9", "compression-webpack-plugin": "^1.0.0",
"file-loader": "^1.1.9", "css-loader": "^0.28.11",
"file-loader": "^1.1.11",
"http-server": "^0.11.1", "http-server": "^0.11.1",
"img-loader": "^2.0.1",
"node-sass": "^4.7.2",
"postcss-loader": "^2.1.0",
"sass-loader": "^6.0.6",
"style-loader": "^0.20.2",
"svgo": "^1.0.4",
"svgo-loader": "^2.1.0",
"url-loader": "^0.6.2",
"backbone-events-standalone": "^0.2.7",
"imba": "somebee/imba", "imba": "somebee/imba",
"img-loader": "^2.0.1",
"lodash": "^4.11.1", "lodash": "^4.11.1",
"node-sass": "^4.7.2",
"pro-router": "^4.3.0", "pro-router": "^4.3.0",
"compression-webpack-plugin": "^1.0.0", "sass-loader": "^6.0.7",
"webpack": "^3.5.5" "style-loader": "^0.20.3",
"svgo": "^1.0.5",
"svgo-loader": "^2.1.0",
"uglifyjs-webpack-plugin": "^1.2.3",
"url-loader": "^1.0.1",
"webpack": "^4.1.1",
"webpack-cli": "^2.0.12"
} }
} }

28
tools/bundler/webpack/webpack.prod.config.js

@ -1,7 +1,9 @@
const webpack = require('webpack'); const webpack = require('webpack');
const CompressionPlugin = require("compression-webpack-plugin"); const CompressionPlugin = require("compression-webpack-plugin");
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
const path = require('path'); const path = require('path');
module.exports = { module.exports = {
mode: 'production',
cache: false, cache: false,
context: __dirname, context: __dirname,
entry: '../../../services/init', entry: '../../../services/init',
@ -12,25 +14,16 @@ module.exports = {
path: __dirname + '/../../../public', path: __dirname + '/../../../public',
filename: 'bundle.js' filename: 'bundle.js'
}, },
optimization: {
minimize: true,
minimizer: [
new UglifyJsPlugin({
exclude: [/\.min\.js$/gi] // skip pre-minified libs
})
]
},
devtool: 'cheap-module-source-map', devtool: 'cheap-module-source-map',
plugins: [ plugins: [
new webpack.DefinePlugin({
'process.env.NODE_ENV': '"production"'
}),
new webpack.optimize.UglifyJsPlugin({
mangle: true,
compress: {
warnings: false, // Suppress uglification warnings
pure_getters: true,
unsafe: true,
unsafe_comps: true,
screw_ie8: true
},
output: {
comments: false,
},
exclude: [/\.min\.js$/gi] // skip pre-minified libs
}),
new webpack.IgnorePlugin(/^\.\/locale$/, [/moment$/]), new webpack.IgnorePlugin(/^\.\/locale$/, [/moment$/]),
new webpack.NoEmitOnErrorsPlugin(), new webpack.NoEmitOnErrorsPlugin(),
new CompressionPlugin({ new CompressionPlugin({
@ -48,7 +41,6 @@ module.exports = {
use: [ use: [
{ loader: 'style-loader' }, { loader: 'style-loader' },
{ loader: 'css-loader' }, { loader: 'css-loader' },
{ loader: 'autoprefixer-loader', options: { browsers: 'last 3 versions' } },
{ loader: 'sass-loader', options: { outputStyle: 'expanded' } } { loader: 'sass-loader', options: { outputStyle: 'expanded' } }
] ]
}, },

2
tools/clients/cordova/www

@ -1 +1 @@
../../app/ ../../../../app

3
tools/communication/primus/Dockerfile

@ -1,8 +1,9 @@
FROM node FROM node:8
RUN mkdir -p /primus RUN mkdir -p /primus
WORKDIR /primus WORKDIR /primus
RUN apt-get install libc6
RUN npm install -g browserify coffee-script derequire http-server RUN npm install -g browserify coffee-script derequire http-server
ADD package.json package.json ADD package.json package.json
RUN npm install && cd node_modules/primus && npm install && npm run build RUN npm install && cd node_modules/primus && npm install && npm run build

8
tools/containers/docker/start.sh

@ -7,14 +7,14 @@ else
docker run -v $(pwd):/pro pro:init docker run -v $(pwd):/pro pro:init
fi fi
if [ $1 == 'server' -o $1 == 's' ]; then if [ "$1" == 'server' -o "$1" == 's' ]; then
docker-compose up docker-compose up
elif [ $1 == 'build' ]; then elif [ "$1" == 'build' ]; then
docker-compose down && docker-compose build docker-compose down && docker-compose build
elif [ $1 == 'console' -o $1 == 'c' ]; then elif [ "$1" == 'console' -o "$1" == 'c' ]; then
docker exec -it `docker-compose ps -q consumer` bash -c "ruby framework/tools/starter/start.rb c" docker exec -it `docker-compose ps -q consumer` bash -c "ruby framework/tools/starter/start.rb c"
if [ $? -ne 0 ]; then if [ "$?" -ne 0 ]; then
echo 'Is the server running?' echo 'Is the server running?'
fi fi
fi fi

Loading…
Cancel
Save