Page MenuHomeDevCentral
Files F3620453

D2535.id6397.diff
No OneTemporary
Actions

D2535.id6397.diff
View Options

diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,18 @@
+# Composer
/vendor
-/node_modules
-.env
-.c9/
composer.lock
-php.ini
-public/css/
-*.log
-#CI
+# Node and JS toolchain
+/node_modules
+yarn.lock
+package-lock.json
+
+# CI and development
build/
cache.properties
+.env
+
+# Assets
+public/css/
+public/images/
+public/mix-manifest.json
diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
--- a/gulpfile.js
+++ /dev/null
@@ -1,18 +0,0 @@
-process.env.DISABLE_NOTIFIER = true;
-var elixir = require('laravel-elixir');
-
-/*
- |--------------------------------------------------------------------------
- | Elixir Asset Management
- |--------------------------------------------------------------------------
- |
- | Elixir provides a clean, fluent API for defining some basic Gulp tasks
- | for your Laravel application. By default, we are compiling the Less
- | file for our application, as well as publishing vendor resources.
- |
- */
-
-elixir(function(mix) {
- mix.less('app.less');
- mix.less('login.less');
-});
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -1,15 +1,20 @@
{
- "private": true,
- "devDependencies": {
- "gulp": "^4.0.0",
- "laravel-elixir": "*"
- },
- "scripts": {
- "snyk-protect": "snyk protect",
- "prepublish": "npm run snyk-protect"
- },
- "snyk": true,
- "dependencies": {
- "snyk": "^1.165.1"
- }
+ "private": true,
+ "scripts": {
+ "dev": "npm run development",
+ "development": "mix",
+ "watch": "mix watch",
+ "watch-poll": "mix watch -- --watch-options-poll=1000",
+ "hot": "mix watch --hot",
+ "prod": "npm run production",
+ "production": "mix --production"
+ },
+ "devDependencies": {
+ "axios": "^0.25",
+ "laravel-mix": "^6.0.6",
+ "less": "^4.1.2",
+ "less-loader": "^10.2.0",
+ "lodash": "^4.17.19",
+ "postcss": "^8.1.14"
+ }
}
diff --git a/webpack.mix.js b/webpack.mix.js
new file mode 100644
--- /dev/null
+++ b/webpack.mix.js
@@ -0,0 +1,8 @@
+const mix = require('laravel-mix');
+
+mix.less('resources/assets/less/app.less', 'public/css')
+ .less('resources/assets/less/login.less', 'public/css')
+ .options({
+ processCssUrls: false,
+ });
+

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 4, 13:17 (21 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2174309
Default Alt Text
D2535.id6397.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator