Skip to content
This repository has been archived by the owner on Nov 16, 2020. It is now read-only.

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
shehi committed Nov 9, 2017
1 parent adf9d5d commit 2a45f4d
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 48 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["env"]
}
88 changes: 46 additions & 42 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,48 @@
{
"private": true,
"devDependencies": {
"clean-webpack-plugin": "^0.1.15",
"css-loader": "^0.28.0",
"extract-text-webpack-plugin": "2.1.0",
"file-loader": "^0.11.0",
"font-face-mixin": "^1.1.0",
"node-sass": "^4.0.0",
"path": "^0.12.7",
"postcss-loader": "^1.3.0",
"precss": "^1.4.0",
"sass-loader": "^6.0.3",
"style-loader": "^0.16.1",
"webpack": "^2.2.1",
"webpack-manifest-plugin": "^1.1.0",
"webpack-merge": "^4.1.0"
},
"dependencies": {
"block-ui": "^2.70.1",
"bootstrap-hover-dropdown": "^2.2.1",
"bootstrap-sass": "^3.3.7",
"bootstrap-select": "^1.11.2",
"bootstrap-switch": "^3.3.2",
"fine-uploader": "^5.13.0",
"font-awesome": "^4.6.3",
"jquery": "^3.1.1",
"jquery-slimscroll": "^1.3.8",
"jquery-ui": "^1.12.1",
"jquery-validation": "^1.15.1",
"js-cookie": "^2.1.3",
"pace-progress": "^1.0.2",
"react": "^15.3.2",
"select2": "^4.0.3",
"select2-bootstrap-theme": "0.1.0-beta.9",
"simple-line-icons-webfont": "^4.0.3",
"skycons": "^1.0.0"
},
"scripts": {
"build": "webpack --colors || true",
"compile": "webpack --colors --display-cached --display-cached-assets --display-error-details --display-modules --display-chunks --debug || true",
"watch": "webpack --watch --colors || true"
}
"private": true,
"main": "webpack.config.js",
"devDependencies": {
"babel-core": "^6.24.1",
"babel-loader": "^7.0.0",
"babel-preset-env": "^1.4.0",
"clean-webpack-plugin": "^0.1.15",
"css-loader": "^0.28.0",
"extract-text-webpack-plugin": "2.1.0",
"file-loader": "^0.11.0",
"font-face-mixin": "^1.1.0",
"node-sass": "^4.0.0",
"path": "^0.12.7",
"postcss-loader": "^1.3.0",
"precss": "^1.4.0",
"sass-loader": "^6.0.3",
"style-loader": "^0.16.1",
"webpack": "^2.2.1",
"webpack-manifest-plugin": "^1.1.0",
"webpack-merge": "^4.1.0"
},
"dependencies": {
"block-ui": "^2.70.1",
"bootstrap-hover-dropdown": "^2.2.1",
"bootstrap-sass": "^3.3.7",
"bootstrap-select": "^1.11.2",
"bootstrap-switch": "^3.3.2",
"fine-uploader": "^5.13.0",
"font-awesome": "^4.6.3",
"jquery": "^3.1.1",
"jquery-slimscroll": "^1.3.8",
"jquery-ui": "^1.12.1",
"jquery-validation": "^1.15.1",
"js-cookie": "^2.1.3",
"pace-progress": "^1.0.2",
"react": "^15.5.4",
"select2": "^4.0.3",
"select2-bootstrap-theme": "0.1.0-beta.9",
"simple-line-icons-webfont": "^4.0.3",
"skycons": "^1.0.0"
},
"scripts": {
"build": "webpack --colors || true",
"compile": "webpack --colors --display-cached --display-cached-assets --display-error-details --display-modules --display-chunks --debug || true",
"watch": "webpack --watch --colors || true"
}
}
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Audith Basis is an enhanced version of Laravel framework, a feature list for whi
* [Front-end/UI] _Back-end control panel_ - comes with built-in control panel, featuring sample pages for you to expand upon.
* [Front-end/UI] _Custom web-fonts, web typography support_ - build and use your own web-fonts with included toolset, from any TTF/OTF fontsets.
* [Front-end/UI] _Webpack support_ - build all web assets with Webpack.
* [DevOps/CI/CD] _Docker support_ - fully Dockerized package with pre-built PHP 5.6 and 7.0 containers.
* [DevOps/CI/CD] _Docker support_ - fully Dockerized package with pre-built PHP-7 containers.

### Installation

Expand All @@ -37,7 +37,7 @@ Audith Basis is an enhanced version of Laravel framework, a feature list for whi
I have included a build script in ```./storage/scripts/dev-env/build.sh``` inside of which you can see steps necessary to spin up desired Docker configuration and prepare your development environment. Steps involved are:

1. Build or pull necessary Docker containers.
2. Start your desired Docker-Compose configuration (any of: PHP 5.6 or 7.0).
2. Start your Docker-Compose configuration.
3. Update your ```/etc/hosts``` file to point to the primary container in your Docker configuration - generally ```php_XXX``` is the primary container, which is linked to ```php_XXX-fpm``` and other machines.
4. Create ```.env``` file, containing your environmental variables.
5. Switch into the primary container environment, to start building your environment (Note: before doing so, please read the important note in ```build.sh``` file!):
Expand Down
12 changes: 8 additions & 4 deletions storage/build/scripts/webpack/toolset.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ exports.loadersAndPluginsForVariousTypes = function () {
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: [{
loader: 'css-loader',
loader: 'css-loader'
}, {
loader: 'postcss-loader'
}]
Expand All @@ -57,7 +57,7 @@ exports.loadersAndPluginsForVariousTypes = function () {
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: [{
loader: 'css-loader',
loader: 'css-loader'
}, {
loader: 'postcss-loader'
}, {
Expand All @@ -66,13 +66,17 @@ exports.loadersAndPluginsForVariousTypes = function () {
})
}, {
test: /\.(gif|jpg|png)$/,
use: process.env.npm_lifecycle_event == 'build' ? 'file-loader?name=[path][name].[hash].[ext]' : 'file-loader?name=[path][name].[ext]'
use: process.env.npm_lifecycle_event === 'build' ? 'file-loader?name=[path][name].[hash].[ext]' : 'file-loader?name=[path][name].[ext]'
}, {
test: /\.js$/,
exclude: /node_modules/,
loader: "babel-loader"
}
]
},
plugins: [
new ExtractTextPlugin({
filename: process.env.npm_lifecycle_event == 'build' ? '[name].[contenthash].css' : '[name].css', // Don't use [contenthash] in dev environment, it increases compilation time.
filename: process.env.npm_lifecycle_event === 'build' ? '[name].[contenthash].css' : '[name].css', // Don't use [contenthash] in dev environment, it increases compilation time.
allChunks: false
}),
new LoaderOptionsPlugin({
Expand Down

0 comments on commit 2a45f4d

Please sign in to comment.