@studyportals/webpack-helper 4.0.0-0 → 4.0.0-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studyportals/webpack-helper",
-  "version": "4.0.0-0",
+  "version": "4.0.0-2",
   "description": "A collection of standard configurations and helpers for webpack.",
   "main": "src/main.js",
   "scripts": {
@@ -31,7 +31,7 @@
     "@studyportals/bob-manifest-generator": "^3.0.0",
     "@studyportals/browserslist-config": "^1.2.0",
     "@studyportals/dll-availability-tracker": "^2.0.0",
-    "@studyportals/vue-config": "^4.1.3-1",
+    "@studyportals/vue-config": "^5.0.0-0",
     "@types/jest": "^27.0.0",
     "@vue/cli-plugin-babel": "^5.0.4",
     "@vue/cli-plugin-unit-jest": "^5.0.4",

package/src/defaults/production.config.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductionConfig = void 0;
 const webpack = require('webpack');
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+const cssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const DllAvailabilityTracker = require('@studyportals/dll-availability-tracker');
-exports.ProductionConfig = (bobConfig) => {
+const ProductionConfig = (bobConfig) => {
     let dllDependencies = ['library'];
     if (bobConfig && bobConfig.hasOwnProperty('dllPackages')) {
         bobConfig.dllPackages.forEach((dependency) => dllDependencies.push(dependency.manifest.name));
@@ -19,8 +19,8 @@ exports.ProductionConfig = (bobConfig) => {
                     NODE_ENV: '"production"'
                 }
             }),
-            new OptimizeCSSAssetsPlugin({
-                cssProcessorPluginOptions: {
+            new cssMinimizerPlugin({
+                minimizerOptions: {
                     preset: [
                         'default',
                         {
@@ -59,3 +59,4 @@ exports.ProductionConfig = (bobConfig) => {
         }
     };
 };
+exports.ProductionConfig = ProductionConfig;

package/src/enums/preset.js

@@ -6,4 +6,5 @@ var Preset;
     Preset["VUE_TYPESCRIPT"] = "vue-typescript";
     Preset["TYPESCRIPT"] = "typescript";
     Preset["JAVASCRIPT"] = "javascript";
+    Preset["VUE_TYPESCRIPT_NO_CODE_SPLITTING"] = "vue-typescript-no-code-splitting";
 })(Preset = exports.Preset || (exports.Preset = {}));

package/src/model/configuration.js

@@ -9,6 +9,7 @@ const preset_1 = require("../enums/preset");
 const vue_typescript_preset_1 = require("../presets/vue-typescript.preset");
 const typescript_preset_1 = require("../presets/typescript.preset");
 const javascript_preset_1 = require("../presets/javascript.preset");
+const vue_typescript_no_code_splitting_preset_1 = require("../presets/vue-typescript-no-code-splitting.preset");
 const mode_1 = require("../enums/mode");
 const production_config_1 = require("../defaults/production.config");
 const development_config_1 = require("../defaults/development.config");
@@ -30,8 +31,9 @@ class Configuration {
         const configPrd = options[mode_1.Mode.PRODUCTION] ? options[mode_1.Mode.PRODUCTION] : {};
         this.environmentSpecificConfig = {
             [mode_1.Mode.DEVELOPMENT]: merge([configDev, development_config_1.DevelopmentConfig]) || development_config_1.DevelopmentConfig,
-            [mode_1.Mode.PRODUCTION]: merge([configPrd, production_config_1.ProductionConfig(this.bob)]) || production_config_1.ProductionConfig(this.bob)
+            [mode_1.Mode.PRODUCTION]: merge([configPrd, (0, production_config_1.ProductionConfig)(this.bob)]) || (0, production_config_1.ProductionConfig)(this.bob)
         };
+        this.fileName = options.output.fileName || "[name]";
     }
     get(mode) {
         this.detectPresets(mode);
@@ -63,6 +65,9 @@ class Configuration {
             case preset_1.Preset.JAVASCRIPT:
                 this.injectPreset(new javascript_preset_1.JavascriptPreset());
                 break;
+            case preset_1.Preset.VUE_TYPESCRIPT_NO_CODE_SPLITTING:
+                this.injectPreset(new vue_typescript_no_code_splitting_preset_1.VueTypescriptNoCodeSplittingPreset(mode));
+                break;
             default:
                 break;
         }
@@ -108,12 +113,13 @@ class Configuration {
         return dependencies;
     }
     getCSSFileName() {
+        const fileName = this.fileName || `style`;
         if (this.hash === false
             || typeof this.hash.css !== 'undefined'
                 && this.hash.css === false) {
-            return 'style.css';
+            return `${fileName}.css`;
         }
-        return 'style.[fullhash].css';
+        return `${fileName}.[fullhash].css`;
     }
 }
 exports.Configuration = Configuration;

package/src/presets/typescript.preset.js

@@ -30,13 +30,24 @@ class TypeScriptPreset {
                 },
                 {
                     test: /\.tsx?$/,
-                    loader: 'ts-loader',
-                    exclude: /node_modules\/(?!@studyportals\/).*/
+                    exclude: /node_modules\/(?!@studyportals\/).*/,
+                    use: [
+                        {
+                            loader: 'babel-loader',
+                        },
+                        {
+                            loader: 'ts-loader'
+                        }
+                    ],
                 },
                 {
                     test: /\.js$/,
-                    loader: 'babel-loader',
-                    exclude: /node_modules\/(?!@studyportals\/).*/
+                    exclude: /node_modules\/(?!@studyportals\/).*/,
+                    use: [
+                        {
+                            loader: 'babel-loader',
+                        }
+                    ]
                 },
                 {
                     test: /\.(png|jpg|gif|svg)$/,

package/src/presets/vue-typescript-no-code-splitting.preset.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VueTypescriptNoCodeSplittingPreset = void 0;
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const VueLoaderPlugin = require('vue-loader').VueLoaderPlugin;
+const vue_typescript_preset_1 = require("./vue-typescript.preset");
+class VueTypescriptNoCodeSplittingPreset extends vue_typescript_preset_1.VueTypeScriptPreset {
+    constructor(mode) {
+        super(mode);
+    }
+    getPlugins(filename) {
+        return [
+            new MiniCssExtractPlugin({
+                filename
+            }),
+            new VueLoaderPlugin()
+        ];
+    }
+}
+exports.VueTypescriptNoCodeSplittingPreset = VueTypescriptNoCodeSplittingPreset;

package/src/presets/vue-typescript.preset.js

@@ -15,7 +15,8 @@ class VueTypeScriptPreset {
                 manifest: require(`@studyportals/vue-config/dist/vue3_library${this.mode === mode_1.Mode.PRODUCTION ? '.min' : ''}.json`)
             }),
             new MiniCssExtractPlugin({
-                filename
+                filename,
+                ignoreOrder: true
             }),
             new VueLoaderPlugin()
         ];
@@ -54,15 +55,26 @@ class VueTypeScriptPreset {
                 },
                 {
                     test: /\.tsx?$/,
-                    loader: 'ts-loader',
-                    exclude: /node_modules\/(?!@studyportals\/).*/,
-                    options: {
-                        appendTsSuffixTo: [/\.vue$/]
-                    },
+                    use: [
+                        {
+                            loader: 'babel-loader'
+                        },
+                        {
+                            loader: 'ts-loader',
+                            options: {
+                                appendTsSuffixTo: [/\.vue$/]
+                            }
+                        }
+                    ],
+                    exclude: /node_modules\/(?!@studyportals\/).*/
                 },
                 {
                     test: /\.js$/,
-                    loader: 'babel-loader',
+                    use: [
+                        {
+                            loader: 'babel-loader'
+                        }
+                    ],
                     exclude: /node_modules\/(?!@studyportals\/).*/
                 },
                 {