@vaadin/map 23.2.0-dev.48e5e3967 → 23.2.0-rc1

package/README.md

@@ -29,14 +29,6 @@ Once installed, import the component in your application:
 import '@vaadin/map';
 ```
 
-Map is currently an experimental feature and must be explicitly enabled through a feature flag.
-To do so, import the enabler module before the map component module itself:
-
-```js
-import '@vaadin/map/enable';
-import '@vaadin/map';
-```
-
 ## Contributing
 
 Read the [contributing guide](https://vaadin.com/docs/latest/guide/contributing/overview) to learn about our development process, how to propose bugfixes and improvements, and how to test your changes to Vaadin components.

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@vaadin/map",
-  "version": "23.2.0-dev.48e5e3967",
+  "version": "23.2.0-rc1",
   "publishConfig": {
     "access": "public"
   },
   "description": "vaadin-map",
-  "license": "https://raw.githubusercontent.com/vaadin/web-components/master/packages/map/LICENSE",
+  "license": "SEE LICENSE IN LICENSE",
   "cvdlName": "vaadin-map",
   "repository": {
     "type": "git",
@@ -21,11 +21,12 @@
   "module": "vaadin-map.js",
   "type": "module",
   "files": [
-    "enable.js",
     "src",
     "theme",
     "vaadin-*.d.ts",
-    "vaadin-*.js"
+    "vaadin-*.js",
+    "web-types.json",
+    "web-types.lit.json"
   ],
   "keywords": [
     "Vaadin",
@@ -36,8 +37,10 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "23.2.0-dev.48e5e3967",
-    "@vaadin/vaadin-themable-mixin": "23.2.0-dev.48e5e3967",
+    "@vaadin/component-base": "23.2.0-rc1",
+    "@vaadin/vaadin-lumo-styles": "23.2.0-rc1",
+    "@vaadin/vaadin-material-styles": "23.2.0-rc1",
+    "@vaadin/vaadin-themable-mixin": "23.2.0-rc1",
     "ol": "6.13.0"
   },
   "devDependencies": {
@@ -45,5 +48,9 @@
     "@vaadin/testing-helpers": "^0.3.2",
     "sinon": "^13.0.2"
   },
-  "gitHead": "961bc4ae5b707c3c02f12b99819b3c12c9b478aa"
+  "web-types": [
+    "web-types.json",
+    "web-types.lit.json"
+  ],
+  "gitHead": "e78a1f2fe6f42d78cefa3f48085b09a3033c9588"
 }

package/src/vaadin-map.d.ts

@@ -3,7 +3,7 @@
  * Copyright (c) 2022 - 2022 Vaadin Ltd.
  * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0.
  */
-import OpenLayersMap from 'ol/Map.js';
+import type OpenLayersMap from 'ol/Map.js';
 import { ElementMixin, FocusMixin, ResizeMixin } from '@vaadin/component-base';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin';
 
@@ -23,7 +23,6 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin';
  * Then use the exposed OpenLayers API to configure it:
  * ```html
  * <script type="module">
- *   import "@vaadin/map/enable";
  *   import "@vaadin/map";
  *   import TileLayer from "ol/layer/Tile";
  *   import OSM from "ol/source/OSM";

package/src/vaadin-map.js

@@ -12,10 +12,6 @@ import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js';
 import { ResizeMixin } from '@vaadin/component-base/src/resize-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
-function isEnabled() {
-  return window.Vaadin && window.Vaadin.featureFlags && !!window.Vaadin.featureFlags.mapComponent;
-}
-
 /**
  * `vaadin-map` is a web component for displaying web maps.
  *
@@ -32,7 +28,6 @@ function isEnabled() {
  * Then use the exposed OpenLayers API to configure it:
  * ```html
  * <script type="module">
- *   import "@vaadin/map/enable";
  *   import "@vaadin/map";
  *   import TileLayer from "ol/layer/Tile";
  *   import OSM from "ol/source/OSM";
@@ -460,12 +455,6 @@ class Map extends ResizeMixin(FocusMixin(ElementMixin(ThemableMixin(PolymerEleme
   }
 }
 
-if (isEnabled()) {
-  customElements.define(Map.is, Map);
-} else {
-  console.warn(
-    'WARNING: The map component is currently an experimental feature and needs to be explicitly enabled. To enable the component, `import "@vaadin/map/enable.js"` *before* importing the map module itself.',
-  );
-}
+customElements.define(Map.is, Map);
 
 export { Map };

package/web-types.json

@@ -0,0 +1,33 @@
+{
+  "$schema": "https://json.schemastore.org/web-types",
+  "name": "@vaadin/map",
+  "version": "23.2.0-rc1",
+  "description-markup": "markdown",
+  "contributions": {
+    "html": {
+      "elements": [
+        {
+          "name": "vaadin-map",
+          "description": "`vaadin-map` is a web component for displaying web maps.\n\nThe component is a light-weight wrapper around the OpenLayers mapping library.\n\n### Basic Usage\n\nAdd a `<vaadin-map>` element to your HTML:\n\n```html\n<vaadin-map></vaadin-map>\n```\n\nThen use the exposed OpenLayers API to configure it:\n```html\n<script type=\"module\">\n  import \"@vaadin/map\";\n  import TileLayer from \"ol/layer/Tile\";\n  import OSM from \"ol/source/OSM\";\n  import View from \"ol/View\";\n\n  const map = document.querySelector(\"vaadin-map\");\n  customElements.whenDefined(\"vaadin-map\").then(() => {\n    map.configuration.addLayer(new TileLayer({\n      source: new OSM()\n    }));\n    map.configuration.setView(new View({\n      center: [0, 0],\n      zoom: 3\n    }));\n  });\n</script>\n```",
+          "attributes": [
+            {
+              "name": "theme",
+              "description": "The theme variants to apply to the component.",
+              "value": {
+                "type": [
+                  "string",
+                  "null",
+                  "undefined"
+                ]
+              }
+            }
+          ],
+          "js": {
+            "properties": [],
+            "events": []
+          }
+        }
+      ]
+    }
+  }
+}

package/web-types.lit.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "https://json.schemastore.org/web-types",
+  "name": "@vaadin/map",
+  "version": "23.2.0-rc1",
+  "description-markup": "markdown",
+  "framework": "lit",
+  "framework-config": {
+    "enable-when": {
+      "node-packages": [
+        "lit"
+      ]
+    }
+  },
+  "contributions": {
+    "html": {
+      "elements": [
+        {
+          "name": "vaadin-map",
+          "description": "`vaadin-map` is a web component for displaying web maps.\n\nThe component is a light-weight wrapper around the OpenLayers mapping library.\n\n### Basic Usage\n\nAdd a `<vaadin-map>` element to your HTML:\n\n```html\n<vaadin-map></vaadin-map>\n```\n\nThen use the exposed OpenLayers API to configure it:\n```html\n<script type=\"module\">\n  import \"@vaadin/map\";\n  import TileLayer from \"ol/layer/Tile\";\n  import OSM from \"ol/source/OSM\";\n  import View from \"ol/View\";\n\n  const map = document.querySelector(\"vaadin-map\");\n  customElements.whenDefined(\"vaadin-map\").then(() => {\n    map.configuration.addLayer(new TileLayer({\n      source: new OSM()\n    }));\n    map.configuration.setView(new View({\n      center: [0, 0],\n      zoom: 3\n    }));\n  });\n</script>\n```",
+          "extension": true,
+          "attributes": []
+        }
+      ]
+    }
+  }
+}

package/enable.js

@@ -1,3 +0,0 @@
-window.Vaadin = window.Vaadin || {};
-window.Vaadin.featureFlags = window.Vaadin.featureFlags || {};
-window.Vaadin.featureFlags.mapComponent = true;