Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4,574 changes: 1,758 additions & 2,816 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"util:update-3rd-party-licenses": "turbo run util:update-3rd-party-licenses --log-order=stream"
},
"devDependencies": {
"@arcgis/eslint-config": "4.33.10",
"@arcgis/eslint-config": "^4.34.0-next.49",
"@cspell/dict-gis": "1.0.2",
"@cspell/dict-pokemon": "1.0.2",
"@cspell/dict-scientific-terms-us": "3.0.7",
Expand Down Expand Up @@ -114,7 +114,7 @@
"typescript": "5.8.2",
"typescript-eslint": "8.36.0",
"typescript-strict-plugin": "2.4.4",
"vite": "6.3.5",
"vite": "7.0.5",
"vite-plugin-dts": "4.5.4"
},
"license": "SEE LICENSE.md",
Expand Down
4 changes: 3 additions & 1 deletion packages/calcite-components-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
},
"dependencies": {
"@esri/calcite-components": "3.3.0-next.46",
"@lit/react": "1.0.8"
"@arcgis/lumina": "^4.34.0-next.49",
"@lit/react": "1.0.8",
"lit": "3.3.0"
},
"peerDependencies": {
"react": ">=18.3",
Expand Down
8 changes: 5 additions & 3 deletions packages/calcite-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
"util:update-3rd-party-licenses": "tsx ../../support/createThirdPartyLicenses.ts"
},
"dependencies": {
"@arcgis/components-utils": "^4.33.10",
"@arcgis/lumina": "^4.33.10",
"@arcgis/lumina": "^4.34.0-next.49",
"@arcgis/toolkit": "^4.34.0-next.61",
"@esri/calcite-ui-icons": "4.3.0-next.11",
"@floating-ui/dom": "^1.6.12",
"@floating-ui/utils": "^0.2.8",
Expand All @@ -86,18 +86,20 @@
"dayjs": "^1.11.13",
"focus-trap": "^7.6.2",
"interactjs": "^1.10.27",
"lit": "3.3.0",
"lodash-es": "^4.17.21",
"sortablejs": "^1.15.6",
"timezone-groups": "^0.10.4",
"type-fest": "^4.30.1"
},
"devDependencies": {
"@arcgis/lumina-compiler": "^4.33.10",
"@arcgis/lumina-compiler": "^4.34.0-next.49",
"@esri/calcite-design-tokens": "3.2.0-next.11",
"@esri/calcite-tailwind-preset": "1.0.1-next.15",
"@esri/eslint-plugin-calcite-components": "2.0.3-next.5",
"@vitest/browser": "3.2.4",
"playwright": "1.54.1",
"sass-embedded": "1.79.3",
"vitest": "3.2.4"
},
"volta": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import { newE2EPage, E2EPage, E2EElement } from "@arcgis/lumina-compiler/puppeteerTesting";
import { describe, expect, it, beforeEach } from "vitest";
import { SupportedLocale } from "@arcgis/components-utils";
import { SupportedLocale } from "@arcgis/toolkit/intl";
import { KeyInput } from "puppeteer";
import { getLocaleHourFormat, getMeridiemOrder, localizeTimeString } from "../../utils/time";
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/calcite-components/src/controllers/useTime.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import { PropertyValues } from "lit";
import { GenericController, T9nMeta, toFunction } from "@arcgis/lumina/controllers";
import { GenericT9nStrings } from "@arcgis/components-utils";
import { GenericT9nStrings } from "@arcgis/toolkit/intl";
import { createEvent, LitElement } from "@arcgis/lumina";
import {
EffectiveHourFormat,
Expand Down
13 changes: 1 addition & 12 deletions packages/calcite-components/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ export default defineConfig({
// Workaround for https://github.com/Esri/calcite-design-system/issues/10761
bundleIn: nonEsmDependencies,
},
ssr: {
stencilCompatibility: {
enabled: true,
},
},
wrappers: [
{
type: "react18",
Expand Down Expand Up @@ -70,16 +65,10 @@ export default defineConfig({
additionalData(code: string, id: string) {
const globalCss = "/src/assets/styles/includes";
if (!id.endsWith(".scss") || id.endsWith(`${globalCss}.sass`)) {
return undefined;
return "";
}
return `@import "${globalCss}";\n${code}`;
},
silenceDeprecations: [
// TODO: [MIGRATION] Migrate away from deprecated SASS import syntax. See https://github.com/Esri/calcite-design-system/issues/10583
"import",
// TODO: [MIGRATION] Migrate away from deprecated SASS global built-ins. See https://github.com/Esri/calcite-design-system/issues/new?assignees=&labels=refactor%2C0+-+new%2Cneeds+triage&projects=&template=refactor.yml
"global-builtin",
],
},
},
postcss: {
Expand Down
2 changes: 1 addition & 1 deletion support/createThirdPartyLicenses.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { getProjectLicenses } from "generate-license-file";

const coveredByEsriLicense = [
"@arcgis/lumina/controllers",
"@arcgis/components-utils",
"@arcgis/toolkit",
"@arcgis/lumina",
"@esri/calcite-components",
"@esri/calcite-components-react",
Expand Down
Loading