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

Commit 2a45f4d

Browse files
committed
WIP
1 parent adf9d5d commit 2a45f4d

File tree

4 files changed

+59
-48
lines changed

4 files changed

+59
-48
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["env"]
3+
}

package.json

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,48 @@
11
{
2-
"private": true,
3-
"devDependencies": {
4-
"clean-webpack-plugin": "^0.1.15",
5-
"css-loader": "^0.28.0",
6-
"extract-text-webpack-plugin": "2.1.0",
7-
"file-loader": "^0.11.0",
8-
"font-face-mixin": "^1.1.0",
9-
"node-sass": "^4.0.0",
10-
"path": "^0.12.7",
11-
"postcss-loader": "^1.3.0",
12-
"precss": "^1.4.0",
13-
"sass-loader": "^6.0.3",
14-
"style-loader": "^0.16.1",
15-
"webpack": "^2.2.1",
16-
"webpack-manifest-plugin": "^1.1.0",
17-
"webpack-merge": "^4.1.0"
18-
},
19-
"dependencies": {
20-
"block-ui": "^2.70.1",
21-
"bootstrap-hover-dropdown": "^2.2.1",
22-
"bootstrap-sass": "^3.3.7",
23-
"bootstrap-select": "^1.11.2",
24-
"bootstrap-switch": "^3.3.2",
25-
"fine-uploader": "^5.13.0",
26-
"font-awesome": "^4.6.3",
27-
"jquery": "^3.1.1",
28-
"jquery-slimscroll": "^1.3.8",
29-
"jquery-ui": "^1.12.1",
30-
"jquery-validation": "^1.15.1",
31-
"js-cookie": "^2.1.3",
32-
"pace-progress": "^1.0.2",
33-
"react": "^15.3.2",
34-
"select2": "^4.0.3",
35-
"select2-bootstrap-theme": "0.1.0-beta.9",
36-
"simple-line-icons-webfont": "^4.0.3",
37-
"skycons": "^1.0.0"
38-
},
39-
"scripts": {
40-
"build": "webpack --colors || true",
41-
"compile": "webpack --colors --display-cached --display-cached-assets --display-error-details --display-modules --display-chunks --debug || true",
42-
"watch": "webpack --watch --colors || true"
43-
}
2+
"private": true,
3+
"main": "webpack.config.js",
4+
"devDependencies": {
5+
"babel-core": "^6.24.1",
6+
"babel-loader": "^7.0.0",
7+
"babel-preset-env": "^1.4.0",
8+
"clean-webpack-plugin": "^0.1.15",
9+
"css-loader": "^0.28.0",
10+
"extract-text-webpack-plugin": "2.1.0",
11+
"file-loader": "^0.11.0",
12+
"font-face-mixin": "^1.1.0",
13+
"node-sass": "^4.0.0",
14+
"path": "^0.12.7",
15+
"postcss-loader": "^1.3.0",
16+
"precss": "^1.4.0",
17+
"sass-loader": "^6.0.3",
18+
"style-loader": "^0.16.1",
19+
"webpack": "^2.2.1",
20+
"webpack-manifest-plugin": "^1.1.0",
21+
"webpack-merge": "^4.1.0"
22+
},
23+
"dependencies": {
24+
"block-ui": "^2.70.1",
25+
"bootstrap-hover-dropdown": "^2.2.1",
26+
"bootstrap-sass": "^3.3.7",
27+
"bootstrap-select": "^1.11.2",
28+
"bootstrap-switch": "^3.3.2",
29+
"fine-uploader": "^5.13.0",
30+
"font-awesome": "^4.6.3",
31+
"jquery": "^3.1.1",
32+
"jquery-slimscroll": "^1.3.8",
33+
"jquery-ui": "^1.12.1",
34+
"jquery-validation": "^1.15.1",
35+
"js-cookie": "^2.1.3",
36+
"pace-progress": "^1.0.2",
37+
"react": "^15.5.4",
38+
"select2": "^4.0.3",
39+
"select2-bootstrap-theme": "0.1.0-beta.9",
40+
"simple-line-icons-webfont": "^4.0.3",
41+
"skycons": "^1.0.0"
42+
},
43+
"scripts": {
44+
"build": "webpack --colors || true",
45+
"compile": "webpack --colors --display-cached --display-cached-assets --display-error-details --display-modules --display-chunks --debug || true",
46+
"watch": "webpack --watch --colors || true"
47+
}
4448
}

readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Audith Basis is an enhanced version of Laravel framework, a feature list for whi
2828
* [Front-end/UI] _Back-end control panel_ - comes with built-in control panel, featuring sample pages for you to expand upon.
2929
* [Front-end/UI] _Custom web-fonts, web typography support_ - build and use your own web-fonts with included toolset, from any TTF/OTF fontsets.
3030
* [Front-end/UI] _Webpack support_ - build all web assets with Webpack.
31-
* [DevOps/CI/CD] _Docker support_ - fully Dockerized package with pre-built PHP 5.6 and 7.0 containers.
31+
* [DevOps/CI/CD] _Docker support_ - fully Dockerized package with pre-built PHP-7 containers.
3232

3333
### Installation
3434

@@ -37,7 +37,7 @@ Audith Basis is an enhanced version of Laravel framework, a feature list for whi
3737
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:
3838

3939
1. Build or pull necessary Docker containers.
40-
2. Start your desired Docker-Compose configuration (any of: PHP 5.6 or 7.0).
40+
2. Start your Docker-Compose configuration.
4141
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.
4242
4. Create ```.env``` file, containing your environmental variables.
4343
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!):

storage/build/scripts/webpack/toolset.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ exports.loadersAndPluginsForVariousTypes = function () {
4747
use: ExtractTextPlugin.extract({
4848
fallback: 'style-loader',
4949
use: [{
50-
loader: 'css-loader',
50+
loader: 'css-loader'
5151
}, {
5252
loader: 'postcss-loader'
5353
}]
@@ -57,7 +57,7 @@ exports.loadersAndPluginsForVariousTypes = function () {
5757
use: ExtractTextPlugin.extract({
5858
fallback: 'style-loader',
5959
use: [{
60-
loader: 'css-loader',
60+
loader: 'css-loader'
6161
}, {
6262
loader: 'postcss-loader'
6363
}, {
@@ -66,13 +66,17 @@ exports.loadersAndPluginsForVariousTypes = function () {
6666
})
6767
}, {
6868
test: /\.(gif|jpg|png)$/,
69-
use: process.env.npm_lifecycle_event == 'build' ? 'file-loader?name=[path][name].[hash].[ext]' : 'file-loader?name=[path][name].[ext]'
69+
use: process.env.npm_lifecycle_event === 'build' ? 'file-loader?name=[path][name].[hash].[ext]' : 'file-loader?name=[path][name].[ext]'
70+
}, {
71+
test: /\.js$/,
72+
exclude: /node_modules/,
73+
loader: "babel-loader"
7074
}
7175
]
7276
},
7377
plugins: [
7478
new ExtractTextPlugin({
75-
filename: process.env.npm_lifecycle_event == 'build' ? '[name].[contenthash].css' : '[name].css', // Don't use [contenthash] in dev environment, it increases compilation time.
79+
filename: process.env.npm_lifecycle_event === 'build' ? '[name].[contenthash].css' : '[name].css', // Don't use [contenthash] in dev environment, it increases compilation time.
7680
allChunks: false
7781
}),
7882
new LoaderOptionsPlugin({

0 commit comments

Comments
 (0)