Skip to content

Commit f699d2e

Browse files
devversiondevversion
committed
build: remove remaining @npm// usages
Removes remaining `@npm//` usages.
1 parent d49ed41 commit f699d2e

6 files changed

Lines changed: 80 additions & 100 deletions

File tree

‎WORKSPACE‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -125,37 +125,13 @@ yarn_install(
125125
yarn_lock = "//:yarn.lock",
126126
)
127127

128-
load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
129-
130-
npm_bazel_protractor_dependencies()
131-
132-
# Setup web testing. We need to setup a browser because the web testing rules for TypeScript need
133-
# a reference to a registered browser (ideally that's a hermetic version of a browser)
134-
load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
135-
136-
web_test_repositories()
137-
138128
# Setup the Sass rule repositories.
139129
load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories")
140130

141131
sass_repositories(
142132
yarn_script = "//:.yarn/releases/yarn-1.22.17.cjs",
143133
)
144134

145-
# Setup repositories for browsers provided by the shared dev-infra package.
146-
load(
147-
"@npm//@angular/build-tooling/bazel/browsers:browser_repositories.bzl",
148-
_dev_infra_browser_repositories = "browser_repositories",
149-
)
150-
151-
_dev_infra_browser_repositories()
152-
153-
load("@build_bazel_rules_nodejs//toolchains/esbuild:esbuild_repositories.bzl", "esbuild_repositories")
154-
155-
esbuild_repositories(
156-
npm_repository = "npm",
157-
)
158-
159135
load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
160136

161137
npm_translate_lock(

‎src/BUILD.bazel‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("@npm//@bazel/concatjs:index.bzl", "ts_config")
2-
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
1+
load("@aspect_rules_ts//ts:defs.bzl", "ts_config")
32
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
43
load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
54
load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS", "MATERIAL_TESTING_ENTRYPOINTS")
@@ -23,16 +22,6 @@ exports_files([
2322
"README.md",
2423
])
2524

26-
ts_config(
27-
name = "tsconfig-test",
28-
src = "bazel-tsconfig-test.json",
29-
deps = [
30-
"bazel-tsconfig-build.json",
31-
"//:node_modules/@types/jasmine",
32-
"//:node_modules/@types/node",
33-
],
34-
)
35-
3625
copy_to_bin(
3726
name = "package_json",
3827
srcs = ["package.json"],
@@ -67,24 +56,25 @@ ts_project(
6756
srcs = ["dev-mode-types.d.ts"],
6857
)
6958

70-
ts_config(
71-
name = "tsec_config",
72-
src = "tsconfig-tsec.json",
73-
deps = [
74-
":bazel-tsconfig-build.json",
75-
"//goldens:tsec-exemption.json",
76-
],
77-
)
59+
# TODO(devversion): Look into a replacement.
60+
#ts_config(
61+
# name = "tsec_config",
62+
# src = "tsconfig-tsec.json",
63+
# deps = [
64+
# ":bazel-tsconfig-build.json",
65+
# "//goldens:tsec-exemption.json",
66+
# ],
67+
#)
7868

79-
rules_js_tsconfig(
69+
ts_config(
8070
name = "build-tsconfig",
8171
src = "bazel-tsconfig-build.json",
8272
deps = [
8373
"//:node_modules/tslib",
8474
],
8575
)
8676

87-
rules_js_tsconfig(
77+
ts_config(
8878
name = "test-tsconfig",
8979
src = "bazel-tsconfig-test.json",
9080
deps = [

‎src/dev-app/BUILD.bazel‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web")
21
load("//tools:defaults.bzl", "sass_binary")
32
load("//tools:defaults2.bzl", "http_server", "ng_project")
43
load("@npm2//:defs.bzl", "npm_link_all_packages")
54
load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild")
5+
load("@aspect_rules_js//npm:defs.bzl", "npm_package")
66
load("//src/components-examples:config.bzl", "ALL_EXAMPLES")
77

88
package(default_visibility = ["//visibility:public"])
@@ -154,21 +154,17 @@ filegroup(
154154
":theme",
155155
":theme_m3",
156156
":variables",
157+
"//:node_modules/moment",
158+
"//:node_modules/zone.js",
157159
"//src/dev-app/icon:icon_demo_assets",
158-
"@npm//:node_modules/moment/min/moment-with-locales.min.js",
159-
"@npm//:node_modules/rxjs/bundles/rxjs.umd.min.js",
160-
"@npm//:node_modules/zone.js/bundles/zone.umd.js",
161160
],
162161
)
163162

164163
http_server(
165164
name = "devserver",
166165
srcs = [":dev_app_static_files"],
167166
additional_root_paths = [
168-
"npm/node_modules",
169-
# Needed for compatibility with "pkg_web" which always uses the tree
170-
# artifact output as workspace root.
171-
"angular_material",
167+
"angular_material/",
172168
],
173169
enable_dev_ui = True,
174170
# List of environment variables that will be made available as `window.<NAME>` in the
@@ -185,14 +181,20 @@ http_server(
185181

186182
# Target that builds a static web package of the dev-app. The web package can be
187183
# deployed on static hosting services (such as firebase).
188-
pkg_web(
184+
npm_package(
189185
name = "web_package",
190186
srcs = [
191187
":bundles",
192188
":dev_app_static_files",
193189
],
194-
additional_root_paths = [
195-
"npm/node_modules",
190+
out = "web_package",
191+
exclude_srcs_patterns = [
192+
"node_modules/.aspect_rules_js/**",
193+
],
194+
include_srcs_packages = ["**"],
195+
root_paths = [
196+
".",
197+
"",
196198
],
197199
tags = ["manual"],
198200
)

‎src/dev-app/index.html‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,38 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta name="viewport" content="width=device-width, initial-scale=1">
6-
<title>Angular Material</title>
7-
<base href="/">
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1" />
6+
<title>Angular Material</title>
7+
<base href="/" />
88

9-
<link rel="icon" type="image/x-icon" href="favicon.ico">
10-
<link rel="preconnect" href="https://fonts.gstatic.com">
11-
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
12-
<link href="https://fonts.googleapis.com/icon?family=Material+Symbols+Outlined" rel="stylesheet">
13-
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
9+
<link rel="icon" type="image/x-icon" href="favicon.ico" />
10+
<link rel="preconnect" href="https://fonts.gstatic.com" />
11+
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
12+
<link
13+
href="https://fonts.googleapis.com/icon?family=Material+Symbols+Outlined"
14+
rel="stylesheet"
15+
/>
16+
<link
17+
href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap"
18+
rel="stylesheet"
19+
/>
1420

15-
<!-- FontAwesome for mat-icon demo. -->
16-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
17-
</head>
18-
<body>
19-
<dev-app>Loading...</dev-app>
20-
<script src="zone.js/bundles/zone.umd.js"></script>
21-
<script src="bundles/dev-app/main.js" type="module"></script>
22-
<script>
23-
(g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
24-
v: "weekly",
25-
key: window.GOOGLE_MAPS_KEY || 'invalid'
26-
});
27-
</script>
28-
</body>
21+
<!-- FontAwesome for mat-icon demo. -->
22+
<link
23+
rel="stylesheet"
24+
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css"
25+
/>
26+
</head>
27+
<body>
28+
<dev-app>Loading...</dev-app>
29+
<script src="node_modules/zone.js/bundles/zone.umd.js"></script>
30+
<script src="bundles/dev-app/main.js" type="module"></script>
31+
<script>
32+
(g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
33+
v: "weekly",
34+
key: window.GOOGLE_MAPS_KEY || 'invalid'
35+
});
36+
</script>
37+
</body>
2938
</html>

‎src/universal-app/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ http_server(
144144
name = "server",
145145
srcs = [
146146
":debug_prerender_bin",
147-
"@npm//zone.js",
147+
"//:node_modules/zone.js",
148148
],
149149
additional_root_paths = [
150-
"npm/node_modules",
150+
"angular_material/",
151151
],
152152
tags = ["manual"],
153153
deps = [

‎src/universal-app/index-source.html‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta name="viewport" content="width=device-width, initial-scale=1">
6-
<title>Angular Material Universal Kitchen Sink Test</title>
7-
<link href="styles.css" rel="stylesheet">
8-
<link rel="preconnect" href="https://fonts.gstatic.com">
9-
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
10-
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet">
11-
<base href="/">
12-
</head>
13-
<body class="mat-app-background mat-typography">
14-
<kitchen-sink>Loading...</kitchen-sink>
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1" />
6+
<title>Angular Material Universal Kitchen Sink Test</title>
7+
<link href="styles.css" rel="stylesheet" />
8+
<link rel="preconnect" href="https://fonts.gstatic.com" />
9+
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
10+
<link
11+
href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap"
12+
rel="stylesheet"
13+
/>
14+
<base href="/" />
15+
</head>
16+
<body class="mat-app-background mat-typography">
17+
<kitchen-sink>Loading...</kitchen-sink>
1518

16-
<script src="zone.js/bundles/zone.umd.min.js"></script>
17-
<script src="https://maps.googleapis.com/maps/api/js?libraries=visualization"></script>
18-
<script src="https://unpkg.com/@googlemaps/markerclustererplus/dist/index.min.js"></script>
19-
<script src="client_bundle/main.js" type="module"></script>
20-
</body>
19+
<script src="node_modules/zone.js/bundles/zone.umd.min.js"></script>
20+
<script src="https://maps.googleapis.com/maps/api/js?libraries=visualization"></script>
21+
<script src="https://unpkg.com/@googlemaps/markerclustererplus/dist/index.min.js"></script>
22+
<script src="client_bundle/main.js" type="module"></script>
23+
</body>
2124
</html>

0 commit comments

Comments
 (0)