diff --git a/package.json b/package.json index c8de067e..27234e87 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "license": "GPL-3.0", "productName": "Salix", "author": "Verdnatura", + "packageManager": "pnpm@8.15.1", "repository": { "type": "git", "url": "https://git.verdnatura.es/hedera-web" @@ -34,47 +35,28 @@ "glob": "^8.0.3", "html-webpack-plugin": "^5.5.0", "json-loader": "^0.5.7", - "mini-css-extract-plugin": "^2.7.0", - "node-sass": "^7.0.1", - "postcss": "^8.4.39", - "postcss-import": "^13.0.0", - "postcss-loader": "^4.3.0", - "postcss-url": "^10.1.3", - "raw-loader": "^4.0.2", - "sass-loader": "^12.6.0", - "style-loader": "^3.3.1", - "url-loader": "^4.1.1", - "webpack": "^5.75.0", - "webpack-cli": "^4.10.0", - "webpack-dev-server": "^4.11.1", - "webpack-merge": "^5.8.0", "yaml-loader": "^0.5.0" }, "dependencies": { - "@quasar/extras": "^1.0.0", + "@quasar/cli": "^2.3.0", + "@quasar/extras": "^1.16.9", "axios": "^0.21.1", "core-js": "^3.6.5", - "eslint-plugin-cypress": "^2.13.3", "js-yaml": "^3.12.1", - "mootools": "^1.5.2", "pinia": "^2.0.11", - "promise-polyfill": "^8.2.3", - "quasar": "^2.6.0", + "quasar": "^2.14.5", "require-yaml": "0.0.1", - "tinymce": "^6.3.0", "vue": "^3.3.4", "vue-i18n": "^9.2.2", "vue-router": "^4.0.0" }, "scripts": { - "front": "webpack serve --open", "back": "cd ../vn-database && myvc start && cd ../salix && gulp backOnly", "resetDatabase": "cd ../salix && gulp docker", "cy:open": "npm run resetDatabase && cd ../hedera-web && cypress open", "test:e2e": "npm run resetDatabase && cd ../hedera-web && cypress run", "cy:open-mindshore": "npm run resetDatabase && cd ../hedera-web-mindshore && cypress open", "test:e2e-mindshore": "npm run resetDatabase && cd ../hedera-web-mindshore && cypress run", - "build": "rm -rf build/ ; webpack", "clean": "rm -rf build/", "lint": "eslint --ext .js,.vue ./" }, diff --git a/webpack.config.js b/webpack.config.js index 6f266ab9..99a55f35 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -5,7 +5,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const merge = require('webpack-merge').merge; const wpConfig = require('./webpack.config.json'); -let env = process.env.NODE_ENV || 'development'; +const env = process.env.NODE_ENV || 'development'; const devMode = env === 'development'; const outputPath = path.join(__dirname, wpConfig.buildDir); const publicPath = '/' + wpConfig.buildDir + '/'; @@ -15,7 +15,7 @@ const baseConfig = { mode: devMode ? 'development' : 'production', output: { path: outputPath, - publicPath: publicPath + publicPath }, module: { rules: [ @@ -31,16 +31,16 @@ const baseConfig = { }, { test: /tinymce\/.*\/skin\.css$/i, - use: [MiniCssExtractPlugin.loader, 'css-loader'] + use: [MiniCssExtractPlugin.loader] }, { test: /tinymce\/.*\/content\.css$/i, - loader: 'css-loader', + url: false, options: { esModule: false } }, { test: /\.css$/, - use: ['style-loader', 'css-loader'], + use: ['style-loader'], exclude: [/node_modules/] }, { @@ -59,9 +59,9 @@ const baseConfig = { test: /\.scss$/, use: [ 'style-loader', - 'css-loader', { loader: 'sass-loader', + url: false, options: { sourceMap: true } @@ -141,7 +141,6 @@ const devConfig = { static: __dirname, port: wpConfig.devServerPort, headers: { 'Access-Control-Allow-Origin': '*' }, - //stats: { chunks: false }, proxy: { '/api': 'http://localhost:3000', '/': {