skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: update service-worker tests to work with ESM (#48538)

Browse Source 
* Updates circular dependency tests to use the `.mjs` outputs
* Switches away from CommonJS specific `require` calls.
* Simplifies the test helper logic since all browsers/NodeJS versions
  support `URL` as a global.

PR Close #48538
This commit is contained in:
Paul Gschwendtner
2022-12-14 12:39:33 +00:00
parent 627d0070e3
commit 548f196bea
4 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/service-worker/config/test/BUILD.bazel
+1 -1
View File
@@ -3,7 +3,7 @@ load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
circular_dependency_test(
name = "circular_deps_test",
entry_point = "angular/packages/service-worker/config/index.js",
entry_point = "angular/packages/service-worker/config/index.mjs",
deps = ["//packages/service-worker/config"],
)
packages/service-worker/test/BUILD.bazel
+1 -1
View File
@@ -3,7 +3,7 @@ load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
circular_dependency_test(
name = "circular_deps_test",
entry_point = "angular/packages/service-worker/index.js",
entry_point = "angular/packages/service-worker/index.mjs",
deps = ["//packages/service-worker"],
)
packages/service-worker/worker/test/BUILD.bazel
+1 -1
View File
@@ -3,7 +3,7 @@ load("//tools/circular_dependency_test:index.bzl", "circular_dependency_test")
circular_dependency_test(
name = "circular_deps_test",
entry_point = "angular/packages/service-worker/worker/main.js",
entry_point = "angular/packages/service-worker/worker/main.mjs",
deps = ["//packages/service-worker/worker:main"],
)
packages/service-worker/worker/testing/utils.ts
+2 -16
View File
@@ -15,19 +15,7 @@ import {NormalizedUrl} from '../src/api';
* @return Whether ServiceWorker tests can be run in the current environment.
*/
export function envIsSupported(): boolean {
if (typeof URL === 'function') {
return true;
}
// If we're in a browser that doesn't support URL at this point, don't go any further
// since browser builds use requirejs which will fail on the `require` call below.
if (typeof window !== 'undefined' && window) {
return false;
}
// In older Node.js versions, the `URL` global does not exist. We can use `url` instead.
const url = (typeof require === 'function') && require('url');
return url && (typeof url.parse === 'function') && (typeof url.resolve === 'function');
return typeof URL === 'function';
}
/**
@@ -55,9 +43,7 @@ export function normalizeUrl(url: string, relativeTo: string): NormalizedUrl {
*/
export function parseUrl(
url: string, relativeTo?: string): {origin: string, path: string, search: string} {
const parsedUrl: URL = (typeof URL === 'function') ?
(!relativeTo ? new URL(url) : new URL(url, relativeTo)) :
require('url').parse(require('url').resolve(relativeTo || '', url));
const parsedUrl: URL = (!relativeTo ? new URL(url) : new URL(url, relativeTo));
return {
origin: parsedUrl.origin || `${parsedUrl.protocol}//${parsedUrl.host}`,