-
-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Unminifiy assets to allow for development debugging and replace gulp/…
…elixir with webpack/laravel-mix
- Loading branch information
1 parent
15a28cc
commit 23ae85f
Showing
11 changed files
with
40,314 additions
and
1,061 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
{ | ||
"/public/js/media-manager.js": "/public/js/media-manager.js", | ||
"/public/css/media-manager.css": "/public/css/media-manager.css" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,25 @@ | ||
{ | ||
"private": true, | ||
"scripts": { | ||
"prod": "gulp --production", | ||
"dev": "gulp watch" | ||
"dev": "npm run development", | ||
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", | ||
"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", | ||
"watch-poll": "npm run watch -- --watch-poll", | ||
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", | ||
"prod": "npm run production", | ||
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" | ||
}, | ||
"dependencies": { | ||
"devDependencies": { | ||
"axios": "^0.16.2", | ||
"bootstrap-notify": "^3.1.3", | ||
"dropzone": "^4.3.0", | ||
"gulp": "^3.9.1", | ||
"hammerjs": "^2.0.8", | ||
"jquery": "^3.1.0", | ||
"laravel-elixir": "^6.0.0-9", | ||
"laravel-elixir-vue-2": "^0.2.0", | ||
"laravel-elixir-webpack-official": "^1.0.8", | ||
"cross-env": "^5.0.1", | ||
"laravel-mix": "^1.0", | ||
"lodash": "^4.16.2", | ||
"moment": "^2.17.1", | ||
"vue": "^2.3.2", | ||
"vue": "^2.3.0", | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
ruchernchong
Contributor
|
||
"vue-touch2": "^1.0.0" | ||
} | ||
} |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
@import 'icon-code.scss'; | ||
@import "animate"; | ||
@import "dropzone"; | ||
|
||
$editor-height: 60vh; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
let mix = require('laravel-mix'); | ||
|
||
mix.sass('resources/assets/sass/media-manager.scss', 'public/css/') | ||
.js('resources/assets/js/media-manager.js', 'public/js/') | ||
.copy('resources/assets/fonts', 'public/fonts/') |
Oops, something went wrong.
Not using
^2.4.0
instead?