Skip to content

Commit

Permalink
Upgrade compiling assets (Say hello to the Laravel Mix v3.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
algoriq committed Dec 3, 2018
1 parent 194f492 commit c970fb1
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 11 deletions.
4 changes: 2 additions & 2 deletions assets/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/app.js

Large diffs are not rendered by default.

23 changes: 19 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oc-bootstrap-theme",
"version": "1.0.0",
"version": "1.0.2",
"description": "Build responsive, mobile-first themes on the web with the world's most popular front-end component library.",
"main": "sources/js/app.js",
"scripts": {
Expand All @@ -9,14 +9,29 @@
"hot": "NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"build": "NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"repository": {
"type": "git",
"url": "git+https://github.com/prismify/oc-bootstrap-theme.git"
},
"bugs": {
"url": "https://github.com/prismify/oc-bootstrap-theme/issues"
},
"keywords": [
"october",
"octobercms",
"theme",
"laravel",
"bootstrap"
],
"author": "Prismify",
"license": "MIT",
"homepage": "https://github.com/prismify/oc-bootstrap-theme",
"devDependencies": {
"laravel-mix": "^2.1.11"
"laravel-mix": "^3.0.0"
},
"dependencies": {
"bootstrap": "^4.1.1",
"bootstrap": "^4.1.3",
"jquery": "^3.3.1",
"popper.js": "^1.14.3"
"popper.js": "^1.14.6"
}
}
3 changes: 2 additions & 1 deletion version.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
1.0.1: Initial release
1.0.1: Initial release
1.0.2: Upgrade compiling assets (Say hello to the Laravel Mix v3.0)
10 changes: 7 additions & 3 deletions webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@ let mix = require('laravel-mix');
|
*/

mix.js('sources/js/app.js', 'assets/js/app.js')
.sass('sources/sass/app.scss', 'assets/css/app.css')
.setPublicPath('assets');

// Full API
mix.js('sources/js/app.js', 'assets/js/app.js');
// mix.js(src, output);
// mix.react(src, output); <-- Identical to mix.js(), but registers React Babel compilation.
// mix.preact(src, output); <-- Identical to mix.js(), but registers Preact compilation.
// mix.coffee(src, output); <-- Identical to mix.js(), but registers CoffeeScript compilation.
// mix.ts(src, output); <-- TypeScript support. Requires tsconfig.json to exist in the same folder as webpack.mix.js
// mix.extract(vendorLibs);
mix.sass('sources/sass/app.scss', 'assets/css/app.css');
// mix.sass(src, output);
// mix.standaloneSass('src', output); <-- Faster, but isolated from Webpack.
// mix.fastSass('src', output); <-- Alias for mix.standaloneSass().
// mix.less(src, output);
Expand All @@ -33,7 +37,7 @@ mix.sass('sources/sass/app.scss', 'assets/css/app.css');
// mix.sourceMaps(); // Enable sourcemaps
// mix.version(); // Enable versioning.
// mix.disableNotifications();
mix.setPublicPath('assets');
// mix.setPublicPath('path/to/public');
// mix.setResourceRoot('prefix/for/resource/locators');
// mix.autoload({}); <-- Will be passed to Webpack's ProvidePlugin.
// mix.webpackConfig({}); <-- Override webpack.config.js, without editing the file directly.
Expand Down

0 comments on commit c970fb1

Please sign in to comment.