Merge branch 'release/1.2.22' into v1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Transcoder Changelog
 
+## 1.2.22 - 2022.04.09
+### Changed
+* Added `synchronous` & `stripMetadata` to the parameters that should be excluded from the generated file name
+
 ## 1.2.21 - 2022.01.12
 
 ### Added

buildchain/Dockerfile

@@ -1,6 +1,8 @@
 ARG TAG=16-alpine
 FROM nystudio107/node-dev-base:$TAG
 
+USER node
+
 WORKDIR /app/buildchain/
 
 CMD ["run build"]

buildchain/package.json

@@ -29,6 +29,7 @@
     "vite": "^2.7.0",
     "vite-plugin-compression": "^0.4.0",
     "vite-plugin-eslint": "^1.3.0",
+    "vite-plugin-manifest-sri": "^0.1.0",
     "vite-plugin-restart": "0.0.2"
   },
   "scripts": {

buildchain/vite.config.js → buildchain/vite.config.ts

@@ -1,13 +1,15 @@
+import {defineConfig} from 'vite';
 import vue from '@vitejs/plugin-vue'
 import ViteRestart from 'vite-plugin-restart';
 import viteCompression from 'vite-plugin-compression';
-import { visualizer } from 'rollup-plugin-visualizer';
+import manifestSRI from 'vite-plugin-manifest-sri';
+import {visualizer} from 'rollup-plugin-visualizer';
 import eslintPlugin from 'vite-plugin-eslint';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import path from 'path';
+import {nodeResolve} from '@rollup/plugin-node-resolve';
+import * as path from 'path';
 
 // https://vitejs.dev/config/
-export default ({ command }) => ({
+export default defineConfig(({command}) => ({
   base: command === 'serve' ? '' : '/dist/',
   build: {
     emptyOutDir: true,
@@ -26,24 +28,27 @@ export default ({ command }) => ({
   plugins: [
     nodeResolve({
       moduleDirectories: [
-         path.resolve('./node_modules'),
+        path.resolve('./node_modules'),
       ],
     }),
     ViteRestart({
       reload: [
-          './src/templates/**/*',
+        './src/templates/**/*',
       ],
     }),
     vue(),
     viteCompression({
       filter: /\.(js|mjs|json|css|map)$/i
     }),
+    manifestSRI(),
     visualizer({
       filename: '../src/web/assets/dist/stats.html',
       template: 'treemap',
       sourcemap: true,
     }),
-    eslintPlugin(),
+    eslintPlugin({
+      cache: false,
+    }),
   ],
   publicDir: '../src/web/assets/public',
   resolve: {
@@ -61,4 +66,4 @@ export default ({ command }) => ({
     port: 3001,
     strictPort: true,
   }
-});
+}));

composer.json

@@ -1,46 +1,46 @@
 {
-    "name": "nystudio107/craft-transcoder",
-    "description": "Transcode video & audio files to various formats, and provide video thumbnails",
-    "type": "craft-plugin",
-    "version": "1.2.21",
-    "keywords": [
-        "craft",
-        "cms",
-        "craftcms",
-        "craft-plugin",
-        "transcoder",
-        "transcode",
-        "video",
-        "audio",
-        "gif",
-        "convert",
-        "format"
-    ],
-    "support": {
-        "docs": "https://nystudio107.com/plugins/transcoder/documentation",
-        "issues": "https://nystudio107.com/plugins/transcoder/support"
-    },
-    "license": "proprietary",
-    "authors": [
-        {
-            "name": "nystudio107",
-            "homepage": "https://nystudio107.com"
-        }
-    ],
-    "require": {
-        "craftcms/cms": "^3.1.0",
-        "nystudio107/craft-plugin-vite": "^1.0.4",
-        "mikehaertl/php-shellcommand": "~1.2"
-    },
-    "autoload": {
-        "psr-4": {
-          "nystudio107\\transcoder\\": "src/"
-        }
-    },
-    "extra": {
-        "name": "Transcoder",
-        "handle": "transcoder",
-        "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-transcoder/v1/CHANGELOG.md",
-        "class": "nystudio107\\transcoder\\Transcoder"
+  "name": "nystudio107/craft-transcoder",
+  "description": "Transcode video & audio files to various formats, and provide video thumbnails",
+  "type": "craft-plugin",
+  "version": "1.2.22",
+  "keywords": [
+    "craft",
+    "cms",
+    "craftcms",
+    "craft-plugin",
+    "transcoder",
+    "transcode",
+    "video",
+    "audio",
+    "gif",
+    "convert",
+    "format"
+  ],
+  "support": {
+    "docs": "https://nystudio107.com/plugins/transcoder/documentation",
+    "issues": "https://nystudio107.com/plugins/transcoder/support"
+  },
+  "license": "proprietary",
+  "authors": [
+    {
+      "name": "nystudio107",
+      "homepage": "https://nystudio107.com"
     }
+  ],
+  "require": {
+    "craftcms/cms": "^3.1.0",
+    "nystudio107/craft-plugin-vite": "^1.0.4",
+    "mikehaertl/php-shellcommand": "~1.2"
+  },
+  "autoload": {
+    "psr-4": {
+      "nystudio107\\transcoder\\": "src/"
+    }
+  },
+  "extra": {
+    "name": "Transcoder",
+    "handle": "transcoder",
+    "changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-transcoder/v1/CHANGELOG.md",
+    "class": "nystudio107\\transcoder\\Transcoder"
+  }
 }

docs/Dockerfile

@@ -1,6 +1,8 @@
 ARG TAG=14-alpine
 FROM node:$TAG
 
+USER node
+
 WORKDIR /app/
 
 CMD ["run build"]

docs/docs/.vitepress/config.js

@@ -1,29 +1,30 @@
 module.exports = {
-    title: 'Transcoder Plugin Documentation',
-    description: 'Documentation for the Transcoder plugin',
-    base: '/docs/transcoder/',
-    lang: 'en-US',
-    head: [
-        ['meta', { content: 'https://github.com/nystudio107', property: 'og:see_also', }],
-        ['meta', { content: 'https://www.youtube.com/channel/UCOZTZHQdC-unTERO7LRS6FA', property: 'og:see_also', }],
-        ['meta', { content: 'https://www.facebook.com/newyorkstudio107', property: 'og:see_also', }],
-    ],
-    themeConfig: {
-        repo: 'nystudio107/craft-transcoder',
-        docsDir: 'docs/docs',
-        docsBranch: 'develop',
-        algolia: {
-            apiKey: '14f28d1e87ded365acc21d0e921732e6',
-            indexName: 'transcoder'
-        },
-        editLinks: true,
-        editLinkText: 'Edit this page on GitHub',
-        lastUpdated: 'Last Updated',
-        sidebar: [
-            { text: 'Transcoder Plugin', link: '/' },
-            { text: 'Transcoder Overview', link: '/overview.html' },
-            { text: 'Configuring Transcoder', link: '/configuring.html' },
-            { text: 'Using Transcoder', link: '/using.html' },
-        ],
+  title: 'Transcoder Plugin Documentation',
+  description: 'Documentation for the Transcoder plugin',
+  base: '/docs/transcoder/',
+  lang: 'en-US',
+  head: [
+    ['meta', {content: 'https://github.com/nystudio107', property: 'og:see_also',}],
+    ['meta', {content: 'https://www.youtube.com/channel/UCOZTZHQdC-unTERO7LRS6FA', property: 'og:see_also',}],
+    ['meta', {content: 'https://www.facebook.com/newyorkstudio107', property: 'og:see_also',}],
+  ],
+  themeConfig: {
+    repo: 'nystudio107/craft-transcoder',
+    docsDir: 'docs/docs',
+    docsBranch: 'develop',
+    algolia: {
+      appId: 'VWUWF9S521',
+      apiKey: 'db5c03f88e474cbf0356841089be7ffa',
+      indexName: 'transcoder'
     },
+    editLinks: true,
+    editLinkText: 'Edit this page on GitHub',
+    lastUpdated: 'Last Updated',
+    sidebar: [
+      {text: 'Transcoder Plugin', link: '/'},
+      {text: 'Transcoder Overview', link: '/overview.html'},
+      {text: 'Configuring Transcoder', link: '/configuring.html'},
+      {text: 'Using Transcoder', link: '/using.html'},
+    ],
+  },
 };