1
0
Fork 0

fix babel and hopefully CI too

This commit is contained in:
ChaotiCryptidz 2022-01-11 13:16:08 +00:00
parent ee73b19704
commit 69daec708a
3 changed files with 19 additions and 18 deletions

View file

@ -22,7 +22,6 @@
"eslint-plugin-sort-imports-es6-autofix": "^0.6.0", "eslint-plugin-sort-imports-es6-autofix": "^0.6.0",
"git-revision-webpack-plugin": "^5.0.0", "git-revision-webpack-plugin": "^5.0.0",
"html-webpack-plugin": "^5.5.0", "html-webpack-plugin": "^5.5.0",
"mini-css-extract-plugin": "^2.4.6",
"node-sass": "^7.0.1", "node-sass": "^7.0.1",
"prettier": "^2.5.1", "prettier": "^2.5.1",
"raw-loader": "^4.0.2", "raw-loader": "^4.0.2",
@ -34,17 +33,18 @@
"webpack-dev-server": "^4.7.2" "webpack-dev-server": "^4.7.2"
}, },
"dependencies": { "dependencies": {
"preact-router": "^4.0.0", "@babel/plugin-syntax-import-assertions": "^7.16.7",
"uikit": "^3.9.4",
"preact": "^10.6.4",
"prismjs": "^1.26.0",
"qr-scanner": "^1.3.0",
"normalize.css": "^8.0.1",
"file-saver": "^2.0.5",
"clipboard": "^2.0.8", "clipboard": "^2.0.8",
"codejar": "^3.5.0", "codejar": "^3.5.0",
"core-js": "^3.20.2", "core-js": "^3.20.2",
"date-fns": "^2.28.0", "date-fns": "^2.28.0",
"i18next": "^21.6.5" "file-saver": "^2.0.5",
"i18next": "^21.6.5",
"normalize.css": "^8.0.1",
"preact": "^10.6.4",
"preact-router": "^4.0.0",
"prismjs": "^1.26.0",
"qr-scanner": "^1.3.0",
"uikit": "^3.9.4"
} }
} }

View file

@ -2,7 +2,6 @@ const path = require('path');
const webpack = require('webpack'); const webpack = require('webpack');
var os = require("os"); var os = require("os");
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin');
const { GitRevisionPlugin } = require('git-revision-webpack-plugin'); const { GitRevisionPlugin } = require('git-revision-webpack-plugin');
const gitRevisionPlugin = new GitRevisionPlugin(); const gitRevisionPlugin = new GitRevisionPlugin();
@ -22,7 +21,6 @@ module.exports = {
timings: true, timings: true,
}, },
plugins: [ plugins: [
new MiniCssExtractPlugin(),
new HtmlWebpackPlugin({ title: "VaultUI" }), new HtmlWebpackPlugin({ title: "VaultUI" }),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
BUILD_STRING: BUILD_STRING:

View file

@ -4,7 +4,6 @@ var os = require("os");
const TerserPlugin = require("terser-webpack-plugin"); const TerserPlugin = require("terser-webpack-plugin");
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin');
const { GitRevisionPlugin } = require('git-revision-webpack-plugin'); const { GitRevisionPlugin } = require('git-revision-webpack-plugin');
const gitRevisionPlugin = new GitRevisionPlugin(); const gitRevisionPlugin = new GitRevisionPlugin();
@ -19,8 +18,7 @@ var babelOptions = {
"targets": { "targets": {
"firefox": "78", "firefox": "78",
"chrome": "84", "chrome": "84",
"safari": "11.1" "safari": "11.1"
} }
} }
] ]
@ -28,7 +26,8 @@ var babelOptions = {
"plugins": [ "plugins": [
["@babel/plugin-proposal-decorators", { "decoratorsBeforeExport": true }], ["@babel/plugin-proposal-decorators", { "decoratorsBeforeExport": true }],
["@babel/plugin-proposal-class-properties"], ["@babel/plugin-proposal-class-properties"],
["@babel/transform-runtime"] ["@babel/transform-runtime"],
["@babel/plugin-syntax-import-assertions"]
] ]
}; };
@ -48,7 +47,6 @@ module.exports = {
timings: true, timings: true,
}, },
plugins: [ plugins: [
new MiniCssExtractPlugin(),
new HtmlWebpackPlugin({ title: "VaultUI" }), new HtmlWebpackPlugin({ title: "VaultUI" }),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
BUILD_STRING: BUILD_STRING:
@ -66,11 +64,16 @@ module.exports = {
module: { module: {
rules: [ rules: [
{
assert: { type: "css" },
loader: "css-loader",
options: {
exportType: "string",
},
},
{ {
test: /\.(sa|sc|c)ss$/, test: /\.(sa|sc|c)ss$/,
use: [ use: [
MiniCssExtractPlugin.loader,
{loader: "css-loader", options: {exportType: "string"}},
"sass-loader" "sass-loader"
], ],
}, },