Skip to content

Commit 390c328

Browse files
committed
Merge tag 'v1.3.0' into develop
v1.3.0
2 parents 43b089f + d6b79ad commit 390c328

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/).
44

5+
## [1.3.0] - 2020-05-01
6+
7+
### Added
8+
9+
- Added support for [Hot Module Replacement](https://laravel-mix.com/docs/5.0/hot-module-replacement) . Thanks [@johannschopplich](https://github.com/johannschopplich)
10+
511
## [1.2.0] - 2020-02-03
612

713
### Added

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,13 @@ See the [official documentation](https://laravel-mix.com/docs/4.0/basic-example)
8585
let mix = require("laravel-mix")
8686
mix.setPublicPath("assets")
8787
mix.browserSync("my-website.dev")
88+
if (mix.inProduction()) {
89+
mix.version()
90+
}
8891
mix
8992
.sourceMaps()
9093
.js("src/js/main.js", "assets")
9194
.sass("src/css/main.scss", "assets")
92-
.version()
9395
```
9496

9597
### NPM scripts
@@ -100,7 +102,8 @@ Add the following NPM scripts to your `package.json`:
100102
"scripts": {
101103
"dev": "npm run development",
102104
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
103-
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
105+
"watch": "npm run development -- --watch",
106+
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
104107
"prod": "npm run production",
105108
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
106109
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "laravel-mix-kirby",
33
"description": "Laravel Mix helper for the Kirby CMS",
44
"author": "Robert Cordes <[email protected]>",
5-
"version": "1.2.0",
5+
"version": "1.3.0",
66
"type": "kirby-plugin",
77
"license": "MIT"
88
}

0 commit comments

Comments
 (0)