Merge branch 'release/3.1.71' into v3

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Retour Changelog
 
+## 3.1.71 - 2022.04.09
+### Changed
+* No longer trim `/` from URLs that are presented in the Retour Dashboard ([#227](https://github.com/nystudio107/craft-retour/issues/227))
+
 ## 3.1.70 - 2022.01.17
 
 ### Fixed

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

@@ -45,6 +45,7 @@
     "vite-plugin-eslint": "^1.3.0",
     "vite-plugin-compression": "^0.4.0",
     "vite-plugin-externals": "^0.3.2",
+    "vite-plugin-manifest-sri": "^0.1.0",
     "vite-plugin-restart": "0.0.2",
     "vite-plugin-vue2": "^1.9.0"
   },

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

@@ -1,14 +1,16 @@
+import {defineConfig} from 'vite';
 import {createVuePlugin} from 'vite-plugin-vue2'
 import ViteRestart from 'vite-plugin-restart';
 import {viteExternalsPlugin} from 'vite-plugin-externals'
 import viteCompression from 'vite-plugin-compression';
+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 * as path from 'path';
 
 // https://vitejs.dev/config/
-export default ({command}) => ({
+export default defineConfig(({command}) => ({
   base: command === 'serve' ? '' : '/dist/',
   build: {
     emptyOutDir: true,
@@ -45,6 +47,7 @@ export default ({command}) => ({
     viteCompression({
       filter: /\.(js|mjs|json|css|map)$/i
     }),
+    manifestSRI(),
     visualizer({
       filename: '../src/web/assets/dist/stats.html',
       template: 'treemap',
@@ -71,4 +74,4 @@ export default ({command}) => ({
     port: 3001,
     strictPort: true,
   }
-});
+}));

composer.json

@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-retour",
   "description": "Retour allows you to intelligently redirect legacy URLs, so that you don't lose SEO value when rebuilding & restructuring a website",
   "type": "craft-plugin",
-  "version": "3.1.70",
+  "version": "3.1.71",
   "keywords": [
     "craftcms",
     "craft-plugin",

docs/Dockerfile

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