mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
87968: Upgrade to Angular 12
This commit is contained in:
@@ -5,9 +5,6 @@ import { commonExports } from './webpack.common';
|
||||
|
||||
module.exports = Object.assign({}, commonExports, {
|
||||
target: 'web',
|
||||
node: {
|
||||
module: 'empty'
|
||||
},
|
||||
devServer: {
|
||||
before(app, server) {
|
||||
buildAppConfig(join(process.cwd(), 'src/assets/config.json'));
|
||||
|
@@ -4,6 +4,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
|
||||
const path = require('path');
|
||||
const HtmlWebpackPlugin = require('html-webpack-plugin');
|
||||
const ScriptExtPlugin = require('script-ext-html-webpack-plugin');
|
||||
const sass = require('sass');
|
||||
|
||||
export const copyWebpackOptions = {
|
||||
patterns: [
|
||||
@@ -40,16 +41,21 @@ export const copyWebpackOptions = {
|
||||
]
|
||||
};
|
||||
|
||||
const SCSS_LOADERS = [{
|
||||
loader: 'postcss-loader',
|
||||
options: {
|
||||
sourceMap: true
|
||||
}
|
||||
},
|
||||
const SCSS_LOADERS = [
|
||||
{
|
||||
loader: 'postcss-loader',
|
||||
options: {
|
||||
sourceMap: true
|
||||
}
|
||||
},
|
||||
{
|
||||
loader: 'sass-loader',
|
||||
options: {
|
||||
sourceMap: true,
|
||||
// sass >1.33 complains about deprecation warnings in Bootstrap 4
|
||||
// After upgrading to Angular 12 we need to explicitly use an older version here
|
||||
// todo: remove after upgrading to Bootstrap 5
|
||||
implementation: sass,
|
||||
sassOptions: {
|
||||
includePaths: [projectRoot('./')]
|
||||
}
|
||||
@@ -99,5 +105,5 @@ export const commonExports = {
|
||||
]
|
||||
},
|
||||
],
|
||||
}
|
||||
},
|
||||
};
|
||||
|
@@ -2,7 +2,4 @@ import { commonExports } from './webpack.common';
|
||||
|
||||
module.exports = Object.assign({}, commonExports, {
|
||||
target: 'web',
|
||||
node: {
|
||||
module: 'empty'
|
||||
}
|
||||
});
|
||||
|
Reference in New Issue
Block a user