🔀 Merge pull request #486 from FrostCo/changes

Changes

Author: richardfrost

.gitattributes

@@ -9,7 +9,3 @@ text eol=lf
 /src/static/w3-color-flat.css linguist-vendored
 /store/* linguist-vendored
 /test/* linguist-documentation
-
-# Filters (clean/smudge)
-"safari/Advanced Profanity Filter.xcodeproj/project.pbxproj" filter=safari
-"safari/Shared (App)/ViewController.swift" filter=safari

.vscode/extensions.json

@@ -1,7 +1,8 @@
 {
   "recommendations": [
-    "kamikillerto.vscode-colorize",
     "dbaeumer.vscode-eslint",
-    "shardulm94.trailing-spaces"
+    "kamikillerto.vscode-colorize",
+    "shardulm94.trailing-spaces",
+    "vscode-icons-team.vscode-icons"
   ]
 }

.vscode/settings.json

@@ -1,5 +1,15 @@
 {
   "files.associations": {
     "**/*.js.example": "javascript"
-  }
+  },
+  "vsicons.associations.files": [
+    {
+      "icon": "webpack",
+      "extensions": [
+        "webpack.bookmarklet.js"
+      ],
+      "filename": true,
+      "format": "svg"
+    }
+  ]
 }

bin/copy-static.mjs

@@ -3,5 +3,4 @@ import fse from 'fs-extra';
 
 console.log('Copying static assets to ./dist folder...');
 fse.copySync('./src/static', './dist');
-fse.copySync('./src/audio', './dist/audio');
 fse.copySync('./src/img', './dist/img');

bin/git-filters/safari.js.example

@@ -1,5 +1,6 @@
 /* eslint-disable no-console */
 import AdmZip from 'adm-zip';
+import { globbySync } from 'globby';
 import { buildFilePath, loadJSONFile, removeFiles } from './lib.mjs';
 
 let buildData;
@@ -8,6 +9,14 @@ const dist = './dist/';
 function buildArchive() {
   const zip = new AdmZip();
   zip.addLocalFolder(dist, null);
+
+  // Remove unwanted files
+  const filesToRemove = globbySync(['dist/**/*.LICENSE.txt']);
+  for (const file of filesToRemove) {
+    const entry = file.replace(/^dist\//, '');
+    zip.deleteFile(entry);
+  }
+
   return zip;
 }
 

bin/package-extension.mjs

@@ -1,33 +1,16 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable no-console */
 import fse from 'fs-extra';
-import path from 'path';
 import {
   buildFilePath,
   distManifestPath,
   loadJSONFile,
-  removeFiles,
   srcManifestPath,
   writeJSONFile
 } from './lib.mjs';
 
 let buildData;
-
-function appleBuild(updateBuildNumber) {
-  const files = [
-    path.join('dist', 'img', 'donate.gif'),
-    path.join('dist', 'img', 'patreon-small.png'),
-    path.join('dist', 'img', 'patreon.png'),
-  ];
-
-  removeOptionPageBookmarklet();
-  removeOptionPageDonations();
-  removeFiles(files);
-
-  if (buildData.release) {
-    updateSafariXcodeVersion(updateBuildNumber);
-  }
-}
+let distDir = 'dist';
 
 function common() {
   handleManifestVersion();
@@ -88,7 +71,6 @@ function handleManifestVersion() {
       default_title: 'Advanced Profanity Filter',
     };
     manifest.host_permissions = undefined;
-    manifest.web_accessible_resources = ['audio/*.mp3'];
     writeJSONFile(distManifestPath, manifest);
   }
 }
@@ -108,11 +90,6 @@ function handleVersion() {
   }
 }
 
-function iOSBuild() {
-  const updateBuildNumber = false;
-  appleBuild(updateBuildNumber);
-}
-
 function main() {
   buildData = loadJSONFile(buildFilePath);
 
@@ -126,67 +103,6 @@ function main() {
   if (buildData.target == 'firefox') {
     firefoxBuild();
   }
-
-  if (buildData.target == 'ios') {
-    iOSBuild();
-  }
-
-  if (buildData.target == 'safari') {
-    safariBuild();
-  }
-}
-
-function removeOptionPageBookmarklet() {
-  console.log("Removing Bookmarklet tab from Option's page");
-  const optionPage = path.join('dist', 'optionPage.html');
-  const optionPageHTML = fse.readFileSync(optionPage).toString();
-
-  // Remove div#menu a[href='#/bookmarklet']
-  // const donationsRegex = new RegExp();
-  const newOptionPageHTML = optionPageHTML.replace('  <a href="#/bookmarklet" class="w3-bar-item w3-button">Bookmarklet</a>', '');
-
-  // Save changes
-  fse.writeFileSync(optionPage, newOptionPageHTML);
-}
-
-function removeOptionPageDonations() {
-  console.log("Removing donations from Option's page");
-  const optionPage = path.join('dist', 'optionPage.html');
-  const optionPageHTML = fse.readFileSync(optionPage).toString();
-
-  // Remove span.donations
-  const donationsRegex = new RegExp('[\\s\\S]{4}<span class="donations">[\\s\\S].*[\\s\\S]+?<\/span>');
-  const newOptionPageHTML = optionPageHTML.replace(donationsRegex, '');
-
-  // Save changes
-  fse.writeFileSync(optionPage, newOptionPageHTML);
-}
-
-function safariBuild() {
-  const updateBuildNumber = true;
-  appleBuild(updateBuildNumber);
-}
-
-function updateSafariXcodeVersion(updateBuildNumber) {
-  const projectFilePath = path.join('safari', 'Advanced Profanity Filter.xcodeproj', 'project.pbxproj');
-  const projectFileText = fse.readFileSync(projectFilePath).toString();
-  let updatedProjectFileText = projectFileText.replace(/MARKETING_VERSION = \d+\.\d+\.\d+;$/gm, `MARKETING_VERSION = ${buildData.version};`);
-
-  // Increment the build version when running a Safari release
-  // macOS Apps require the build number to be larger than the previous build number
-  // https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleversion
-  if (updateBuildNumber) {
-    const buildVersionMatch = projectFileText.match(/CURRENT_PROJECT_VERSION = (?<buildNumber>\d+);/);
-    if (buildVersionMatch.groups) {
-      const newBuildNumber = parseInt(buildVersionMatch.groups.buildNumber) + 1;
-      updatedProjectFileText = updatedProjectFileText.replace(/CURRENT_PROJECT_VERSION = (?<buildNumber>\d+);/gm, `CURRENT_PROJECT_VERSION = ${newBuildNumber};`);
-    }
-  }
-
-  if (projectFileText !== updatedProjectFileText) {
-    console.log('Updating Xcode project version...');
-    fse.writeFileSync(projectFilePath, updatedProjectFileText);
-  }
 }
 
 main();

bin/postbuild.mjs

@@ -5,9 +5,7 @@ import { buildFilePath, devBuildFilePath, loadJSONFile, parseArgv, releaseBuildF
 
 let data = {
   release: false,
-  config: {
-    muteMethod: null,
-  },
+  config: {},
   manifestVersion: 2,
   target: 'chrome',
   version: '1.0.0',
@@ -38,11 +36,6 @@ function firefoxBuild() {
   data.target = 'firefox';
 }
 
-function iOSBuild() {
-  data.target = 'ios';
-  data.config.muteMethod = 2; // Constants.MUTE_METHODS.VIDEO_MUTE;
-}
-
 function main() {
   const argv = parseArgv(process.argv);
   if (argv.count >= 2 && argv.count <= 4) {
@@ -78,18 +71,12 @@ function main() {
       case '--firefox':
         firefoxBuild();
         break;
-      case '--ios':
-        iOSBuild();
-        break;
       case '--manifestV2':
         manifestV2Build();
         break;
       case '--manifestV3':
         manifestV3Build();
         break;
-      case '--safari':
-        safariBuild();
-        break;
       default:
         defaultBuild();
     }
@@ -113,19 +100,12 @@ function manifestV3Build() {
   data.manifestVersion = 3;
 }
 
-function safariBuild() {
-  data.target = 'safari';
-  data.config.muteMethod = 2; // Constants.MUTE_METHODS.VIDEO_MUTE;
-}
-
 function targetFromData() {
   switch (data.target) {
     case 'chrome':
       return `--manifestV${data.manifestVersion}`;
     case 'bookmarklet':
     case 'firefox:':
-    case 'ios':
-    case 'safari':
       return `--${data.target}`;
   }
 }