From e895379033c5a29e3f06b4d45cd454db7d3c600a Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 23 Nov 2024 15:03:51 -0600 Subject: [PATCH] drop the 2 --- app/package.json | 4 ++-- app/src/components/cardsTable.tsx | 8 ++++---- app/src/components/filtersTable.tsx | 8 ++++---- app/src/components/pluginsTable.tsx | 8 ++++---- app/src/components/templatesTable.tsx | 8 ++++---- app/src/pages/sync.tsx | 8 ++++---- app/src/uiLogic/aggrid.ts | 5 +---- pnpm-lock.yaml | 12 ++++++------ 8 files changed, 29 insertions(+), 32 deletions(-) diff --git a/app/package.json b/app/package.json index b43757c1..31e2db88 100644 --- a/app/package.json +++ b/app/package.json @@ -105,8 +105,8 @@ "@vlcn.io/wa-sqlite": "^0.22.0", "@vlcn.io/xplat-api": "0.11.0", "@zip.js/zip.js": "^2.7.29", - "ag-grid-community2": "npm:ag-grid-community@^32.2.2", - "ag-grid-enterprise2": "npm:ag-grid-enterprise@^32.2.2", + "ag-grid-community": "^32.2.2", + "ag-grid-enterprise": "^32.2.2", "ajv": "^8.12.0", "api-ugc": "workspace:*", "babel-preset-solid": "^1.8.18", diff --git a/app/src/components/cardsTable.tsx b/app/src/components/cardsTable.tsx index 8eae2200..3f2c5730 100644 --- a/app/src/components/cardsTable.tsx +++ b/app/src/components/cardsTable.tsx @@ -20,10 +20,10 @@ import { type IGetRowsParams, type IToolPanelComp, type IToolPanelParams, -} from 'ag-grid-community2' -import 'ag-grid-community2/styles/ag-grid.css' -import 'ag-grid-community2/styles/ag-theme-alpine.css' -import { LicenseManager } from 'ag-grid-enterprise2' +} from 'ag-grid-community' +import 'ag-grid-community/styles/ag-grid.css' +import 'ag-grid-community/styles/ag-theme-alpine.css' +import { LicenseManager } from 'ag-grid-enterprise' import { Upload, Hamburger } from 'shared-dom/icons' import { getOk } from 'shared-dom/cardHtml' import { diff --git a/app/src/components/filtersTable.tsx b/app/src/components/filtersTable.tsx index 9637aa79..09818a51 100644 --- a/app/src/components/filtersTable.tsx +++ b/app/src/components/filtersTable.tsx @@ -5,10 +5,10 @@ import { onMount, type VoidComponent, } from 'solid-js' -import { type GridOptions, type GridApi } from 'ag-grid-community2' -import 'ag-grid-community2/styles/ag-grid.css' -import 'ag-grid-community2/styles/ag-theme-alpine.css' -import { LicenseManager } from 'ag-grid-enterprise2' +import { type GridOptions, type GridApi } from 'ag-grid-community' +import 'ag-grid-community/styles/ag-grid.css' +import 'ag-grid-community/styles/ag-theme-alpine.css' +import { LicenseManager } from 'ag-grid-enterprise' import '@github/relative-time-element' import { type TemplateId } from 'shared/brand' import { agGridTheme, useThemeContext } from 'shared-dom/themeSelector' diff --git a/app/src/components/pluginsTable.tsx b/app/src/components/pluginsTable.tsx index 52e5bb85..500b7537 100644 --- a/app/src/components/pluginsTable.tsx +++ b/app/src/components/pluginsTable.tsx @@ -10,10 +10,10 @@ import { type ICellRendererParams, type ICellRendererComp, type GridApi, -} from 'ag-grid-community2' -import 'ag-grid-community2/styles/ag-grid.css' -import 'ag-grid-community2/styles/ag-theme-alpine.css' -import { LicenseManager } from 'ag-grid-enterprise2' +} from 'ag-grid-community' +import 'ag-grid-community/styles/ag-grid.css' +import 'ag-grid-community/styles/ag-theme-alpine.css' +import { LicenseManager } from 'ag-grid-enterprise' import '@github/relative-time-element' import { type Plugin } from 'shared-dom/plugin' import { C } from '../topLevelAwait' diff --git a/app/src/components/templatesTable.tsx b/app/src/components/templatesTable.tsx index 2a134216..10da23c1 100644 --- a/app/src/components/templatesTable.tsx +++ b/app/src/components/templatesTable.tsx @@ -5,10 +5,10 @@ import { type ICellRendererComp, type GridApi, type IGetRowsParams, -} from 'ag-grid-community2' -import 'ag-grid-community2/styles/ag-grid.css' -import 'ag-grid-community2/styles/ag-theme-alpine.css' -import { LicenseManager } from 'ag-grid-enterprise2' +} from 'ag-grid-community' +import 'ag-grid-community/styles/ag-grid.css' +import 'ag-grid-community/styles/ag-theme-alpine.css' +import { LicenseManager } from 'ag-grid-enterprise' import { startCase } from 'lodash-es' import '@github/relative-time-element' import { Upload } from 'shared-dom/icons' diff --git a/app/src/pages/sync.tsx b/app/src/pages/sync.tsx index 1cf33230..37010871 100644 --- a/app/src/pages/sync.tsx +++ b/app/src/pages/sync.tsx @@ -17,10 +17,10 @@ import { type GridApi, type IHeaderComp, type IHeaderParams, -} from 'ag-grid-community2' -import 'ag-grid-community2/styles/ag-grid.css' -import 'ag-grid-community2/styles/ag-theme-alpine.css' -import { LicenseManager } from 'ag-grid-enterprise2' +} from 'ag-grid-community' +import 'ag-grid-community/styles/ag-grid.css' +import 'ag-grid-community/styles/ag-theme-alpine.css' +import { LicenseManager } from 'ag-grid-enterprise' import { DiffModeToggleGroup } from '../components/diffModeContext' import { uploadNotes, uploadTemplates } from '../domain/sync' import { type NookId } from 'shared/brand' diff --git a/app/src/uiLogic/aggrid.ts b/app/src/uiLogic/aggrid.ts index 2c21ecc8..91bc6959 100644 --- a/app/src/uiLogic/aggrid.ts +++ b/app/src/uiLogic/aggrid.ts @@ -1,7 +1,4 @@ -import { - createGrid as createAgGrid, - type GridOptions, -} from 'ag-grid-community2' +import { createGrid as createAgGrid, type GridOptions } from 'ag-grid-community' import { type Override } from 'shared/utility' import { getOwner, type JSX, type Owner, runWithOwner } from 'solid-js' import { render } from 'solid-js/web' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 66a67dc6..a65ccaf2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -211,12 +211,12 @@ importers: '@zip.js/zip.js': specifier: ^2.7.29 version: 2.7.29 - ag-grid-community2: - specifier: npm:ag-grid-community@^32.2.2 - version: ag-grid-community@32.2.2 - ag-grid-enterprise2: - specifier: npm:ag-grid-enterprise@^32.2.2 - version: ag-grid-enterprise@32.2.2 + ag-grid-community: + specifier: ^32.2.2 + version: 32.2.2 + ag-grid-enterprise: + specifier: ^32.2.2 + version: 32.2.2 ajv: specifier: ^8.12.0 version: 8.17.1