@studyportals/webpack-helper 3.2.6 → 4.0.0-0

package/README.md

@@ -264,3 +264,7 @@ In order to comply to [Studyportals' definition of done](https://knowledge-vault
 
 - `.babelrc`: A standard configuration for babel that loads the `babel-env` and `babel-typescripts` presets. You might need to add more plugins for your specific project.
 - `.browserslistrc`: A configuration file for browserslist. This is used by `babel-env` to determine which browsers to transpile the code for. Within this file the configuration for student facing products will be loaded by default but other configurations can be easily loaded by uncommenting some lines.
+
+## Unit testing
+
+From version `3.2.6` onwards, any dependencies that are required to run unit tests with Jest are included in the `package.json` of `webpack-helper`. As a result, these no longer have to be installed in individual microservices.

package/assets/.browserslistrc

@@ -1,3 +1,3 @@
-#extends @studyportals/browserslist-config/clients
-#extends @studyportals/browserslist-config/internal
+#extends @studyportals/browserslist-config/clients
+#extends @studyportals/browserslist-config/internal
 extends @studyportals/browserslist-config/student

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studyportals/webpack-helper",
-  "version": "3.2.6",
+  "version": "4.0.0-0",
   "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.2",
+    "@studyportals/vue-config": "^4.1.3-1",
     "@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 cssMinimizerPlugin = require('css-minimizer-webpack-plugin');
+const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const DllAvailabilityTracker = require('@studyportals/dll-availability-tracker');
-const ProductionConfig = (bobConfig) => {
+exports.ProductionConfig = (bobConfig) => {
     let dllDependencies = ['library'];
     if (bobConfig && bobConfig.hasOwnProperty('dllPackages')) {
         bobConfig.dllPackages.forEach((dependency) => dllDependencies.push(dependency.manifest.name));
@@ -19,8 +19,8 @@ const ProductionConfig = (bobConfig) => {
                     NODE_ENV: '"production"'
                 }
             }),
-            new cssMinimizerPlugin({
-                minimizerOptions: {
+            new OptimizeCSSAssetsPlugin({
+                cssProcessorPluginOptions: {
                     preset: [
                         'default',
                         {
@@ -59,4 +59,3 @@ const ProductionConfig = (bobConfig) => {
         }
     };
 };
-exports.ProductionConfig = ProductionConfig;

package/src/enums/preset.js

@@ -6,5 +6,4 @@ 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,7 +9,6 @@ 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");
@@ -31,9 +30,8 @@ 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, (0, production_config_1.ProductionConfig)(this.bob)]) || (0, production_config_1.ProductionConfig)(this.bob)
+            [mode_1.Mode.PRODUCTION]: merge([configPrd, production_config_1.ProductionConfig(this.bob)]) || production_config_1.ProductionConfig(this.bob)
         };
-        this.fileName = options.output.fileName || "[name]";
     }
     get(mode) {
         this.detectPresets(mode);
@@ -65,9 +63,6 @@ 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;
         }
@@ -113,13 +108,12 @@ class Configuration {
         return dependencies;
     }
     getCSSFileName() {
-        const fileName = this.fileName || `style`;
         if (this.hash === false
             || typeof this.hash.css !== 'undefined'
                 && this.hash.css === false) {
-            return `${fileName}.css`;
+            return 'style.css';
         }
-        return `${fileName}.[fullhash].css`;
+        return 'style.[fullhash].css';
     }
 }
 exports.Configuration = Configuration;

package/src/presets/typescript.preset.js

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

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

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

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

@@ -1,20 +0,0 @@
-"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;