From e94cebfe1989a47028fa69eb6a037aecef1d7330 Mon Sep 17 00:00:00 2001 From: sharevb Date: Wed, 3 Apr 2024 22:54:49 +0200 Subject: [PATCH 1/3] feat(new tool): URL Cleaner URL Cleaner Remove fbclip, utm params and other tracking parameters --- package.json | 1 + pnpm-lock.yaml | 19 +++++++---- src/tools/index.ts | 2 ++ src/tools/url-cleaner/index.ts | 12 +++++++ src/tools/url-cleaner/url-cleaner.vue | 49 +++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 src/tools/url-cleaner/index.ts create mode 100644 src/tools/url-cleaner/url-cleaner.vue diff --git a/package.json b/package.json index fd6c02e6..cc67b220 100644 --- a/package.json +++ b/package.json @@ -81,6 +81,7 @@ "plausible-tracker": "^0.3.8", "qrcode": "^1.5.1", "sql-formatter": "^13.0.0", + "tidy-url": "^1.15.1", "ua-parser-js": "^1.0.35", "ulid": "^2.3.0", "unicode-emoji-json": "^0.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bd6c38c9..6f452750 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -143,6 +143,9 @@ dependencies: sql-formatter: specifier: ^13.0.0 version: 13.0.0 + tidy-url: + specifier: ^1.15.1 + version: 1.15.1 ua-parser-js: specifier: ^1.0.35 version: 1.0.35 @@ -3351,7 +3354,7 @@ packages: dependencies: '@unhead/dom': 0.5.1 '@unhead/schema': 0.5.1 - '@vueuse/shared': 10.7.2(vue@3.3.4) + '@vueuse/shared': 10.9.0(vue@3.3.4) unhead: 0.5.1 vue: 3.3.4 transitivePeerDependencies: @@ -3993,10 +3996,10 @@ packages: - vue dev: false - /@vueuse/shared@10.7.2(vue@3.3.4): - resolution: {integrity: sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==} + /@vueuse/shared@10.9.0(vue@3.3.4): + resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==} dependencies: - vue-demi: 0.14.6(vue@3.3.4) + vue-demi: 0.14.7(vue@3.3.4) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -8405,6 +8408,10 @@ packages: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} dev: true + /tidy-url@1.15.1: + resolution: {integrity: sha512-LYBtesJs2WD92VEAprqdHSDLdZ91eRiO+OcAOYhsTdeLZvtIGKs8kK8egnzUxF3sr7AkCYAMj4UoRWslo5HszA==} + dev: false + /tiny-emitter@2.1.0: resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==} dev: false @@ -9151,8 +9158,8 @@ packages: vue: 3.3.4 dev: false - /vue-demi@0.14.6(vue@3.3.4): - resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} + /vue-demi@0.14.7(vue@3.3.4): + resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} engines: {node: '>=12'} hasBin: true requiresBuild: true diff --git a/src/tools/index.ts b/src/tools/index.ts index aa861c93..841d6093 100644 --- a/src/tools/index.ts +++ b/src/tools/index.ts @@ -6,6 +6,7 @@ import { tool as asciiTextDrawer } from './ascii-text-drawer'; import { tool as textToUnicode } from './text-to-unicode'; import { tool as safelinkDecoder } from './safelink-decoder'; +import { tool as urlCleaner } from './url-cleaner'; import { tool as pdfSignatureChecker } from './pdf-signature-checker'; import { tool as numeronymGenerator } from './numeronym-generator'; import { tool as macAddressGenerator } from './mac-address-generator'; @@ -115,6 +116,7 @@ export const toolsByCategory: ToolCategory[] = [ urlEncoder, htmlEntities, urlParser, + urlCleaner, deviceInformation, basicAuthGenerator, metaTagGenerator, diff --git a/src/tools/url-cleaner/index.ts b/src/tools/url-cleaner/index.ts new file mode 100644 index 00000000..ee1cde91 --- /dev/null +++ b/src/tools/url-cleaner/index.ts @@ -0,0 +1,12 @@ +import { ClearAll } from '@vicons/tabler'; +import { defineTool } from '../tool'; + +export const tool = defineTool({ + name: 'Url Cleaner', + path: '/url-cleaner', + description: 'Clean Ads tracker, UTM, Facebook and other ads provider parameters from an URL', + keywords: ['url', 'cleaner', 'utm', 'fbclip'], + component: () => import('./url-cleaner.vue'), + icon: ClearAll, + createdAt: new Date('2024-03-13'), +}); diff --git a/src/tools/url-cleaner/url-cleaner.vue b/src/tools/url-cleaner/url-cleaner.vue new file mode 100644 index 00000000..e1c795b5 --- /dev/null +++ b/src/tools/url-cleaner/url-cleaner.vue @@ -0,0 +1,49 @@ + + + From 7631847cd3642c2165f17237c998ec2ced9dfc40 Mon Sep 17 00:00:00 2001 From: ShareVB Date: Sat, 6 Apr 2024 11:56:09 +0200 Subject: [PATCH 2/3] chore(github workflows): ci and e2e tests: try updating to node 20 --- .github/workflows/ci.yml | 2 +- .github/workflows/e2e-tests.yml | 2 +- playwright.config.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5c67208..4dd9ffb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - run: corepack enable - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 cache: 'pnpm' - name: Install dependencies diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index b5b04096..13b787ef 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 20 cache: 'pnpm' - name: Get Playwright version diff --git a/playwright.config.ts b/playwright.config.ts index 3caa0612..5257c526 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -9,7 +9,7 @@ const useWebServer = process.env.NO_WEB_SERVER !== 'true'; */ export default defineConfig({ testDir: './src', - testMatch: /.*\.e2e\.(spec\.)?ts/, + testMatch: /\.e2e\.(spec\.)?ts$/, /* Run tests in files in parallel */ fullyParallel: true, /* Fail the build on CI if you accidentally left test.only in the source code. */ @@ -57,7 +57,7 @@ export default defineConfig({ && { webServer: { command: 'npm run preview', - url: 'http://127.0.0.1:5050', + url: 'http://localhost:5050', reuseExistingServer: !isCI, }, } From 3f7151be4cbd9c674f987fd718ddde266671e477 Mon Sep 17 00:00:00 2001 From: ShareVB Date: Sat, 20 Apr 2024 17:50:13 +0200 Subject: [PATCH 3/3] fix: removed direct link with cleaned for security reason --- src/tools/url-cleaner/url-cleaner.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/tools/url-cleaner/url-cleaner.vue b/src/tools/url-cleaner/url-cleaner.vue index e1c795b5..59e4c235 100644 --- a/src/tools/url-cleaner/url-cleaner.vue +++ b/src/tools/url-cleaner/url-cleaner.vue @@ -39,11 +39,6 @@ const isClean = computed(() => withDefaultOnError(() => TidyURL.clean(inputUrl.v mb-5 mt-5 /> - - - {{ cleanedUrl?.url }} - -