From 749d6e00228f23cbea6f678db66622415bde2e17 Mon Sep 17 00:00:00 2001 From: MatthaiosSait Date: Fri, 17 Nov 2023 18:11:56 +0100 Subject: [PATCH] Rename arcgis_map_web 100% --- am_sidekick/lib/src/arcgis_map_project.dart | 2 +- .../lib/src/commands/generate_arcgis_webpack.dart | 2 +- arcgis_map/pubspec.yaml | 4 ++-- arcgis_map/pubspec_overrides.yaml | 4 ++-- arcgis_map_sdk_web/README.md | 4 ++-- arcgis_map_sdk_web/lib/arcgis_map_web_js.dart | 4 ++-- .../{arcgis_map_web.dart => arcgis_map_sdk_web.dart} | 8 ++++---- .../lib/src/arcgis_map_web_controller.dart | 12 ++++++------ .../lib/src/components/attribution.dart | 2 +- arcgis_map_sdk_web/lib/src/components/esri_map.dart | 4 ++-- .../lib/src/components/js_helper_functions.dart | 2 +- arcgis_map_sdk_web/lib/src/components/map_view.dart | 2 +- .../lib/src/components/scene_view.dart | 2 +- .../lib/src/components/vector_layer.dart | 2 +- arcgis_map_sdk_web/lib/src/layer_controller.dart | 10 +++++----- arcgis_map_sdk_web/pubspec.yaml | 2 +- arcgis_webpack/README.md | 4 ++-- arcgis_webpack/webpack.config.js | 2 +- example/.gitattributes | 2 +- example/README.md | 4 ++-- example/pubspec.lock | 4 ++-- example/pubspec.yaml | 4 ++-- example/pubspec_overrides.yaml | 4 ++-- 23 files changed, 45 insertions(+), 45 deletions(-) rename arcgis_map_sdk_web/lib/src/{arcgis_map_web.dart => arcgis_map_sdk_web.dart} (95%) diff --git a/am_sidekick/lib/src/arcgis_map_project.dart b/am_sidekick/lib/src/arcgis_map_project.dart index 1c20563f7..aa75ad7ad 100644 --- a/am_sidekick/lib/src/arcgis_map_project.dart +++ b/am_sidekick/lib/src/arcgis_map_project.dart @@ -16,7 +16,7 @@ class ArcgisMapProject { )!; DartPackage get arcgisMapWeb => - DartPackage.fromDirectory(root.directory('arcgis_map_web'))!; + DartPackage.fromDirectory(root.directory('arcgis_map_sdk_web'))!; DartPackage get arcgisMapAndroid => DartPackage.fromDirectory(root.directory('arcgis_map_android'))!; diff --git a/am_sidekick/lib/src/commands/generate_arcgis_webpack.dart b/am_sidekick/lib/src/commands/generate_arcgis_webpack.dart index 0f4fd4987..64b04c2c3 100644 --- a/am_sidekick/lib/src/commands/generate_arcgis_webpack.dart +++ b/am_sidekick/lib/src/commands/generate_arcgis_webpack.dart @@ -14,7 +14,7 @@ class GenerateArcgisWebpack extends Command { Future run() async { final root = afProject.root; final arcgisWebpackPath = root.directory('arcgis_webpack').path; - final arcgisMapWebPath = root.directory('arcgis_map_web').path; + final arcgisMapWebPath = root.directory('arcgis_map_sdk_web').path; print('Root path: $arcgisWebpackPath'); /// Check if NPM is installed diff --git a/arcgis_map/pubspec.yaml b/arcgis_map/pubspec.yaml index 143f454f4..8b5359944 100644 --- a/arcgis_map/pubspec.yaml +++ b/arcgis_map/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: arcgis_map_android: ^0.7.5 arcgis_map_ios: ^0.7.5 arcgis_map_sdk_platform_interface: ^1.0.0 - arcgis_map_web: ^0.7.5 + arcgis_map_sdk_web: ^0.7.5 flutter: sdk: flutter @@ -28,7 +28,7 @@ flutter: ios: default_package: arcgis_map_ios web: - default_package: arcgis_map_web + default_package: arcgis_map_sdk_web topics: - map diff --git a/arcgis_map/pubspec_overrides.yaml b/arcgis_map/pubspec_overrides.yaml index db2a79fd7..0d53c76c4 100644 --- a/arcgis_map/pubspec_overrides.yaml +++ b/arcgis_map/pubspec_overrides.yaml @@ -7,5 +7,5 @@ dependency_overrides: path: ../arcgis_map_sdk_method_channel arcgis_map_sdk_platform_interface: path: ../arcgis_map_sdk_platform_interface - arcgis_map_web: - path: ../arcgis_map_web + arcgis_map_sdk_web: + path: ../arcgis_map_sdk_web diff --git a/arcgis_map_sdk_web/README.md b/arcgis_map_sdk_web/README.md index 462d0d05f..84dcb0e4b 100644 --- a/arcgis_map_sdk_web/README.md +++ b/arcgis_map_sdk_web/README.md @@ -1,7 +1,7 @@ # ArcgisMap for Web -[![Flutter Community: arcgis_map_web](https://fluttercommunity.dev/_github/header/arcgis_map_web)](https://github.com/fluttercommunity/community) +[![Flutter Community: arcgis_map_sdk_web](https://fluttercommunity.dev/_github/header/arcgis_map_sdk_web)](https://github.com/fluttercommunity/community) -[![pub package](https://img.shields.io/pub/v/arcgis_map_web.svg)](https://pub.dev/packages/arcgis_map_web) +[![pub package](https://img.shields.io/pub/v/arcgis_map_sdk_web.svg)](https://pub.dev/packages/arcgis_map_sdk_web) Web implementation of [`arcgis_map`](https://pub.dev/packages/arcgis_map). \ No newline at end of file diff --git a/arcgis_map_sdk_web/lib/arcgis_map_web_js.dart b/arcgis_map_sdk_web/lib/arcgis_map_web_js.dart index beff53414..16b8a3e0e 100644 --- a/arcgis_map_sdk_web/lib/arcgis_map_web_js.dart +++ b/arcgis_map_sdk_web/lib/arcgis_map_web_js.dart @@ -1,12 +1,12 @@ @JS() -library arcgis_map_web; +library arcgis_map_sdk_web; import 'dart:async'; import 'dart:js_util'; import 'package:js/js.dart'; -export 'package:arcgis_map_web/src/arcgis_map_web.dart'; +export 'package:arcgis_map_sdk_web/src/arcgis_map_sdk_web.dart'; @JS("JSON.stringify") external dynamic jsonStringify(dynamic value); diff --git a/arcgis_map_sdk_web/lib/src/arcgis_map_web.dart b/arcgis_map_sdk_web/lib/src/arcgis_map_sdk_web.dart similarity index 95% rename from arcgis_map_sdk_web/lib/src/arcgis_map_web.dart rename to arcgis_map_sdk_web/lib/src/arcgis_map_sdk_web.dart index 4d361f265..7a675687a 100644 --- a/arcgis_map_sdk_web/lib/src/arcgis_map_web.dart +++ b/arcgis_map_sdk_web/lib/src/arcgis_map_sdk_web.dart @@ -3,7 +3,7 @@ import 'dart:html'; import 'dart:js'; import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart'; -import 'package:arcgis_map_web/src/arcgis_map_web_controller.dart'; +import 'package:arcgis_map_sdk_web/src/arcgis_map_web_controller.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; @@ -19,14 +19,14 @@ class ArcgisMapWeb extends ArcgisMapPlatform { ..addEventListener("load", (event) => _hasScriptLoaded.complete()) // ignore: unsafe_html ..src = - "assets/packages/arcgis_map_web/assets/arcgis_js_api_custom_build/main.js"; + "assets/packages/arcgis_map_sdk_web/assets/arcgis_js_api_custom_build/main.js"; document.head!.append(script); final link = LinkElement() ..type = "text/css" ..href = - "assets/packages/arcgis_map_web/assets/css_overrides/override_outline.css" + "assets/packages/arcgis_map_sdk_web/assets/css_overrides/override_outline.css" ..rel = "stylesheet"; document.head!.append(link); @@ -284,7 +284,7 @@ class ArcgisMapWeb extends ArcgisMapPlatform { /// https://developers.arcgis.com/javascript/latest/es-modules/#managing-assets-locally // ignore: avoid_dynamic_calls context["esri"]["core"]["config"]["assetsPath"] = - "/assets/packages/arcgis_map_web/assets/arcgis_js_api_custom_build/assets"; + "/assets/packages/arcgis_map_sdk_web/assets/arcgis_js_api_custom_build/assets"; }); final mapController = ArcgisMapWebController( diff --git a/arcgis_map_sdk_web/lib/src/arcgis_map_web_controller.dart b/arcgis_map_sdk_web/lib/src/arcgis_map_web_controller.dart index e9ec20f53..03702a331 100644 --- a/arcgis_map_sdk_web/lib/src/arcgis_map_web_controller.dart +++ b/arcgis_map_sdk_web/lib/src/arcgis_map_web_controller.dart @@ -5,12 +5,12 @@ import 'dart:js_util'; import 'dart:ui' as ui; import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart'; -import 'package:arcgis_map_web/arcgis_map_web_js.dart'; -import 'package:arcgis_map_web/src/components/esri_map.dart'; -import 'package:arcgis_map_web/src/components/map_view.dart'; -import 'package:arcgis_map_web/src/components/scene_view.dart'; -import 'package:arcgis_map_web/src/layer_controller.dart'; -import 'package:arcgis_map_web/src/model_extension.dart'; +import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart'; +import 'package:arcgis_map_sdk_web/src/components/esri_map.dart'; +import 'package:arcgis_map_sdk_web/src/components/map_view.dart'; +import 'package:arcgis_map_sdk_web/src/components/scene_view.dart'; +import 'package:arcgis_map_sdk_web/src/layer_controller.dart'; +import 'package:arcgis_map_sdk_web/src/model_extension.dart'; import 'package:async/async.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/arcgis_map_sdk_web/lib/src/components/attribution.dart b/arcgis_map_sdk_web/lib/src/components/attribution.dart index 63a0a2ece..b7ba01c47 100644 --- a/arcgis_map_sdk_web/lib/src/components/attribution.dart +++ b/arcgis_map_sdk_web/lib/src/components/attribution.dart @@ -1,6 +1,6 @@ import "dart:js_util" as js_util; -import 'package:arcgis_map_web/arcgis_map_web_js.dart'; +import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart'; /// The attribution attached to the map view class Attribution { diff --git a/arcgis_map_sdk_web/lib/src/components/esri_map.dart b/arcgis_map_sdk_web/lib/src/components/esri_map.dart index 8d2a1c85a..f5af4e3a0 100644 --- a/arcgis_map_sdk_web/lib/src/components/esri_map.dart +++ b/arcgis_map_sdk_web/lib/src/components/esri_map.dart @@ -1,6 +1,6 @@ import "dart:js_util" as js_util; -import 'package:arcgis_map_web/arcgis_map_web_js.dart'; -import 'package:arcgis_map_web/src/components/vector_layer.dart'; +import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart'; +import 'package:arcgis_map_sdk_web/src/components/vector_layer.dart'; class EsriMap { const EsriMap(); diff --git a/arcgis_map_sdk_web/lib/src/components/js_helper_functions.dart b/arcgis_map_sdk_web/lib/src/components/js_helper_functions.dart index 6e4b77601..eb940e8b8 100644 --- a/arcgis_map_sdk_web/lib/src/components/js_helper_functions.dart +++ b/arcgis_map_sdk_web/lib/src/components/js_helper_functions.dart @@ -1,5 +1,5 @@ import 'dart:convert' show json; -import 'package:arcgis_map_web/arcgis_map_web_js.dart'; +import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart'; Map jsNativeObjectToMap(dynamic jsObject) => json.decode(jsonStringify(jsObject) as String) as Map; diff --git a/arcgis_map_sdk_web/lib/src/components/map_view.dart b/arcgis_map_sdk_web/lib/src/components/map_view.dart index 2807cd12b..681a1965f 100644 --- a/arcgis_map_sdk_web/lib/src/components/map_view.dart +++ b/arcgis_map_sdk_web/lib/src/components/map_view.dart @@ -1,6 +1,6 @@ import "dart:js_util" as js_util; import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart'; -import 'package:arcgis_map_web/arcgis_map_web_js.dart'; +import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart'; class MapView { JsMapView init({ diff --git a/arcgis_map_sdk_web/lib/src/components/scene_view.dart b/arcgis_map_sdk_web/lib/src/components/scene_view.dart index acf1a2ebb..d8a3589b2 100644 --- a/arcgis_map_sdk_web/lib/src/components/scene_view.dart +++ b/arcgis_map_sdk_web/lib/src/components/scene_view.dart @@ -1,6 +1,6 @@ import "dart:js_util" as js_util; import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart'; -import 'package:arcgis_map_web/arcgis_map_web_js.dart'; +import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart'; class SceneView { JsSceneView init({ diff --git a/arcgis_map_sdk_web/lib/src/components/vector_layer.dart b/arcgis_map_sdk_web/lib/src/components/vector_layer.dart index e1564f8a0..046fe8df2 100644 --- a/arcgis_map_sdk_web/lib/src/components/vector_layer.dart +++ b/arcgis_map_sdk_web/lib/src/components/vector_layer.dart @@ -1,4 +1,4 @@ -import 'package:arcgis_map_web/arcgis_map_web_js.dart'; +import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart'; import 'package:js/js_util.dart'; class VectorLayer { diff --git a/arcgis_map_sdk_web/lib/src/layer_controller.dart b/arcgis_map_sdk_web/lib/src/layer_controller.dart index 6efb632e0..e6b273e88 100644 --- a/arcgis_map_sdk_web/lib/src/layer_controller.dart +++ b/arcgis_map_sdk_web/lib/src/layer_controller.dart @@ -3,11 +3,11 @@ import 'dart:html' hide VoidCallback; import 'dart:js_util'; import 'package:arcgis_map_sdk_platform_interface/arcgis_map_sdk_platform_interface.dart'; -import 'package:arcgis_map_web/arcgis_map_web_js.dart'; -import 'package:arcgis_map_web/src/components/attribution.dart'; -import 'package:arcgis_map_web/src/components/js_helper_functions.dart'; -import 'package:arcgis_map_web/src/components/vector_layer.dart'; -import 'package:arcgis_map_web/src/model_extension.dart'; +import 'package:arcgis_map_sdk_web/arcgis_map_web_js.dart'; +import 'package:arcgis_map_sdk_web/src/components/attribution.dart'; +import 'package:arcgis_map_sdk_web/src/components/js_helper_functions.dart'; +import 'package:arcgis_map_sdk_web/src/components/vector_layer.dart'; +import 'package:arcgis_map_sdk_web/src/model_extension.dart'; import 'package:async/async.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; diff --git a/arcgis_map_sdk_web/pubspec.yaml b/arcgis_map_sdk_web/pubspec.yaml index ad302709f..be2827fb7 100644 --- a/arcgis_map_sdk_web/pubspec.yaml +++ b/arcgis_map_sdk_web/pubspec.yaml @@ -1,4 +1,4 @@ -name: arcgis_map_web +name: arcgis_map_sdk_web description: Esri ArcGIS Flutter web implementation. version: 0.7.5 repository: https://github.com/fluttercommunity/arcgis_map diff --git a/arcgis_webpack/README.md b/arcgis_webpack/README.md index dcb953f01..ea08993d5 100644 --- a/arcgis_webpack/README.md +++ b/arcgis_webpack/README.md @@ -5,7 +5,7 @@ Allows lazy loading ## Build using Sidekick The preferred way to build/generate the **_arcgis_webpack_** asset files is to use Sidekick. The new generated files -will be automatically copied to the **_arcgis_map_web_** package and . Run `./am gen:arcgis-webpack` to generate the +will be automatically copied to the **_arcgis_map_sdk_web_** package and . Run `./am gen:arcgis-webpack` to generate the files. For more information run `./am --help`. @@ -19,4 +19,4 @@ npm run build ### Generated output files -Output files will be generated directly into `../arcgis_map_web/assets/arcgis_js_api_custom_build` folder. \ No newline at end of file +Output files will be generated directly into `../arcgis_map_sdk_web/assets/arcgis_js_api_custom_build` folder. \ No newline at end of file diff --git a/arcgis_webpack/webpack.config.js b/arcgis_webpack/webpack.config.js index 9d6e67e5a..8973989e3 100644 --- a/arcgis_webpack/webpack.config.js +++ b/arcgis_webpack/webpack.config.js @@ -2,7 +2,7 @@ const ArcGISPlugin = require("@arcgis/webpack-plugin"); const path = require("path"); const TerserPlugin = require('terser-webpack-plugin'); const rimraf = require('rimraf'); -const outputPath = "../arcgis_map_web/assets/arcgis_js_api_custom_build"; +const outputPath = "../arcgis_map_sdk_web/assets/arcgis_js_api_custom_build"; module.exports = { mode: 'production', diff --git a/example/.gitattributes b/example/.gitattributes index cd77ce432..4fadbe6b8 100644 --- a/example/.gitattributes +++ b/example/.gitattributes @@ -1 +1 @@ -packages/arcgis_map_web/assets/arcgis_js_api_custom_build/** linguist-generated=true +packages/arcgis_map_sdk_web/assets/arcgis_js_api_custom_build/** linguist-generated=true diff --git a/example/README.md b/example/README.md index ffbb9ac0b..139f9aa0b 100644 --- a/example/README.md +++ b/example/README.md @@ -12,10 +12,10 @@ In your app's pubspec.yaml dependencies, add e.g. for web: url: https://github.com/fluttercommunity/arcgis_map.git path: arcgis_map ref: main - arcgis_map_web: + arcgis_map_sdk_web: git: url: https://github.com/fluttercommunity/arcgis_map.git - path: arcgis_map_web + path: arcgis_map_sdk_web ref: main ``` diff --git a/example/pubspec.lock b/example/pubspec.lock index d401140a4..b84983031 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -36,10 +36,10 @@ packages: relative: true source: path version: "1.0.0" - arcgis_map_web: + arcgis_map_sdk_web: dependency: "direct main" description: - path: "../arcgis_map_web" + path: "../arcgis_map_sdk_web" relative: true source: path version: "0.7.5" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index ba255d3c4..7f422335e 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -35,10 +35,10 @@ dependencies: url: https://github.com/fluttercommunity/arcgis_map.git path: arcgis_map_sdk_platform_interface ref: v0.7.5 - arcgis_map_web: + arcgis_map_sdk_web: git: url: https://github.com/fluttercommunity/arcgis_map.git - path: arcgis_map_web + path: arcgis_map_sdk_web ref: v0.7.5 cupertino_icons: ^1.0.0 diff --git a/example/pubspec_overrides.yaml b/example/pubspec_overrides.yaml index bb1e633ee..96c627cda 100644 --- a/example/pubspec_overrides.yaml +++ b/example/pubspec_overrides.yaml @@ -9,5 +9,5 @@ dependency_overrides: path: ../arcgis_map_sdk_method_channel arcgis_map_sdk_platform_interface: path: ../arcgis_map_sdk_platform_interface - arcgis_map_web: - path: ../arcgis_map_web + arcgis_map_sdk_web: + path: ../arcgis_map_sdk_web