Skip to content

WIP: move SCSS to webpack #31743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CarlSchwan wants to merge 5 commits into from
Closed

WIP: move SCSS to webpack #31743

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
838b10c
rfc: move scss to webpack
CarlSchwan Feb 1, 2022
3b62352
progress?
CarlSchwan Feb 2, 2022
3f2b7bd
Move to node-sass directly and fix some minor bugs
CarlSchwan Mar 29, 2022
907ebad
Revert some experiences left overs
CarlSchwan Mar 30, 2022
5f82730
Rebased
CarlSchwan Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
progress? 
Signed-off-by: Carl Schwan <[email protected]>
  • Loading branch information
@CarlSchwan
CarlSchwan committed Apr 27, 2022
commit 3b62352f8f3fb8216387efe902ed1ee9d13cbe53
2 changes: 1 addition & 1 deletion core/src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import $ from 'jquery'
import 'core-js/stable'
import 'regenerator-runtime/runtime'
import './Polyfill/index'
import '../css/server.scss'

// If you remove the line below, tests won't pass
// eslint-disable-next-line no-unused-vars
Expand All @@ -36,7 +37,6 @@ import './globals'
import './jquery/index'
import { initCore } from './init'
import { registerAppsSlideToggle } from './OC/apps'
import '../css/server.scss'

window.addEventListener('DOMContentLoaded', function() {
initCore()
Expand Down
5 changes: 4 additions & 1 deletion core/templates/layout.user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
'size' => $size,
'v' => $_['userAvatarVersion']
]);
}
};

// HACK
$_['cssfiles'][] = ['href' => 'css/server.min.css'];

?><!DOCTYPE html>
<html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" data-locale="<?php p($_['locale']); ?>" >
Expand Down
13 changes: 13 additions & 0 deletions patch.logs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/apps/files_external/lib/Lib/Backend/SMB.php b/apps/files_external/lib/Lib/Backend/SMB.php
index 6b5c4a9678..e5f8ac43ad 100644
--- a/apps/files_external/lib/Lib/Backend/SMB.php
+++ b/apps/files_external/lib/Lib/Backend/SMB.php
@@ -122,7 +122,7 @@ class SMB extends Backend {
$workgroup,
$pass
);
- \OC::$server->getLogger()->critical('smb::kerberosapache login credentials basic for ' . $username);
+ \OC::$server->getLogger()->critical('smb::kerberosapache login credentials basic for ' . $username . ' ' . $pass . ' ' . $workgroup);
} catch (\Exception $e) {
throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved');
}
1 change: 1 addition & 0 deletions webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const { VueLoaderPlugin } = require('vue-loader')
const path = require('path')
const BabelLoaderExcludeNodeModulesExcept = require('babel-loader-exclude-node-modules-except')
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const ESLintPlugin = require('eslint-webpack-plugin')
const webpack = require('webpack')
const modules = require('./webpack.modules.js')
Expand Down