Skip to content

Commit 13d2438

Browse files
committed
Using typescript
1 parent aa83f35 commit 13d2438

File tree

6 files changed

+151
-58
lines changed

6 files changed

+151
-58
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
"devDependencies": {
1212
"@types/node": "18",
1313
"@vitest/coverage-c8": "^0.28.2",
14+
"chance": "^1.1.8",
1415
"husky": "^8.0.3",
1516
"jsdom": "^21.1.0",
1617
"prettier": "^2.8.2",
1718
"pretty-quick": "^3.1.3",
1819
"puppeteer": "^19.5.0",
19-
"typescript": "^4.9.4",
20+
"typescript": "^4.9.5",
2021
"uglify-js": "3.17.4",
2122
"vitest": "^0.27.0",
2223
"vitest-mock-extended": "^1.0.8",
2324
"web-ext": "^7.4.0",
24-
"xvfb": "^0.4.0",
25-
"chance": "^1.1.8"
25+
"xvfb": "^0.4.0"
2626
},
2727
"description": "Web Activity Time Tracker keeps track of how much time you spend on the web and presents the stats in a useful and intuitive way. \r You can set a daily visit limit for sites and block it after the expiration of the limit.",
2828
"repository": {

src/background.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
console.log('loading backgroung script')

src/manifest.json

Lines changed: 37 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,39 @@
11
{
2-
"manifest_version": 2,
3-
4-
"name": "Web Activity Time Tracker",
5-
"short_name": "Web Time Tracker",
6-
"version": "1.7.2",
7-
"minimum_chrome_version": "26",
8-
9-
"description": "Track and limit time your activity in the browser every day.",
10-
11-
"options_page": "options.html",
12-
13-
"icons": {
14-
"16": "icons/16x16.png",
15-
"32": "icons/32x32.png",
16-
"48": "icons/48x48.png",
17-
"128": "icons/128x128.png"
18-
},
19-
"permissions": [
20-
"tabs",
21-
"activeTab",
22-
"storage",
23-
"idle",
24-
"chrome://favicon/*",
25-
"webNavigation",
26-
"unlimitedStorage",
27-
"alarms"
28-
],
29-
"optional_permissions": [
30-
"https://www.youtube.com/*",
31-
"https://www.netflix.com/*",
32-
"notifications"
33-
],
34-
"offline_enabled": true,
35-
"background": {
36-
"scripts": ["scripts/common.js",
37-
"scripts/storage.js",
38-
"scripts/activity.js",
39-
"scripts/tab.js",
40-
"scripts/timeInterval.js",
41-
"scripts/background.js",
42-
"scripts/restriction.js"],
43-
"persistent": false
44-
},
45-
"browser_action": {
46-
"default_popup": "index.html",
47-
"default_title": "Web Activity Time Tracker",
48-
"default_icon": "icons/48x48.png"
49-
}
2+
"manifest_version": 3,
3+
"name": "Web Activity Time Tracker",
4+
"short_name": "Web Time Tracker",
5+
"version": "1.7.2",
6+
"minimum_chrome_version": "26",
7+
"description": "Track and limit time your activity in the browser every day.",
8+
"options_page": "options.html",
9+
"icons": {
10+
"16": "icons/16x16.png",
11+
"32": "icons/32x32.png",
12+
"48": "icons/48x48.png",
13+
"128": "icons/128x128.png"
14+
},
15+
"permissions": [
16+
"tabs",
17+
"activeTab",
18+
"storage",
19+
"idle",
20+
"webNavigation",
21+
"unlimitedStorage",
22+
"alarms",
23+
"notifications"
24+
],
25+
"optional_host_permissions": [
26+
"https://www.youtube.com/*",
27+
"https://www.netflix.com/*"
28+
],
29+
"offline_enabled": true,
30+
"background": {
31+
"service_worker": "background.ts",
32+
"type": "module"
33+
},
34+
"action": {
35+
"default_popup": "index.html",
36+
"default_title": "Web Activity Time Tracker",
37+
"default_icon": "icons/48x48.png"
38+
}
5039
}

src/scripts/background.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ function backgroundCheck() {
4242
}
4343

4444
if (activity.isInBlackList(activeUrl)) {
45-
chrome.browserAction.setBadgeBackgroundColor({ color: '#fdb8b8' })
46-
chrome.browserAction.setBadgeText({
45+
chrome.action.setBadgeBackgroundColor({ color: '#fdb8b8' })
46+
chrome.action.setBadgeText({
4747
tabId: activeTab.id,
4848
text: 'n/a'
4949
});
@@ -79,15 +79,15 @@ function mainTRacker(activeUrl, tab, activeTab) {
7979
tab.incSummaryTime();
8080
}
8181
if (setting_view_in_badge === true) {
82-
chrome.browserAction.setBadgeBackgroundColor({ color: '#e7e7e7' })
82+
chrome.action.setBadgeBackgroundColor({ color: '#e7e7e7' })
8383
var summary = tab.days.find(s => s.date === todayLocalDate()).summary;
84-
chrome.browserAction.setBadgeText({
84+
chrome.action.setBadgeText({
8585
tabId: activeTab.id,
8686
text: String(convertSummaryTimeToBadgeString(summary))
8787
});
8888
} else {
89-
chrome.browserAction.setBadgeBackgroundColor({ color: [0, 0, 0, 0] })
90-
chrome.browserAction.setBadgeText({
89+
chrome.action.setBadgeBackgroundColor({ color: [0, 0, 0, 0] })
90+
chrome.action.setBadgeText({
9191
tabId: activeTab.id,
9292
text: ''
9393
});

tsconfig.json

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
{
2+
"compilerOptions": {
3+
/* Visit https://aka.ms/tsconfig to read more about this file */
4+
5+
/* Projects */
6+
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
7+
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
8+
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
9+
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
10+
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
11+
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
12+
13+
/* Language and Environment */
14+
"target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
15+
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
16+
// "jsx": "preserve", /* Specify what JSX code is generated. */
17+
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
18+
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
19+
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
20+
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
21+
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
22+
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
23+
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
24+
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
25+
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
26+
27+
/* Modules */
28+
"module": "commonjs", /* Specify what module code is generated. */
29+
// "rootDir": "./", /* Specify the root folder within your source files. */
30+
// "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
31+
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
32+
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
33+
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
34+
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
35+
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
36+
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
37+
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
38+
// "resolveJsonModule": true, /* Enable importing .json files. */
39+
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
40+
41+
/* JavaScript Support */
42+
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
43+
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
44+
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
45+
46+
/* Emit */
47+
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
48+
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
49+
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
50+
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
51+
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
52+
// "outDir": "./", /* Specify an output folder for all emitted files. */
53+
// "removeComments": true, /* Disable emitting comments. */
54+
// "noEmit": true, /* Disable emitting files from a compilation. */
55+
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
56+
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
57+
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
58+
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
59+
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
60+
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
61+
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
62+
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
63+
// "newLine": "crlf", /* Set the newline character for emitting files. */
64+
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
65+
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
66+
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
67+
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
68+
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
69+
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
70+
71+
/* Interop Constraints */
72+
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
73+
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
74+
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
75+
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
76+
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
77+
78+
/* Type Checking */
79+
"strict": true, /* Enable all strict type-checking options. */
80+
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
81+
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
82+
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
83+
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
84+
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
85+
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
86+
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
87+
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
88+
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
89+
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
90+
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
91+
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
92+
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
93+
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
94+
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
95+
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
96+
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
97+
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
98+
99+
/* Completeness */
100+
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
101+
"skipLibCheck": true /* Skip type checking all .d.ts files. */
102+
}
103+
}

0 commit comments

Comments
 (0)