feat(google-maps): Add map-marker component

Refactor google-maps module to have a single entry-point,
@angular/google-maps, instead of a separate one for every component.

Author: mbehrlich

packages.bzl

@@ -80,12 +80,6 @@ MATERIAL_SCSS_LIBS = [
     for p in MATERIAL_PACKAGES
 ]
 
-GOOGLE_MAPS_PACKAGES = [
-    "google-map",
-]
-
-GOOGLE_MAPS_TARGETS = ["//src/google-maps"] + ["//src/google-maps/%s" % p for p in GOOGLE_MAPS_PACKAGES]
-
 MATERIAL_EXPERIMENTAL_PACKAGES = [
     "mdc-button",
     "mdc-card",

src/dev-app/google-map/BUILD.bazel

@@ -7,7 +7,7 @@ ng_module(
     srcs = glob(["**/*.ts"]),
     assets = ["google-map-demo.html"],
     deps = [
-        "//src/google-maps/google-map",
+        "//src/google-maps",
         "@npm//@angular/router",
     ],
 )

src/dev-app/google-map/google-map-demo-module.ts

@@ -9,15 +9,15 @@
 import {CommonModule} from '@angular/common';
 import {HttpClientJsonpModule, HttpClientModule} from '@angular/common/http';
 import {NgModule} from '@angular/core';
-import {GoogleMapModule} from '@angular/google-maps/google-map';
+import {GoogleMapsModule} from '@angular/google-maps';
 import {RouterModule} from '@angular/router';
 
 import {GoogleMapDemo} from './google-map-demo';
 
 @NgModule({
   imports: [
     CommonModule,
-    GoogleMapModule,
+    GoogleMapsModule,
     HttpClientJsonpModule,
     HttpClientModule,
     RouterModule.forChild([{path: '', component: GoogleMapDemo}]),

src/dev-app/system-config.js

@@ -55,10 +55,6 @@ var MATERIAL_PACKAGES = [
   'tree',
 ];
 
-var GOOGLE_MAPS_PACKAGES = [
-  'google-map',
-];
-
 var MATERIAL_EXPERIMENTAL_PACKAGES = [
   'mdc-button',
   'mdc-card',
@@ -103,9 +99,7 @@ MATERIAL_EXPERIMENTAL_PACKAGES.forEach(function(pkgName) {
 MATERIAL_PACKAGES.forEach(function(pkgName) {
   configureEntryPoint('material', pkgName);
 });
-GOOGLE_MAPS_PACKAGES.forEach(function(pkgName) {
-  configureEntryPoint('google-maps', pkgName);
-});
+configureEntryPoint('google-maps');
 configureEntryPoint('youtube-player');
 
 /** Configures the specified package and its entry-point. */

src/dev-app/tsconfig.json

@@ -14,7 +14,7 @@
       "@angular/cdk-experimental/*": ["../cdk-experimental/*"],
       "@angular/cdk-experimental": ["../cdk-experimental"],
       "@angular/material-moment-adapter": ["../material-moment-adapter/public-api.ts"],
-      "@angular/google-maps/*": ["../google-maps/*"],
+      "@angular/google-maps": ["../google-maps"],
       "@angular/material-examples": ["../../dist/packages/material-examples"]
     }
   },

src/google-maps/BUILD.bazel

@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//:packages.bzl", "GOOGLE_MAPS_PACKAGES", "GOOGLE_MAPS_TARGETS", "ROLLUP_GLOBALS")
+load("//:packages.bzl", "ROLLUP_GLOBALS")
 load("//tools:defaults.bzl", "ng_module", "ng_package")
 
 # Root "@angular/google-maps" entry-point that does not re-export individual entry-points.
@@ -11,24 +11,25 @@ ng_module(
         exclude = ["**/*.spec.ts"],
     ),
     module_name = "@angular/google-maps",
-    deps = ["//src/google-maps/%s" % p for p in GOOGLE_MAPS_PACKAGES] + [
+    deps = [
+        "//src/google-maps/google-map",
         "//src/google-maps/map-marker",
         "@npm//@angular/core",
         "@npm//@types/googlemaps",
     ],
 )
 
-filegroup(
-    name = "overviews",
-    srcs = ["//src/google-maps/%s:overview" % name for name in GOOGLE_MAPS_PACKAGES],
-)
-
 # Creates the @angular/google-maps package published to npm
 ng_package(
     name = "npm_package",
     srcs = ["package.json"],
     entry_point = ":public-api.ts",
     entry_point_name = "google-maps",
     globals = ROLLUP_GLOBALS,
-    deps = GOOGLE_MAPS_TARGETS,
+    deps = [":google-maps"],
+)
+
+filegroup(
+    name = "source-files",
+    srcs = glob(["**/*.ts"]),
 )

src/google-maps/google-map/BUILD.bazel

@@ -2,7 +2,6 @@ package(default_visibility = ["//visibility:public"])
 
 load(
     "//tools:defaults.bzl",
-    "markdown_to_html",
     "ng_module",
     "ng_test_library",
     "ng_web_test_suite",
@@ -14,7 +13,6 @@ ng_module(
         ["**/*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
-    module_name = "@angular/google-maps/google-map",
     deps = [
         "//src/google-maps/map-marker",
         "@npm//@angular/core",
@@ -42,11 +40,6 @@ ng_web_test_suite(
     deps = [":unit_test_sources"],
 )
 
-markdown_to_html(
-    name = "overview",
-    srcs = [":google-map.md"],
-)
-
 filegroup(
     name = "source-files",
     srcs = glob(["**/*.ts"]),

src/google-maps/google-map/google-map-module.ts

@@ -8,13 +8,10 @@
 
 import {NgModule} from '@angular/core';
 
-import {MapMarker, MapMarkerModule} from '../map-marker/index';
-
 import {GoogleMap} from './google-map';
 
 @NgModule({
-  imports: [MapMarkerModule],
-  exports: [GoogleMap, MapMarker],
+  exports: [GoogleMap],
   declarations: [GoogleMap],
 })
 export class GoogleMapModule {

src/google-maps/google-map/google-map.md

@@ -6,4 +6,5 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public-api';
+export * from './google-map';
+export * from './google-map-module';

src/google-maps/google-map/index.ts

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {NgModule} from '@angular/core';
+
+import {MapMarker, MapMarkerModule} from './map-marker/index';
+
+import {GoogleMap, GoogleMapModule} from './google-map/index';
+
+@NgModule({
+  imports: [GoogleMapModule, MapMarkerModule,],
+  exports: [GoogleMap, MapMarker,],
+})
+export class GoogleMapsModule {
+}

src/google-maps/google-map/public-api.ts

@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public-api';
+export * from './google-maps-module';

src/google-maps/google-map/tsconfig-build.json

@@ -6,4 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from '@angular/google-maps/google-map';
+export {GoogleMap} from './google-map/index';
+export {MapMarker} from './map-marker/index';
+export * from './google-maps-module';

src/google-maps/google-maps-module.ts

@@ -12,9 +12,6 @@
       ".",
       "../../dist/packages/google-maps"
     ],
-    "paths": {
-      "@angular/google-maps/*": ["../../dist/packages/google-maps/*"]
-    },
     "types": [
       "googlemaps"
     ]

src/google-maps/index.ts

@@ -11,9 +11,6 @@
       "jasmine",
       "googlemaps"
     ],
-    "paths": {
-      "@angular/google-maps/*": ["./*"]
-    }
   },
   "angularCompilerOptions": {
     "strictMetadataEmit": true,

src/google-maps/public-api.ts

@@ -4,9 +4,7 @@
   "compilerOptions": {
     "rootDir": "..",
     "baseUrl": ".",
-    "paths": {
-      "@angular/google-maps": ["./*"]
-    },
+    "paths": {},
     "types": [
       "jasmine",
       "googlemaps"