Update: Updated npm dependencies + using mix (#1026)
This commit is contained in:
parent
2836dadf1a
commit
07f07449b9
6 changed files with 3876 additions and 6122 deletions
9963
package-lock.json
generated
9963
package-lock.json
generated
File diff suppressed because it is too large
Load diff
23
package.json
23
package.json
|
@ -2,22 +2,21 @@
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npm run development",
|
"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",
|
"development": "mix",
|
||||||
"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": "mix watch",
|
||||||
"watch-poll": "npm run watch -- --watch-poll",
|
"watch-poll": "mix watch -- --watch-options-poll=1000",
|
||||||
"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",
|
"hot": "mix watch --hot",
|
||||||
"prod": "npm run production",
|
"prod": "npm run production",
|
||||||
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
|
"production": "mix --production"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"bootstrap-sass": "^3.4.1",
|
"bootstrap-sass": "^3.4.3",
|
||||||
"cross-env": "^5.2.0",
|
"jquery": "^3.6.1",
|
||||||
"jquery": "^3.4.1",
|
"laravel-mix": "^6.0.49",
|
||||||
"laravel-mix": "^4.0.16",
|
"sass": "^1.56.1",
|
||||||
"sass": "^1.21.0",
|
"sass-loader": "13.*"
|
||||||
"sass-loader": "7.*"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"select2": "^4.0.7"
|
"select2": "^4.0.13"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
4
public/css/app.css
vendored
4
public/css/app.css
vendored
File diff suppressed because one or more lines are too long
2
public/js/app.js
vendored
2
public/js/app.js
vendored
File diff suppressed because one or more lines are too long
4
public/mix-manifest.json
generated
4
public/mix-manifest.json
generated
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"/css/app.css": "/css/app.css?id=cdbee4d3b17bce4786a2",
|
"/css/app.css": "/css/app.css?id=9a25947db63214edd4e6f459200dfa62",
|
||||||
"/js/app.js": "/js/app.js?id=bf17db5adf00db2c59ef"
|
"/js/app.js": "/js/app.js?id=9d1d0ca0e70f242da27798f5002f7644"
|
||||||
}
|
}
|
||||||
|
|
2
resources/assets/sass/app.scss
vendored
2
resources/assets/sass/app.scss
vendored
|
@ -9,7 +9,7 @@
|
||||||
@import "normalise";
|
@import "normalise";
|
||||||
|
|
||||||
// Bootstrap
|
// Bootstrap
|
||||||
@import "app";
|
@import "_app";
|
||||||
@import "rune";
|
@import "rune";
|
||||||
|
|
||||||
// Huebee
|
// Huebee
|
||||||
|
|
Loading…
Reference in a new issue