Merge branch 'release/3.1.0'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-root",
-  "version": "3.1.0-alpha.5",
+  "version": "3.1.0",
   "private": true,
   "type": "commonjs",
   "workspaces": [
@@ -14,8 +14,8 @@
   },
   "devDependencies": {
     "@studiometa/eslint-config": "^2.1.3",
-    "@studiometa/prettier-config": "^2.0.1",
+    "@studiometa/prettier-config": "^2.1.1",
     "eslint": "^7.32.0",
-    "prettier": "^2.3.2"
+    "prettier": "^2.6.0"
   }
 }

packages/demo/meta.config.js

@@ -1,6 +1,6 @@
-import { createConfig } from '@studiometa/webpack-config';
+import { defineConfig } from '@studiometa/webpack-config';
 
-export default createConfig({
+export default defineConfig({
   presets: ['prototyping', 'yaml'],
   // Exclude the `test.scss` file from the merge
   mergeCSS: /^(?!.*css\/test\.scss).*$/,

packages/demo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config-demo",
-  "version": "3.1.0-alpha.5",
+  "version": "3.1.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -9,17 +9,17 @@
   },
   "devDependencies": {
     "@studiometa/eslint-config": "^2.1.3",
-    "@studiometa/prettier-config": "^2.0.1",
+    "@studiometa/prettier-config": "^2.1.1",
     "@studiometa/stylelint-config": "^2.0.0",
     "@studiometa/webpack-config": "file:../webpack-config",
     "eslint": "^7.32.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.6.0",
     "stylelint": "^13.13.1",
-    "tailwindcss": "^2.2.9"
+    "tailwindcss": "^2.2.19"
   },
   "dependencies": {
-    "@studiometa/js-toolkit": "^2.0.0-beta.0",
-    "@studiometa/ui": "^0.1.0",
-    "vue": "^3.2.22"
+    "@studiometa/js-toolkit": "^2.0.0-beta.18",
+    "@studiometa/ui": "^0.2.3",
+    "vue": "^2.6.14"
   }
 }

packages/demo/src/js/Counter.vue

@@ -17,6 +17,7 @@
 </template>
 
 <script>
+  // eslint-disable-next-line import/no-unresolved
   import VueIcon from '../svg/icon.svg?as-vue-component';
 
   export default {

packages/demo/src/js/app.js

@@ -1,6 +1,6 @@
 import { Base, createApp } from '@studiometa/js-toolkit';
 import { Cursor } from '@studiometa/ui';
-import { createApp as createVueApp } from 'vue';
+import Vue from 'vue';
 import VueComponent from './VueComponent.vue';
 import config from './config.yaml';
 
@@ -41,7 +41,7 @@ class App extends Base {
    */
   async onClick() {
     const { default: VueCounter } = await import(/* webpackPreload: true */ './Counter.vue');
-    this.vue = createVueApp({
+    this.vue = new Vue({
       components: {
         VueCounter,
       },

packages/demo/src/js/components/Component.js

@@ -1,5 +1,5 @@
 import { Base } from '@studiometa/js-toolkit';
-import './Component.css';
+import './Component.scss';
 
 // eslint-disable-next-line require-jsdoc
 export default class Component extends Base {

packages/demo/src/js/components/Component.css → packages/demo/src/js/components/Component.scss

@@ -3,5 +3,5 @@
 }
 
 body {
-  /*opacity: 0.1;*/
+  opacity: 0.1;
 }

packages/webpack-config/jsconfig.json

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+  },
+  "include": [
+    "src/**/*.js",
+    "src/**/*.d.ts"
+  ]
+}

packages/webpack-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/webpack-config",
-  "version": "3.1.0-alpha.5",
+  "version": "3.1.0",
   "description": "A basic webpack config",
   "type": "module",
   "main": "src/index.js",
@@ -35,69 +35,69 @@
   "homepage": "https://github.com/studiometa/webpack-config#readme",
   "devDependencies": {
     "@studiometa/eslint-config": "^2.1.3",
-    "@studiometa/prettier-config": "^2.0.1",
+    "@studiometa/prettier-config": "^2.1.1",
     "eslint": "7.32.0",
-    "prettier": "2.4.1",
+    "prettier": "2.6.0",
     "stylelint": "13.13.1"
   },
   "peerDependencies": {
     "@studiometa/eslint-config": "^2.1.3",
-    "@studiometa/prettier-config": "^2.0.1",
+    "@studiometa/prettier-config": "^2.1.1",
     "@studiometa/stylelint-config": "^2.0.0",
     "eslint": "^7.32.0",
     "prettier": "^2.3.2",
     "stylelint": "^13.13.1"
   },
   "dependencies": {
-    "@babel/plugin-transform-runtime": "^7.16.4",
-    "@babel/preset-env": "^7.16.4",
+    "@babel/plugin-transform-runtime": "^7.17.0",
+    "@babel/preset-env": "^7.16.11",
     "@npmcli/move-file": "^1.1.2",
     "@soda/friendly-errors-webpack-plugin": "^1.8.1",
     "@types/browser-sync": "^2.26.3",
-    "autoprefixer": "^10.4.0",
+    "autoprefixer": "^10.4.4",
     "babel-loader": "^8.2.3",
-    "browser-sync": "^2.27.7",
+    "browser-sync": "^2.27.9",
     "cac": "^6.7.12",
     "chalk": "^4.1.2",
     "common-dir": "^3.0.1",
-    "core-js": "^3.19.1",
-    "css-loader": "^6.5.1",
-    "css-minimizer-webpack-plugin": "^3.1.4",
+    "core-js": "^3.21.1",
+    "css-loader": "^6.7.1",
+    "css-minimizer-webpack-plugin": "^3.4.1",
     "dotenv": "^10.0.0",
-    "esbuild-loader": "^2.16.0",
+    "esbuild-loader": "^2.18.0",
     "eslint-webpack-plugin": "^3.1.1",
     "filemanager-webpack-plugin": "^6.1.7",
-    "find-up": "^6.2.0",
+    "find-up": "^6.3.0",
     "glob": "^7.2.0",
     "html-webpack-plugin": "^5.5.0",
     "js-yaml-loader": "^1.2.2",
     "lodash.merge": "^4.6.2",
-    "mini-css-extract-plugin": "^2.4.5",
+    "mini-css-extract-plugin": "^2.6.0",
     "param-case": "^3.0.4",
-    "postcss": "^8.3.11",
-    "postcss-loader": "^6.2.0",
-    "postcss-preset-env": "^6.7.0",
+    "postcss": "^8.4.12",
+    "postcss-loader": "^6.2.1",
+    "postcss-preset-env": "^6.7.1",
     "raw-loader": "^4.0.2",
     "resolve-url-loader": "^4.0.0",
-    "sass": "^1.43.4",
-    "sass-loader": "^12.3.0",
+    "sass": "^1.49.9",
+    "sass-loader": "^12.6.0",
     "style-loader": "^3.3.1",
-    "stylelint-webpack-plugin": "^3.1.0",
-    "tailwind-config-viewer": "^1.6.2",
-    "terser-webpack-plugin": "^5.2.5",
+    "stylelint-webpack-plugin": "^3.1.1",
+    "tailwind-config-viewer": "^1.6.3",
+    "terser-webpack-plugin": "^5.3.1",
     "twig-html-loader": "^0.1.9",
     "vue-loader": "^15.9.8",
     "vue-svg-loader": "^0.16.0",
     "vue-template-compiler": "^2.6.14",
-    "webpack": "^5.64.1",
-    "webpack-assets-manifest": "^5.0.6",
+    "webpack": "^5.70.0",
+    "webpack-assets-manifest": "^5.1.0",
     "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-dev-middleware": "^5.2.2",
+    "webpack-dev-middleware": "^5.3.1",
     "webpack-glob-entry": "^2.1.1",
     "webpack-hot-middleware": "^2.25.1",
     "webpack-merge": "^5.8.0",
     "webpack-module-hot-accept": "^1.0.5",
-    "webpack-remove-empty-scripts": "^0.7.1",
+    "webpack-remove-empty-scripts": "^0.7.3",
     "webpackbar": "^5.0.2"
   }
 }

packages/webpack-config/src/index.js

@@ -12,6 +12,16 @@ export function createConfig(config) {
   return config;
 }
 
+/**
+ * Define the configuration.
+ * @template {MetaConfig} T
+ * @param   {T} config
+ * @returns {T}
+ */
+export function defineConfig(config) {
+  return config;
+}
+
 /**
  * Get the generated Webpack configuration.
  *

packages/webpack-config/src/presets/prototyping.js

@@ -1,5 +1,6 @@
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import FileManagerPlugin from 'filemanager-webpack-plugin';
+import fs from 'fs';
 import glob from 'glob';
 import path from 'path';
 import merge from 'lodash.merge';
@@ -130,7 +131,7 @@ export default async (config, options) => {
       })
   );
 
-  if (!isDev) {
+  if (!isDev && fs.existsSync(path.resolve('./public'))) {
     plugins.push(
       // Public assets
       new FileManagerPlugin({

packages/webpack-config/src/webpack.base.config.js

@@ -66,7 +66,7 @@ export default async (config, options = {}) => {
     experiments: {
       outputModule: isModern || isDev,
       backCompat: false,
-      futureDefaults: true,
+      futureDefaults: false,
     },
     cache: {
       type: 'filesystem',