From e83908d94994aa5091c4ce9c15c6eec1a789ef65 Mon Sep 17 00:00:00 2001 From: jchen Date: Thu, 2 May 2024 16:40:47 -0700 Subject: [PATCH 1/2] chore: updated calcite asset versioning --- .../templates/vue/src/main.js | 16 +++++++-------- .../templates/webpack/src/index.js | 20 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/charts-components/templates/vue/src/main.js b/packages/charts-components/templates/vue/src/main.js index 9338a5f..49d18e5 100644 --- a/packages/charts-components/templates/vue/src/main.js +++ b/packages/charts-components/templates/vue/src/main.js @@ -13,16 +13,16 @@ * limitations under the License. */ -import './assets/main.css'; +import "./assets/main.css"; -import { createApp } from 'vue'; -import App from './App.vue'; +import { createApp } from "vue"; +import App from "./App.vue"; -import { defineCustomElements as defineCalciteElements } from '@esri/calcite-components/dist/loader'; -import { defineCustomElements as defineChartsElements } from '@arcgis/charts-components/dist/loader'; +import { defineCustomElements as defineCalciteElements } from "@esri/calcite-components/dist/loader"; +import { defineCustomElements as defineChartsElements } from "@arcgis/charts-components/dist/loader"; // define custom elements in the browser, and load the assets from the CDN -defineCalciteElements(window, { resourcesUrl: 'https://js.arcgis.com/calcite-components/4.29/assets' }); -defineChartsElements(window, { resourcesUrl: 'https://js.arcgis.com/charts-components/4.29/t9n' }); +defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.5.1/assets" }); +defineChartsElements(window, { resourcesUrl: "https://js.arcgis.com/charts-components/4.29/t9n" }); -createApp(App).mount('#app'); +createApp(App).mount("#app"); diff --git a/packages/charts-components/templates/webpack/src/index.js b/packages/charts-components/templates/webpack/src/index.js index 0231c6a..6d9b7c9 100644 --- a/packages/charts-components/templates/webpack/src/index.js +++ b/packages/charts-components/templates/webpack/src/index.js @@ -13,25 +13,25 @@ * limitations under the License. */ -import { ScatterPlotModel } from '@arcgis/charts-model'; -import { loadFeatureLayer } from './load-data'; +import { ScatterPlotModel } from "@arcgis/charts-model"; +import { loadFeatureLayer } from "./load-data"; -import { defineCustomElements as defineCalciteElements } from '@esri/calcite-components/dist/loader'; -import { defineCustomElements as defineChartsElements } from '@arcgis/charts-components/dist/loader'; +import { defineCustomElements as defineCalciteElements } from "@esri/calcite-components/dist/loader"; +import { defineCustomElements as defineChartsElements } from "@arcgis/charts-components/dist/loader"; // define custom elements in the browser, and load the assets from the CDN -defineCalciteElements(window, { resourcesUrl: 'https://js.arcgis.com/calcite-components/4.29/assets' }); -defineChartsElements(window, { resourcesUrl: 'https://js.arcgis.com/charts-components/4.29/t9n' }); +defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/4.29/assets" }); +defineChartsElements(window, { resourcesUrl: "https://js.arcgis.com/charts-components/4.29/t9n" }); (async () => { - const scatterPlotRef = document.querySelector('arcgis-charts-scatter-plot'); + const scatterPlotRef = document.querySelector("arcgis-charts-scatter-plot"); - const featureLayer = await loadFeatureLayer('8871626e970a4f3e9d6113ec63a92f2f'); + const featureLayer = await loadFeatureLayer("8871626e970a4f3e9d6113ec63a92f2f"); const scatterPlotParams = { layer: featureLayer, - xAxisFieldName: 'Earnings', - yAxisFieldName: 'Cost', + xAxisFieldName: "Earnings", + yAxisFieldName: "Cost" }; const scatterPlotModel = new ScatterPlotModel(scatterPlotParams); From de4bd5615a391be2f24ee1ed69b32914c0b2fd97 Mon Sep 17 00:00:00 2001 From: jchen Date: Thu, 2 May 2024 16:49:46 -0700 Subject: [PATCH 2/2] fix: updated webpack calcite asset version --- packages/charts-components/templates/webpack/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/charts-components/templates/webpack/src/index.js b/packages/charts-components/templates/webpack/src/index.js index 6d9b7c9..2faffac 100644 --- a/packages/charts-components/templates/webpack/src/index.js +++ b/packages/charts-components/templates/webpack/src/index.js @@ -20,7 +20,7 @@ import { defineCustomElements as defineCalciteElements } from "@esri/calcite-com import { defineCustomElements as defineChartsElements } from "@arcgis/charts-components/dist/loader"; // define custom elements in the browser, and load the assets from the CDN -defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/4.29/assets" }); +defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.5.1/assets" }); defineChartsElements(window, { resourcesUrl: "https://js.arcgis.com/charts-components/4.29/t9n" }); (async () => {