Skip to content

Commit

Permalink
Merge pull request #528 from Esri/omar/set-asset-path
Browse files Browse the repository at this point in the history
chore: update set asset path for coding comps and calcite assets url
  • Loading branch information
omarkawach authored Aug 14, 2024
2 parents ec2b2bd + 8cd8c0e commit d4200bd
Show file tree
Hide file tree
Showing 69 changed files with 42 additions and 48 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@arcgis/charts-components-react": "~4.30.0",
"@arcgis/charts-model": "~4.30.0",
"@arcgis/core": "~4.30.0",
"@esri/calcite-components-react": "^2.8.5",
"@esri/calcite-components-react": "^2.8.6",
"react": "^18.3.0",
"react-dom": "^18.3.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { defineCustomElements as defineChartsElements } from '@arcgis/charts-com

// define custom elements in the browser, and load the assets from the CDN
defineChartsElements(window, { resourcesUrl: 'https://js.arcgis.com/charts-components/4.30/t9n' });
defineCalciteElements(window, { resourcesUrl: 'https://js.arcgis.com/calcite-components/2.8.5/assets' });
defineCalciteElements(window, { resourcesUrl: 'https://js.arcgis.com/calcite-components/2.8.6/assets' });

const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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/2.8.0/assets' });
defineCalciteElements(window, { resourcesUrl: 'https://js.arcgis.com/calcite-components/2.8.6/assets' });
defineChartsElements(window, { resourcesUrl: 'https://js.arcgis.com/charts-components/4.30/t9n' });

createApp(App).mount("#app");
Original file line number Diff line number Diff line change
Expand Up @@ -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/2.8.0/assets' });
defineCalciteElements(window, { resourcesUrl: 'https://js.arcgis.com/calcite-components/2.8.6/assets' });
defineChartsElements(window, { resourcesUrl: 'https://js.arcgis.com/charts-components/4.30/t9n' });

// Function to initialize the scatterplot.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { defineCustomElements as defineMapElements } from "@arcgis/map-component
* you need to keep the version number in the path the same as the version of
* `@esri/calcite-components` installed as a dependency of `@arcgis/map-components`.
*/
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.5/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.6/assets" });

/**
* Use the Map Components to define and lazy load the custom map elements.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@arcgis/charts-components": "~4.30.0",
"@arcgis/core": "~4.30.0",
"@arcgis/map-components": "~4.30.0",
"@esri/calcite-components": "^2.8.5"
"@esri/calcite-components": "^2.8.6"
},
"devDependencies": {
"vite": "^5.1.3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@angular/router": "^17.3.6",
"@arcgis/coding-components-angular": "~4.30.0",
"@arcgis/core": "~4.30.0",
"@esri/calcite-components-angular": "^2.8.5",
"@esri/calcite-components-angular": "^2.8.6",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export class AppComponent implements OnInit {

ngOnInit() {
// define custom elements in the browser, and load the assets from the CDN
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.5/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.6/assets" });
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.30/assets" });
// Call async functions here
this.fetch();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "https://js.arcgis.com/coding-components/4.30/arcgis-coding-components.css";
@import "https://js.arcgis.com/calcite-components/2.8.5/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.8.6/calcite.css";
@import "https://js.arcgis.com/4.30/@arcgis/core/assets/esri/themes/light/main.css";

html,
Expand Down
4 changes: 2 additions & 2 deletions component-samples/coding-components/samples/cdn/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<link rel="icon" href="data:;base64,=" />

<!-- Load Calcite Components. Note this could be after loading the ArcGIS Maps SDK for JS but before loading the Coding Components -->
<link rel="stylesheet" type="text/css" href="https://js.arcgis.com/calcite-components/2.8.5/calcite.css" />
<script type="module" src="https://js.arcgis.com/calcite-components/2.8.5/calcite.esm.js"></script>
<link rel="stylesheet" type="text/css" href="https://js.arcgis.com/calcite-components/2.8.6/calcite.css" />
<script type="module" src="https://js.arcgis.com/calcite-components/2.8.6/calcite.esm.js"></script>

<!-- Load the ArcGIS Maps SDK for JavaScript -->
<script src="https://js.arcgis.com/4.30/"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The JavaScript Maps SDK also offers a convenience pattern useful for quick testi
import { defineCustomElements as defineCalciteElements } from "@esri/calcite-components/dist/loader";
import { defineCustomElements as defineCodingElements } from "@arcgis/coding-components/dist/loader";
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.5/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.6/assets" });
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.30/assets" });
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/coding-components-react": "~4.30.0",
"@arcgis/core": "~4.30.0",
"@esri/calcite-components-react": "^2.8.5",
"@esri/calcite-components-react": "^2.8.6",
"react": "^18.3.0",
"react-dom": "^18.3.0"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "https://js.arcgis.com/calcite-components/2.8.5/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.8.6/calcite.css";
@import 'https://js.arcgis.com/4.30/@arcgis/core/assets/esri/themes/light/main.css';
@import "https://js.arcgis.com/coding-components/4.30/arcgis-coding-components.css";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import "@esri/calcite-components/dist/components/calcite-scrim";

// Set the asset path for calcite components
import { setAssetPath as setCalciteComponentsAssetPath } from '@esri/calcite-components/dist/components';
setCalciteComponentsAssetPath("https://js.arcgis.com/calcite-components/2.8.0/assets");
setCalciteComponentsAssetPath("https://js.arcgis.com/calcite-components/2.8.6/assets");

const root = ReactDOM.createRoot(document.getElementById("root"));
root.render(
Expand Down
2 changes: 1 addition & 1 deletion component-samples/coding-components/samples/vite/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The JavaScript Maps SDK also offers a convenience pattern useful for quick testi
import { defineCustomElements as defineCalciteElements } from "@esri/calcite-components/dist/loader";
import { defineCustomElements as defineCodingElements } from "@arcgis/coding-components/dist/loader";
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.5/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.6/assets" });
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.30/assets" });
```

Expand Down
8 changes: 3 additions & 5 deletions component-samples/coding-components/samples/vite/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@ import "./style.css"; // Arcade editor styles

import { loadData } from "./load-data";

import { setAssetPath as setCalciteComponentsAssetPath } from '@esri/calcite-components/dist/components';

// Individual imports for each component
import { setArcgisAssetPath as setCodingComponentsAssetPath } from "@arcgis/coding-components/dist/components";
import "@arcgis/coding-components/dist/components/arcgis-arcade-editor";

import { setAssetPath as setCalciteComponentsAssetPath } from '@esri/calcite-components/dist/components';
import "@esri/calcite-components/dist/components/calcite-scrim";

setCodingComponentsAssetPath("https://js.arcgis.com/coding-components/4.30/assets");
setCalciteComponentsAssetPath("https://js.arcgis.com/calcite-components/2.8.0/assets");
setCalciteComponentsAssetPath("https://js.arcgis.com/calcite-components/2.8.6/assets");

(async () => {
// Get the Arcade editor element
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/coding-components": "~4.30.0",
"@arcgis/core": "~4.30.0",
"@esri/calcite-components": "^2.8.5"
"@esri/calcite-components": "^2.8.6"
},
"devDependencies": {
"vite": "^5.1.3"
Expand Down
2 changes: 1 addition & 1 deletion component-samples/coding-components/samples/vite/style.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "https://js.arcgis.com/coding-components/4.30/arcgis-coding-components.css";
@import "https://js.arcgis.com/calcite-components/2.8.5/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.8.6/calcite.css";
@import "https://js.arcgis.com/4.30/@arcgis/core/assets/esri/themes/light/main.css";

html,
Expand Down
2 changes: 1 addition & 1 deletion component-samples/coding-components/samples/vue/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The JavaScript Maps SDK also offers a convenience pattern useful for quick testi
import { defineCustomElements as defineCalciteElements } from "@esri/calcite-components/dist/loader";
import { defineCustomElements as defineCodingElements } from "@arcgis/coding-components/dist/loader";
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.5/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.6/assets" });
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.30/assets" });
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/coding-components": "~4.30.0",
"@arcgis/core": "~4.30.0",
"@esri/calcite-components": "^2.8.5",
"@esri/calcite-components": "^2.8.6",
"vue": "^3.4.19"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "https://js.arcgis.com/coding-components/4.30/arcgis-coding-components.css";
@import "https://js.arcgis.com/calcite-components/2.8.5/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.8.6/calcite.css";
@import "https://js.arcgis.com/4.30/@arcgis/core/assets/esri/themes/light/main.css";

html,
Expand Down
8 changes: 3 additions & 5 deletions component-samples/coding-components/samples/vue/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ import "./assets/main.css"; // App style
import { createApp } from "vue";
import App from "./App.vue";

import { setAssetPath as setCalciteComponentsAssetPath } from '@esri/calcite-components/dist/components';

// Individual imports for each component
import { setArcgisAssetPath as setCodingComponentsAssetPath } from "@arcgis/coding-components/dist/components";
import "@arcgis/coding-components/dist/components/arcgis-arcade-editor";

import { setAssetPath as setCalciteComponentsAssetPath } from '@esri/calcite-components/dist/components';
import "@esri/calcite-components/dist/components/calcite-scrim";

setCodingComponentsAssetPath("https://js.arcgis.com/coding-components/4.30/assets");
setCalciteComponentsAssetPath("https://js.arcgis.com/calcite-components/2.8.0/assets");
setCalciteComponentsAssetPath("https://js.arcgis.com/calcite-components/2.8.6/assets");

createApp(App).mount('#app');
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The JavaScript Maps SDK also offers a convenience pattern useful for quick testi
import { defineCustomElements as defineCalciteElements } from "@esri/calcite-components/dist/loader";
import { defineCustomElements as defineCodingElements } from "@arcgis/coding-components/dist/loader";
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.5/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.6/assets" });
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.30/assets" });
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"@arcgis/coding-components": "~4.30.0",
"@arcgis/core": "~4.30.0",
"@esri/calcite-components": "^2.8.5"
"@esri/calcite-components": "^2.8.6"
},
"devDependencies": {
"css-loader": "^6.10.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "https://js.arcgis.com/coding-components/4.30/arcgis-coding-components.css";
@import "https://js.arcgis.com/calcite-components/2.8.5/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.8.6/calcite.css";
@import "https://js.arcgis.com/4.30/@arcgis/core/assets/esri/themes/light/main.css";

html,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@
* limitations under the License.
*/

import { setAssetPath as setCalciteComponentsAssetPath } from '@esri/calcite-components/dist/components';

// Individual imports for each component
import { setArcgisAssetPath as setCodingComponentsAssetPath } from "@arcgis/coding-components/dist/components";
import "@arcgis/coding-components/dist/components/arcgis-arcade-editor";

import { setAssetPath as setCalciteComponentsAssetPath } from '@esri/calcite-components/dist/components';
import "@esri/calcite-components/dist/components/calcite-scrim";

setCodingComponentsAssetPath("https://js.arcgis.com/coding-components/4.30/assets");
setCalciteComponentsAssetPath("https://js.arcgis.com/calcite-components/2.8.0/assets");
setCalciteComponentsAssetPath("https://js.arcgis.com/calcite-components/2.8.6/assets");

import { loadData } from "./load-data";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@angular/router": "^17.3.6",
"@arcgis/core": "~4.30.0",
"@arcgis/map-components-angular": "~4.30.0",
"@esri/calcite-components": "^2.8.5",
"@esri/calcite-components": "^2.8.6",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.5"
Expand Down
4 changes: 2 additions & 2 deletions component-samples/map-components/samples/cdn/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</style>

<!-- Load Calcite Components-->
<link rel="stylesheet" type="text/css" href="https://js.arcgis.com/calcite-components/2.8.5/calcite.css" />
<script type="module" src="https://js.arcgis.com/calcite-components/2.8.5/calcite.esm.js"></script>
<link rel="stylesheet" type="text/css" href="https://js.arcgis.com/calcite-components/2.8.6/calcite.css" />
<script type="module" src="https://js.arcgis.com/calcite-components/2.8.6/calcite.esm.js"></script>

<!-- Load the ArcGIS Maps SDK for JavaScript -->
<link rel="stylesheet" href="https://js.arcgis.com/4.30/esri/themes/dark/main.css" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/core": "~4.30.0",
"@arcgis/map-components-react": "~4.30.0",
"@esri/calcite-components-react": "^2.8.5",
"@esri/calcite-components-react": "^2.8.6",
"react": "^18.3.0",
"react-dom": "^18.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion component-samples/map-components/samples/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/core": "~4.30.0",
"@arcgis/map-components": "~4.30.0",
"@esri/calcite-components": "^2.8.5"
"@esri/calcite-components": "^2.8.6"
},
"devDependencies": {
"vite": "^5.1.3"
Expand Down
2 changes: 1 addition & 1 deletion component-samples/map-components/samples/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/core": "~4.30.0",
"@arcgis/map-components": "~4.30.0",
"@esri/calcite-components": "^2.8.5",
"@esri/calcite-components": "^2.8.6",
"vue": "^3.4.19"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"@arcgis/core": "~4.30.0",
"@arcgis/map-components": "~4.30.0",
"@esri/calcite-components": "^2.8.5"
"@esri/calcite-components": "^2.8.6"
},
"devDependencies": {
"css-loader": "^6.10.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { defineCustomElements as defineCalciteElements } from "@esri/calcite-com
* `@esri/calcite-components` installed as a dependency of `@arcgis/map-components`.
*/
defineCalciteElements(window, {
resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.5/assets"
resourcesUrl: "https://js.arcgis.com/calcite-components/2.8.6/assets"
});

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/core": "~4.30.0",
"@arcgis/map-components": "~4.30.0",
"@esri/calcite-components": "^2.8.5"
"@esri/calcite-components": "^2.8.6"
},
"devDependencies": {
"vite": "^5.1.3"
Expand Down
Binary file modified zips/charts-components-sample-angular.zip
Binary file not shown.
Binary file modified zips/charts-components-sample-cdn.zip
Binary file not shown.
Binary file modified zips/charts-components-sample-react.zip
Binary file not shown.
Binary file modified zips/charts-components-sample-vite.zip
Binary file not shown.
Binary file modified zips/charts-components-sample-vue.zip
Binary file not shown.
Binary file modified zips/charts-components-sample-webpack.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified zips/coding-components-sample-angular.zip
Binary file not shown.
Binary file modified zips/coding-components-sample-cdn.zip
Binary file not shown.
Binary file modified zips/coding-components-sample-react.zip
Binary file not shown.
Binary file modified zips/coding-components-sample-vite.zip
Binary file not shown.
Binary file modified zips/coding-components-sample-vue.zip
Binary file not shown.
Binary file modified zips/coding-components-sample-webpack.zip
Binary file not shown.
Binary file modified zips/core-sample-esbuild.zip
Binary file not shown.
Binary file modified zips/core-sample-jsapi-angular-cli.zip
Binary file not shown.
Binary file modified zips/core-sample-jsapi-custom-ui.zip
Binary file not shown.
Binary file modified zips/core-sample-jsapi-custom-workers.zip
Binary file not shown.
Binary file modified zips/core-sample-jsapi-deno.zip
Binary file not shown.
Binary file modified zips/core-sample-jsapi-esm-cdn.zip
Binary file not shown.
Binary file modified zips/core-sample-jsapi-node.zip
Binary file not shown.
Binary file modified zips/core-sample-jsapi-oauth.zip
Binary file not shown.
Binary file modified zips/core-sample-jsapi-react.zip
Binary file not shown.
Binary file modified zips/core-sample-jsapi-vite-ts.zip
Binary file not shown.
Binary file modified zips/core-sample-jsapi-vue.zip
Binary file not shown.
Binary file modified zips/core-sample-rollup.zip
Binary file not shown.
Binary file modified zips/core-sample-webpack.zip
Binary file not shown.
Binary file modified zips/map-component-sample-angular.zip
Binary file not shown.
Binary file modified zips/map-component-sample-cdn.zip
Binary file not shown.
Binary file modified zips/map-component-sample-react.zip
Binary file not shown.
Binary file modified zips/map-component-sample-vite.zip
Binary file not shown.
Binary file modified zips/map-component-sample-vue.zip
Binary file not shown.
Binary file modified zips/map-component-sample-webpack.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit d4200bd

Please sign in to comment.