Skip to content
This repository was archived by the owner on Jul 10, 2024. It is now read-only.

chore: bump calcite to ^2.5.1 #22

Merged
merged 4 commits into from
Mar 26, 2024
Merged

chore: bump calcite to ^2.5.1 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffcc850
chore: bump calcite to ^2.5.1
nick-romano Mar 25, 2024
96a99fe
chore: update yarn lock
omarkawach Mar 25, 2024
773e995
chore: update calcite urls to 2.5.1
nick-romano Mar 25, 2024
1d76550
Merge remote-tracking branch 'origin/main' into nr/update-calcite-caret
nick-romano Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .syncpackrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const config = {
dependencies: ["@esri/calcite-components"],
packages: ["**"],
dependencyTypes: ["dev", "prod"],
pinVersion: "2.4.0"
pinVersion: "^2.5.1"
},
{
label: "React for dev and prod",
Expand Down
2 changes: 1 addition & 1 deletion packages/charts-components/templates/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@arcgis/charts-components-angular": "~4.29.6",
"@arcgis/charts-model": "~4.29.6",
"@arcgis/core": "~4.29.6",
"@esri/calcite-components": "2.4.0",
"@esri/calcite-components": "^2.5.1",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/charts-components/templates/react/src/index.tsx
View file
Open in desktop
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.29/t9n' });
defineCalciteElements(window, { resourcesUrl: 'https://js.arcgis.com/calcite-components/2.4.0/assets' });
defineCalciteElements(window, { resourcesUrl: 'https://js.arcgis.com/calcite-components/2.5.1/assets' });

const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
Expand Down
2 changes: 1 addition & 1 deletion packages/charts-components/templates/vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@arcgis/charts-components": "~4.29.6",
"@arcgis/charts-model": "~4.29.6",
"@arcgis/core": "~4.29.6",
"@esri/calcite-components": "2.4.0"
"@esri/calcite-components": "^2.5.1"
},
"devDependencies": {
"resolve-pkg": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/charts-components/templates/vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@arcgis/charts-components": "~4.29.6",
"@arcgis/charts-model": "~4.29.6",
"@arcgis/core": "~4.29.6",
"@esri/calcite-components": "2.4.0",
"@esri/calcite-components": "^2.5.1",
"vue": "^3.4.18"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/charts-components/templates/webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@arcgis/charts-components": "~4.29.6",
"@arcgis/charts-model": "~4.29.6",
"@arcgis/core": "~4.29.6",
"@esri/calcite-components": "2.4.0"
"@esri/calcite-components": "^2.5.1"
},
"devDependencies": {
"css-loader": "^6.10.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/charts-components/tutorials/charts-components-with-map-components-solution/main.js
View file
Open in desktop
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.4.0/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.5.1/assets" });

/**
* Use the Map Components to define and lazy load the custom map elements.
Expand Down
2 changes: 1 addition & 1 deletion ...s/charts-components/tutorials/charts-components-with-map-components-solution/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@arcgis/charts-components": "~4.29.6",
"@arcgis/core": "~4.29.6",
"@arcgis/map-components": "~4.29.6",
"@esri/calcite-components": "2.4.0"
"@esri/calcite-components": "^2.5.1"
},
"devDependencies": {
"vite": "^5.1.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/angular/src/app/app.component.ts
View file
Open in desktop
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.4.0/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.5.1/assets" });
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.29/assets" });
// Call async functions here
this.fetch();
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/angular/src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "https://js.arcgis.com/coding-components/4.29/arcgis-coding-components.css";
@import "https://js.arcgis.com/calcite-components/2.4.0/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.5.1/calcite.css";
@import "https://js.arcgis.com/4.29/@arcgis/core/assets/esri/themes/light/main.css";

html,
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/react/src/components/ArcadeEditor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "https://js.arcgis.com/coding-components/4.29/arcgis-coding-components.css";
@import "https://js.arcgis.com/calcite-components/2.4.0/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.5.1/calcite.css";

html,
body {
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/react/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { defineCustomElements as defineCodingElements } from "@arcgis/coding-com

// define custom elements in the browser, and load the assets from the CDN
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.29/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.4.0/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.5.1/assets" });

const root = ReactDOM.createRoot(document.getElementById("root"));
root.render(
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/vite/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { defineCustomElements as defineCalciteElements } from "@esri/calcite-com
import { defineCustomElements as defineCodingElements } from "@arcgis/coding-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.4.0/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.5.1/assets" });
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.29/assets" });

(async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/coding-components": "~4.29.6",
"@arcgis/core": "~4.29.6",
"@esri/calcite-components": "2.4.0"
"@esri/calcite-components": "^2.5.1"
},
"devDependencies": {
"vite": "^5.1.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/vite/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "https://js.arcgis.com/coding-components/4.29/arcgis-coding-components.css";
@import "https://js.arcgis.com/calcite-components/2.4.0/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.5.1/calcite.css";
@import "https://js.arcgis.com/4.29/@arcgis/core/assets/esri/themes/light/main.css";

html,
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/coding-components": "~4.29.6",
"@arcgis/core": "~4.29.6",
"@esri/calcite-components": "2.4.0",
"@esri/calcite-components": "^2.5.1",
"vue": "^3.4.18"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/vue/src/assets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "https://js.arcgis.com/coding-components/4.29/arcgis-coding-components.css";
@import "https://js.arcgis.com/calcite-components/2.4.0/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.5.1/calcite.css";
@import "https://js.arcgis.com/4.29/@arcgis/core/assets/esri/themes/light/main.css";

html,
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/vue/src/main.js
View file
Open in desktop
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 defineCodingElements } from "@arcgis/coding-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.4.0/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.5.1/assets" });
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.29/assets" });

createApp(App).mount('#app');
2 changes: 1 addition & 1 deletion packages/coding-components/templates/webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"@arcgis/coding-components": "~4.29.6",
"@arcgis/core": "~4.29.6",
"@esri/calcite-components": "2.4.0"
"@esri/calcite-components": "^2.5.1"
},
"devDependencies": {
"css-loader": "^6.10.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/coding-components/templates/webpack/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import { defineCustomElements as defineCalciteElements } from "@esri/calcite-com
import { defineCustomElements as defineCodingElements } from "@arcgis/coding-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.4.0/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.5.1/assets" });
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.29/assets" });
```

Expand All @@ -71,7 +71,7 @@ You can find all the necessary styling in [`src/index.css`](./src/index.css). Im

```
@import "https://js.arcgis.com/coding-components/4.29/arcgis-coding-components.css";
@import "https://js.arcgis.com/calcite-components/2.4.0/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.5.1/calcite.css";
```

#### HTML
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/webpack/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "https://js.arcgis.com/coding-components/4.29/arcgis-coding-components.css";
@import "https://js.arcgis.com/calcite-components/2.4.0/calcite.css";
@import "https://js.arcgis.com/calcite-components/2.5.1/calcite.css";
@import "https://js.arcgis.com/4.29/@arcgis/core/assets/esri/themes/light/main.css";

html,
Expand Down
2 changes: 1 addition & 1 deletion packages/coding-components/templates/webpack/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { defineCustomElements as defineCalciteElements } from "@esri/calcite-com
import { defineCustomElements as defineCodingElements } from "@arcgis/coding-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.4.0/assets" });
defineCalciteElements(window, { resourcesUrl: "https://js.arcgis.com/calcite-components/2.5.1/assets" });
defineCodingElements(window, { resourcesUrl: "https://js.arcgis.com/coding-components/4.29/assets" });

import { loadData } from "./load-data";
Expand Down
2 changes: 1 addition & 1 deletion packages/map-components/templates/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@angular/router": "^17.2.0",
"@arcgis/core": "~4.29.6",
"@arcgis/map-components-angular": "~4.29.6",
"@esri/calcite-components": "2.4.0",
"@esri/calcite-components": "^2.5.1",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/map-components/templates/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/core": "~4.29.6",
"@arcgis/map-components-react": "~4.29.6",
"@esri/calcite-components": "2.4.0",
"@esri/calcite-components": "^2.5.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/map-components/templates/vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/core": "~4.29.6",
"@arcgis/map-components": "~4.29.6",
"@esri/calcite-components": "2.4.0"
"@esri/calcite-components": "^2.5.1"
},
"devDependencies": {
"vite": "^5.1.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/map-components/templates/vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/core": "~4.29.6",
"@arcgis/map-components": "~4.29.6",
"@esri/calcite-components": "2.4.0",
"@esri/calcite-components": "^2.5.1",
"vue": "^3.4.18"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/map-components/templates/webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"@arcgis/core": "~4.29.6",
"@arcgis/map-components": "~4.29.6",
"@esri/calcite-components": "2.4.0"
"@esri/calcite-components": "^2.5.1"
},
"devDependencies": {
"css-loader": "^6.10.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/map-components/tutorials/create-a-web-app-using-components-solution/main.js
View file
Open in desktop
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.4.0/assets"
resourcesUrl: "https://js.arcgis.com/calcite-components/2.5.1/assets"
});

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/map-components/tutorials/create-a-web-app-using-components-solution/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@arcgis/core": "~4.29.6",
"@arcgis/map-components": "~4.29.6",
"@esri/calcite-components": "2.4.0"
"@esri/calcite-components": "^2.5.1"
},
"devDependencies": {
"vite": "^5.1.3"
Expand Down
Loading