pr05 Typescript #3: Migrate client/utils folder #3553
+1,241
−396
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| import { getAllScriptOffsets, startTag } from './consoleUtils'; | ||
|
|
||
| describe('getAllScriptOffsets', () => { | ||
| // not sure how the line offset calculations have been formulated | ||
| it('returns an empty array when no scripts are found', () => { | ||
| const html = '<html><body><h1>No scripts here</h1></body></html>'; | ||
| expect(getAllScriptOffsets(html)).toEqual([]); | ||
| }); | ||
|
|
||
| it('detects a single external script with @fs- path', () => { | ||
| const html = ` | ||
| <html> | ||
| <head> | ||
| <script src="${startTag}my-script.js"></script> | ||
| </head> | ||
| </html> | ||
| `; | ||
| const result = getAllScriptOffsets(html); | ||
| expect(result.every(([offset, _]) => typeof offset === 'number')).toBe( | ||
| true | ||
| ); | ||
| expect(result.map(([_, name]) => name)).toEqual(['my-script']); | ||
| }); | ||
|
|
||
| it('detects multiple external scripts with @fs- paths', () => { | ||
| const html = ` | ||
| <script src="${startTag}one.js"></script> | ||
| <script src="${startTag}two.js"></script> | ||
| `; | ||
| const result = getAllScriptOffsets(html); | ||
| expect(result.every(([offset, _]) => typeof offset === 'number')).toBe( | ||
| true | ||
| ); | ||
| expect(result.map(([_, name]) => name)).toEqual(['one', 'two']); | ||
| }); | ||
|
|
||
| it('detects embedded scripts with crossorigin attribute', () => { | ||
| const html = ` | ||
| <html> | ||
| <head> | ||
| <script crossorigin=""></script> | ||
| </head> | ||
| </html> | ||
| `; | ||
| const result = getAllScriptOffsets(html); | ||
| expect(result.every(([offset, _]) => typeof offset === 'number')).toBe( | ||
| true | ||
| ); | ||
| expect(result.map(([_, name]) => name)).toEqual(['index.html']); | ||
| }); | ||
|
|
||
| it('detects both @fs- scripts and embedded scripts together, ordering embedded scripts last', () => { | ||
| const html = ` | ||
| <script src="${startTag}abc.js"></script> | ||
| <script crossorigin=""></script> | ||
| <script src="${startTag}xyz.js"></script> | ||
| `; | ||
| const result = getAllScriptOffsets(html); | ||
| expect(result.every(([offset, _]) => typeof offset === 'number')).toBe( | ||
| true | ||
| ); | ||
| expect(result.map(([_, name]) => name)).toEqual([ | ||
| 'abc', | ||
| 'xyz', | ||
| 'index.html' | ||
| ]); | ||
| }); | ||
|
|
||
| it('handles scripts with varying whitespace and newlines', () => { | ||
| const html = ` | ||
| <script src="${startTag}some-script.js"> | ||
| </script> | ||
| <script crossorigin=""> | ||
| </script> | ||
| `; | ||
| const result = getAllScriptOffsets(html); | ||
| expect(result.every(([offset, _]) => typeof offset === 'number')).toBe( | ||
| true | ||
| ); | ||
| expect(result.map(([_, name]) => name)).toEqual([ | ||
| 'some-script', | ||
| 'index.html' | ||
| ]); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import { isMac } from './device'; | ||
|
|
||
| describe('isMac', () => { | ||
| const originalUserAgent = navigator.userAgent; | ||
|
|
||
| afterEach(() => { | ||
| // Restore the original userAgent after each test | ||
| Object.defineProperty(navigator, 'userAgent', { | ||
| value: originalUserAgent, | ||
| configurable: true | ||
| }); | ||
| }); | ||
|
|
||
| it('returns true when userAgent contains "Mac"', () => { | ||
| Object.defineProperty(navigator, 'userAgent', { | ||
| value: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)', | ||
| configurable: true | ||
| }); | ||
| expect(isMac()).toBe(true); | ||
| }); | ||
|
|
||
| it('returns false when userAgent does not contain "Mac"', () => { | ||
| Object.defineProperty(navigator, 'userAgent', { | ||
| value: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)', | ||
| configurable: true | ||
| }); | ||
| expect(isMac()).toBe(false); | ||
| }); | ||
|
|
||
| it('returns false when navigator agent is null', () => { | ||
| Object.defineProperty(navigator, 'userAgent', { | ||
| value: null, | ||
| configurable: true | ||
| }); | ||
| expect(isMac()).toBe(false); | ||
| }); | ||
|
|
||
| it('returns false when navigator agent is undefined', () => { | ||
| Object.defineProperty(navigator, 'userAgent', { | ||
| value: undefined, | ||
| configurable: true | ||
| }); | ||
| expect(isMac()).toBe(false); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| /** | ||
| * Checks if the user's OS is macOS based on the `navigator.userAgent` string. | ||
| * This is the preferred method over `navigator.platform`, which is now deprecated: | ||
| * - see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/platform | ||
| */ | ||
| export function isMac(): boolean { | ||
| return typeof navigator?.userAgent === 'string' | ||
| ? navigator.userAgent.toLowerCase().includes('mac') | ||
| : false; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated this to return a
''if no API_URL is found --> used in ln261 as a template literal so it was previously doingwhich would give: