fixes after update merge

This commit is contained in:
kochetkov 2024-11-15 09:53:53 +03:00
parent 08d4aa015b
commit 7a125a7efd
4 changed files with 1451 additions and 4636 deletions

View file

@ -1,10 +0,0 @@
{
"port": 8000,
"open": false,
"files": [
"./**/*.{html,htm,css,js}"
],
"server": {
"baseDir": "./"
}
}

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,6 @@
"name": "ervu-dashboard",
"version": "1.0.0",
"scripts": {
"lite": "node ./node_modules/lite-server/bin/lite-server",
"cleanup": "npm run cleanup-ngc && node ./node_modules/rimraf/bin ./build ./dist",
"cleanup-ngc": "node ./node_modules/rimraf/bin ./src/ts/**/*.js ./src/ts/**/*.json ./src/ts/page.routing.ts",
"cleanup-and-ngc": "npm run cleanup && npm run ngc",
@ -26,7 +25,7 @@
"@angular/platform-browser": "7.2.15",
"@angular/platform-browser-dynamic": "7.2.15",
"@angular/router": "7.2.15",
"@ng-bootstrap/ng-bootstrap": "4.1.1",
"@ng-bootstrap/ng-bootstrap": "4.2.2-micord.1",
"@webbpm/base-package": "3.185.0",
"ag-grid-angular": "29.0.0-micord.4",
"ag-grid-community": "29.0.0-micord.4",
@ -58,11 +57,11 @@
"reflect-metadata": "0.1.13",
"rxjs": "6.4.0",
"rxjs-compat": "6.4.0",
"selectize": "0.12.4-cg.10",
"selectize": "0.12.4-cg.11",
"systemjs": "0.21.4",
"systemjs-plugin-babel": "0.0.25",
"tslib": "1.9.3",
"zone.js": "0.8.29"
"zone.js": "0.11.8"
},
"devDependencies": {
"@angular-devkit/build-optimizer": "0.13.9",
@ -70,33 +69,35 @@
"@angular/cli": "7.3.9",
"@angular/compiler-cli": "7.2.15",
"@angular/platform-server": "7.2.15",
"@babel/core": "7.9.6",
"@babel/preset-env": "7.9.6",
"@babel/core": "7.18.10",
"@babel/preset-env": "7.18.10",
"@types/bootstrap": "3.3.39",
"@types/eslint": "7.2.5",
"@types/jquery": "3.5.5",
"@types/node": "7.0.5",
"@types/selectize": "0.12.33",
"ajv": "8.8.2",
"angular-router-loader": "0.8.5",
"angular2-template-loader": "0.6.2",
"babel-loader": "8.1.0",
"babel-loader": "9.1.2",
"codelyzer": "5.2.1",
"copy-webpack-plugin": "5.0.3",
"cross-env": "5.2.1",
"css-loader": "2.1.0",
"css-loader": "6.11.0",
"del": "2.2.2",
"file-loader": "3.0.1",
"html-webpack-plugin": "4.5.2",
"lite-server": "2.3.0",
"mini-css-extract-plugin": "0.6.0",
"mkdirp": "0.5.1",
"raw-loader": "1.0.0",
"style-loader": "0.23.1",
"terser-webpack-plugin": "1.2.4",
"dotenv": "^16.4.5",
"dotenv-webpack": "^8.1.0",
"file-loader": "6.2.0",
"html-webpack-plugin": "5.6.0",
"mini-css-extract-plugin": "2.9.1",
"mkdirp": "3.0.1",
"raw-loader": "4.0.2",
"style-loader": "3.3.4",
"terser-webpack-plugin": "5.3.10",
"tslint": "5.13.1",
"typescript": "3.2.4",
"typescript-parser": "2.6.1-cg-fork",
"webpack": "4.32.2",
"webpack-bundle-analyzer": "3.3.2",
"webpack-cli": "3.3.2"
"typescript-parser": "2.6.1-cg.2",
"webpack": "5.90.1",
"webpack-cli": "5.0.2"
}
}

View file

@ -3,7 +3,6 @@ const path = require('path');
const webpack = require('webpack');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const TerserPlugin = require('terser-webpack-plugin');
@ -14,9 +13,9 @@ function _path(p) {
module.exports = {
mode: 'production',
entry: {
'polyfills': './build/scripts/polyfills.js',
'vendor': './build/scripts/vendor.js',
'main': './build/scripts/main.aot.js'
polyfills: './build/scripts/polyfills.js',
vendor: './build/scripts/vendor.js',
main: './build/scripts/main.aot.js',
},
context: process.cwd(),
@ -24,26 +23,33 @@ module.exports = {
output: {
path: path.join(process.cwd(), './dist'),
filename: '[name].[chunkhash].bundle.js',
chunkFilename: '[id].[chunkhash].chunk.js'
chunkFilename: '[id].[chunkhash].chunk.js',
assetModuleFilename: 'src/resources/[base]',
publicPath: 'auto'
},
module: {
rules: [
{
test: /\.js$/,
use: {
loader: 'babel-loader',
include: [path.resolve(__dirname, "node_modules")],
options: {
presets: ['@babel/preset-env']
}
}
},
{
test: /\.js$/,
use: {
loader: 'angular-router-loader?aot=true'
}
},
{
test: /\.html$/,
use: {
loader: 'raw-loader'
}
},
{
test: /\.css$/,
@ -56,12 +62,14 @@ module.exports = {
// publicPath: '../'
}
},
"css-loader"
{
loader: 'css-loader'
}
]
},
{
test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico|otf)$/,
loader: 'file-loader?name=src/resources/[name].[hash].[ext]'
type: 'asset/resource'
}
]
},
@ -69,7 +77,6 @@ module.exports = {
optimization: {
minimizer: [
new TerserPlugin({
cache: true,
parallel: true,
terserOptions: {
// https://github.com/webpack-contrib/terser-webpack-plugin#terseroptions
@ -83,7 +90,6 @@ module.exports = {
},
plugins: [
// new BundleAnalyzerPlugin(),
new HtmlWebpackPlugin({
template: 'index.webpack.html',
filename: 'index.html',
@ -97,8 +103,8 @@ module.exports = {
{from: 'src/resources/app.version', to: 'src/resources/app.version'}
]),
new MiniCssExtractPlugin({
filename: '[name].[hash].css',
chunkFilename: '[id].[hash].css'
filename: '[name].[fullhash].css',
chunkFilename: '[id].[fullhash].css'
}),
new webpack.ProvidePlugin({
$: "jquery",