From e182d15f002843d7429beca164cbd8d4c288eaac Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Fri, 10 Jan 2025 18:34:45 +0000 Subject: [PATCH] build: migrate @angular/pwa to npm_package This allows us to use the package in the RJS pnpm workspace. --- packages/angular/pwa/BUILD.bazel | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/packages/angular/pwa/BUILD.bazel b/packages/angular/pwa/BUILD.bazel index 345104673c..5750a6c0d3 100644 --- a/packages/angular/pwa/BUILD.bazel +++ b/packages/angular/pwa/BUILD.bazel @@ -4,28 +4,32 @@ # found in the LICENSE file at https://angular.dev/license load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") -load("//tools:defaults.bzl", "pkg_npm") -load("//tools:interop.bzl", "ts_project") +load("//tools:defaults2.bzl", "npm_package", "ts_project") load("//tools:ts_json_schema.bzl", "ts_json_schema") licenses(["notice"]) package(default_visibility = ["//visibility:public"]) +RUNTIME_ASSETS = glob( + include = [ + "pwa/*.js", + "pwa/*.mjs", + "pwa/files/**/*", + ], +) + [ + "package.json", + "collection.json", + "pwa/schema.json", +] + ts_project( name = "pwa", srcs = [ "pwa/index.ts", "//packages/angular/pwa:pwa/schema.ts", ], - data = [ - "collection.json", - "pwa/schema.json", - ] + glob( - include = [ - "pwa/files/**/*", - ], - ), + data = RUNTIME_ASSETS, module_name = "@angular/pwa", deps = [ "//:root_modules/@types/node", @@ -63,16 +67,16 @@ genrule( cmd = "cp $(execpath //:LICENSE) $@", ) -pkg_npm( - name = "npm_package", +npm_package( + name = "pkg", pkg_deps = [ "//packages/angular_devkit/schematics:package.json", "//packages/schematics/angular:package.json", ], tags = ["release-package"], - deps = [ + deps = RUNTIME_ASSETS + [ ":README.md", ":license", - ":pwa", + ":pwa_rjs", ], )