Merge branch 'release/1.2.13' into v1

Author: Andrew Welch

.gitignore

@@ -1,16 +1,28 @@
+# Craft .gitignore
+#
+# Example .gitignore file for Craft CMS projects
+#
+# @author    nystudio107
+# @copyright Copyright (c) 2017 nystudio107
+# @link      https://nystudio107.com/
+# @package   craft-scripts
+# @since     1.1.0
+# @license   MIT
+
+# This file should be renamed to '.gitignore' and placed in your
+# Craft CMS project root directory
+
 # CRAFT ENVIRONMENT
-.env.php
-.env.sh
 .env
 
 # COMPOSER
 /vendor
 
 # BUILD FILES
-/bower_components/*
-/node_modules/*
-/build/*
-/yarn-error.log
+bower_components
+node_modules
+yarn-error.log
+npm-error.log
 
 # MISC FILES
 .cache
@@ -30,5 +42,3 @@
 !.vscode/extensions.json
 config.codekit3
 prepros-6.config
-
-# BUILD FILES

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Transcoder Changelog
 
+## 1.2.13 - 2020.12.21 [CRITICAL]
+### Security
+* Added a `$enableDownloadFileEndpoint` settings/config option (set to `false` by default) to control whether the download files action is publicly accessible
+* The download files action now strips any relative paths from the incoming request
+* The download files action now restricts downloads to Craft's [allowedFileExtensions](https://craftcms.com/docs/3.x/config/config-settings.html#allowedfileextensions)
+
+### Changed
+* Moved the CSS/JS buildchain over to webpack 5
+
 ## 1.2.12 - 2020.04.06
 ### Added
 * Added `seekInSecs` option to audio encoding options

buildchain/.env.example

@@ -0,0 +1,6 @@
+# webpack example settings for Homestead/Vagrant
+PUBLIC_PATH=""
+DEVSERVER_PUBLIC="http://192.168.10.10:8080"
+DEVSERVER_HOST="0.0.0.0"
+DEVSERVER_POLL=1000
+DEVSERVER_PORT=8080

buildchain/.eslintignore

@@ -0,0 +1,25 @@
+{
+  "root": true,
+  "parser": "vue-eslint-parser",
+  "parserOptions": {
+    "parser": "@typescript-eslint/parser",
+    "ecmaVersion": 2020,
+    "sourceType": "module"
+  },
+  "rules": {
+    "@typescript-eslint/no-var-requires": 0
+  },
+  "env": {
+    "browser": true,
+    "amd": true,
+    "node": true
+  },
+  "plugins": [
+    "@typescript-eslint"
+  ],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:vue/vue3-recommended"
+  ]
+}

buildchain/.eslintrc

@@ -0,0 +1,14 @@
+{
+  "extends": "stylelint-config-recommended",
+  "rules": {
+    "at-rule-no-unknown": [ true, {
+      "ignoreAtRules": [
+        "screen",
+        "extends",
+        "responsive",
+        "tailwind"
+      ]
+    }],
+    "block-no-empty": null
+  }
+}

buildchain/.stylelintrc.json

@@ -0,0 +1,86 @@
+// node modules
+const { merge } = require('webpack-merge');
+
+/**
+ * return a webpack settings file
+ * @param name string
+ * @returns {{}}
+ */
+const getWebpackSettings = (name) => {
+    let settings = {};
+    try {
+        settings = require('./webpack-settings/' + name + '.settings.js');
+    } catch (e) {
+        // that's okay
+    }
+
+    return settings;
+};
+
+/**
+ * return a webpack settings file combined with the 'app' settings
+ * @param name string
+ * @returns {{}}
+ */
+const getCombinedWebpackSettings = (name) => ({
+    ...getWebpackSettings('app'),
+    ...getWebpackSettings(name),
+});
+
+/**
+ * return a legacy webpack config file
+ * @param name
+ * @returns {{}}
+ */
+const getLegacyWebpackConfig = (name) => require('./webpack-configs/' + name + '.config.js')('legacy', getCombinedWebpackSettings(name));
+
+/**
+ * return a modern webpack config file
+ * @param name
+ * @returns {{}}
+ */
+const getModernWebpackConfig = (name) => require('./webpack-configs/' + name + '.config.js')('modern', getCombinedWebpackSettings(name));
+
+/**
+ * return an array of webpack configs using the function provided in getWebpackConfig
+ * @param names            string[]
+ * @param getWebpackConfig function
+ * @returns {{}}
+ */
+const webpackConfigs = (names, getWebpackConfig) => {
+    let config = {};
+    names.forEach((name) => config = merge(config, getWebpackConfig(name)));
+
+    return config;
+};
+
+/**
+ * return an array of build webpack configs
+ * @param names string
+ * @returns {{}}
+ */
+const buildWebpackConfigs = (...names) => webpackConfigs(names, getModernWebpackConfig);
+
+/**
+ * return an array of legacy webpack configs
+ * @param names string
+ * @returns {{}}
+ */
+const legacyWebpackConfigs = (...names) => webpackConfigs(names, getLegacyWebpackConfig);
+
+/**
+ * return an array of modern webpack configs
+ * @param names string
+ * @returns {{}}
+ */
+const modernWebpackConfigs = (...names) => webpackConfigs(names, getModernWebpackConfig);
+
+// module exports
+module.exports = {
+    getWebpackSettings,
+    getLegacyWebpackConfig,
+    getModernWebpackConfig,
+    buildWebpackConfigs,
+    legacyWebpackConfigs,
+    modernWebpackConfigs,
+};

buildchain/get-webpack-config.js

@@ -0,0 +1,8 @@
+{
+  "watch": [
+    "webpack.dev.js",
+    "webpack-configs/*.js",
+    "webpack-settings/*.js"
+  ],
+  "exec": "webpack serve --config webpack.dev.js"
+}