Merge branch 'master' into fix-step-2

Author: C85297

.cspell.json

@@ -0,0 +1,17 @@
+{
+    "version": "0.2",
+    "language": "en,en-gb",
+    "words": [],
+    "dictionaries": [
+      "npm",
+      "softwareTerms",
+      "node",
+      "html",
+      "css",
+      "bash",
+      "en-gb",
+      "misc"
+    ],
+    "ignorePaths": ["package.json", "package-lock.json", "node_modules"]
+  }
+  

.devcontainer/devcontainer.json

@@ -0,0 +1,41 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
+{
+	"name": "CyberChef",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/javascript-node:1-18-bookworm",
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	"features": {
+		"ghcr.io/devcontainers/features/github-cli": "latest"
+	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"forwardPorts": [8080],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": {
+		"npm": "bash -c \"sudo chown node node_modules && npm install\""
+	},
+
+	"containerEnv": {
+		"DISPLAY": ":99"
+	},
+
+	"mounts": [
+		"source=${localWorkspaceFolderBasename}-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume"
+	],
+
+	// Configure tool-specific properties.
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"dbaeumer.vscode-eslint",
+				"GitHub.vscode-github-actions"
+			]
+		}
+	}
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+build

.editorconfig

@@ -12,3 +12,7 @@ indent_size = 4
 [{package.json,.travis.yml,nightwatch.json}]
 indent_style = space
 indent_size = 2
+
+[.github/**.yml]
+indent_style = space
+indent_size = 2

.eslintignore

@@ -0,0 +1 @@
+* text=auto eol=lf

.eslintrc.json

@@ -1,57 +1,64 @@
 name: "Master Build, Test & Deploy"
 
+permissions:
+  contents: read
+
 on:
   workflow_dispatch:
   push:
     branches:
-    - master
+      - master
 
 jobs:
   main:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Set node version
-      uses: actions/setup-node@v3
-      with:
-        node-version: '18.x'
-
-    - name: Install
-      run: |
-        npm install
-        npm run setheapsize
-
-    - name: Lint
-      run: npx grunt lint
-
-    - name: Unit Tests
-      run: |
-        npm test
-        npm run testnodeconsumer
-
-    - name: Production Build
-      if: success()
-      run: npx grunt prod --msg="Version 10 is here! Read about the new features <a href='https://github.com/gchq/CyberChef/wiki/Character-encoding,-EOL-separators,-and-editor-features'>here</a>"
-
-    - name: Generate sitemap
-      run: npx grunt exec:sitemap
-
-    - name: UI Tests
-      if: success()
-      run: |
-        sudo apt-get install xvfb
-        xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
-
-    - name: Prepare for GitHub Pages
-      if: success()
-      run: npx grunt copy:ghPages
-
-    - name: Deploy to GitHub Pages
-      if: success() && github.ref == 'refs/heads/master'
-      uses: crazy-max/ghaction-github-pages@v3
-      with:
-        target_branch: gh-pages
-        build_dir: ./build/prod
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v6
+
+      - name: Set node version
+        uses: actions/setup-node@v6
+        with:
+          node-version: 18
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Install
+        run: |
+          export DETECT_CHROMEDRIVER_VERSION=true
+          npm install
+          npm run setheapsize
+
+      - name: Lint
+        run: npx grunt lint
+
+      - name: Unit Tests
+        run: |
+          npm test
+          npm run testnodeconsumer
+
+      - name: Production Build
+        if: success()
+        run: npx grunt prod --msg=""
+
+      - name: Generate sitemap
+        run: npx grunt exec:sitemap
+
+      - name: UI Tests
+        if: success()
+        run: |
+          sudo apt-get install xvfb
+          xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
+
+      - name: Prepare for GitHub Pages
+        if: success()
+        run: npx grunt copy:ghPages
+
+      - name: Deploy to GitHub Pages
+        if: success() && github.ref == 'refs/heads/master'
+        uses: crazy-max/ghaction-github-pages@v3
+        with:
+          target_branch: gh-pages
+          build_dir: ./build/prod
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}