Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/check-catalogue-metadata-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
persist-credentials: false
- name: Install pnpm
run: npm install -g pnpm --force
run: npm install -g pnpm@12.18.0 --force
- name: Setup pnpm global bin
run: pnpm setup
- name: Install and build 🔧
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:

strategy:
matrix:
node-versions: [20.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v4

- name: Install pnpm
run: npm install -g pnpm
run: npm install -g pnpm@12.18.0

- name: Setup pnpm global bin
run: pnpm setup
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cypress-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
node-version: '20'

- name: Install pnpm
run: npm install -g pnpm
run: npm install -g pnpm@12.18.0

- name: Install Cypress binary
run: npx cypress install
Expand All @@ -31,4 +31,4 @@ jobs:
run: rm -f /tmp/.X99-lock

- name: Run Cypress tests
run: npx nx run-many -t component-test --parallel=false --verbose
run: npx nx run-many -t component-test --parallel=false --verbose --browser=chrome
2 changes: 1 addition & 1 deletion .github/workflows/github-pages-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fetch-depth: 0

- name: Install pnpm
run: npm install -g pnpm nx
run: npm install -g pnpm@12.18.0 nx

- uses: actions/setup-node@v4
with:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/node-version-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
branches:
- main
pull_request:
branches:
- main

env:
NX_DAEMON: false
Expand All @@ -26,7 +24,7 @@ jobs:
node-version: ${{ matrix.node-version }}

- name: Install pnpm
run: npm install -g pnpm@10.33.3
run: npm install -g pnpm@12.18.0

- name: Install dependencies
run: pnpm install
Expand All @@ -36,3 +34,6 @@ jobs:

- name: Build all projects
run: npx nx run-many -t build --all --exclude=storybook-composition,docs --verbose

- name: Test packed package in a new consumer project
run: node scripts/package-smoke-test.cjs
3 changes: 1 addition & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0
# Install pnpm
- name: Install pnpm
run: npm install -g pnpm
run: npm install -g pnpm@12.18.0
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v4
with:
Expand All @@ -27,4 +27,3 @@ jobs:
- run: pnpm ci
- run: npx nx run-many -t build --all --exclude storybook-composition docs
- run: pnpm stage publish -r --no-git-checks

1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ only-built-dependencies[]=@swc/core
only-built-dependencies[]=core-js
only-built-dependencies[]=esbuild
only-built-dependencies[]=nx
only-built-dependencies[]=@parcel/watcher
only-built-dependencies[]=unrs-resolver
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Add files here to ignore them from prettier formatting
dist
**/build/
**/.docusaurus/
coverage
.nx/cache
.nx/workspace-data
Expand Down
12 changes: 6 additions & 6 deletions apps/developer-manual/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@docusaurus/core": "^3.10.1",
"@docusaurus/preset-classic": "^3.10.1",
"@docusaurus/core": "^3.10.2",
"@docusaurus/preset-classic": "^3.10.2",
"@mdx-js/react": "^3.1.1",
"@mui/icons-material": "^9.0.1",
"@mui/material": "^9.0.1",
"@mui/icons-material": "^9.5.0",
"@mui/material": "^9.5.0",
"clsx": "^2.1.1",
"react": "^19.2.6",
"react-dom": "^19.2.6"
"react": "^19.3.1",
"react-dom": "^19.3.1"
},
"browserslist": {
"production": [
Expand Down
12 changes: 5 additions & 7 deletions apps/developer-manual/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/// <reference types='vitest' />
import { defineConfig } from 'vite';
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
import { copyRootMarkdown } from '../../scripts/vite-plugins/copy-root-markdown';

export default defineConfig(async () => {
const react = (await import('@vitejs/plugin-react')).default;
return {
root: __dirname,
cacheDir: '../../node_modules/.vite/apps/developer-manual',
resolve: {
tsconfigPaths: true,
},
server: {
port: 4200,
host: 'localhost',
Expand All @@ -16,11 +18,7 @@ export default defineConfig(async () => {
port: 4200,
host: 'localhost',
},
plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
// Uncomment this if you are using workers.
// worker: {
// plugins: [ nxViteTsPaths() ],
// },
plugins: [react(), copyRootMarkdown(__dirname)],
build: {
outDir: '../../dist/apps/developer-manual',
emptyOutDir: true,
Expand Down
12 changes: 5 additions & 7 deletions apps/storybook-composition/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
/// <reference types='vitest' />
import { defineConfig } from 'vite';
import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
import { copyRootMarkdown } from '../../scripts/vite-plugins/copy-root-markdown';

export default defineConfig(async () => {
const react = (await import('@vitejs/plugin-react')).default;
return {
root: __dirname,
cacheDir: '../../node_modules/.vite/apps/storybook-composition',
resolve: {
tsconfigPaths: true,
},
server: {
port: 4200,
host: 'localhost',
Expand All @@ -16,11 +18,7 @@ export default defineConfig(async () => {
port: 4200,
host: 'localhost',
},
plugins: [react(), nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
// Uncomment this if you are using workers.
// worker: {
// plugins: [ nxViteTsPaths() ],
// },
plugins: [react(), copyRootMarkdown(__dirname)],
build: {
outDir: '../../dist/apps/storybook-composition',
emptyOutDir: true,
Expand Down
22 changes: 11 additions & 11 deletions apps/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
"dependencies": {
"@mapcomponents/react-maplibre": "^1.8.20"
},
"peerDependencies": {
"peerDependencies": {
"react": "^19.2.6",
"react-dom": "^19.2.6"
},
},
"devDependencies": {
"@eslint/js": "^10.0.1",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^6.0.2",
"eslint": "^10.3.0",
"@eslint/js": "^9.39.5",
"@types/react": "^19.3.0",
"@types/react-dom": "^19.3.0",
"@vitejs/plugin-react": "^6.3.0",
"eslint": "^9.39.5",
"eslint-plugin-react-hooks": "^7.1.1",
"eslint-plugin-react-refresh": "^0.5.2",
"globals": "^17.6.0",
"eslint-plugin-react-refresh": "^0.5.7",
"globals": "^17.14.0",
"typescript": "^6.0.3",
"typescript-eslint": "^8.59.2",
"vite": "^8.0.11"
"typescript-eslint": "^8.72.2",
"vite": "^8.3.8"
}
}
2 changes: 1 addition & 1 deletion apps/template/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import react from '@vitejs/plugin-react';

export default defineConfig(async () => {
return {
root: __dirname,
root: import.meta.dirname,
cacheDir: '../../node_modules/.vite/apps/template',
plugins: [react()],
// Uncomment this if you are using workers.
Expand Down
7 changes: 6 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ export default [
{
ignores: [
'**/.cache',
'**/.docusaurus',
'**/.github',
'**/.storybook',
'**/.vscode',
'**/config',
'**/coverage',
'**/dist',
'**/build',
'**/docs',
'**/docs-build',
'**/js-docs',
Expand Down Expand Up @@ -79,7 +81,10 @@ export default [
'error',
{
enforceBuildableLibDependency: true,
allow: ['^.*/eslint(\\.base)?\\.config\\.[cm]?[jt]s$'],
allow: [
'^.*/eslint(\\.base)?\\.config\\.[cm]?[jt]s$',
'^\\.\\./\\.\\./scripts/vite-plugins/copy-root-markdown$',
],
depConstraints: [
{
sourceTag: '*',
Expand Down
105 changes: 53 additions & 52 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,76 +5,77 @@
"private": true,
"scripts": {
"prettier:check": "prettier --check .",
"ci:local": "npm exec --yes --registry=https://registry.npmjs.org --package=pnpm@12.18.0 -- node scripts/ci-local.cjs",
"migrate-changelog": "ts-node ./scripts/migrate_changelog.ts"
},
"dependencies": {
"@babel/plugin-transform-typescript": "^7.29.7",
"@cypress/react": "^9.0.2",
"@eslint/eslintrc": "^3.3.5",
"@typescript-eslint/eslint-plugin": "^8.60.0",
"@typescript-eslint/parser": "^8.60.0",
"@babel/plugin-transform-typescript": "^7.29.9",
"@cypress/react": "^10.0.1",
"@eslint/eslintrc": "^3.3.7",
"@typescript-eslint/eslint-plugin": "^8.72.2",
"@typescript-eslint/parser": "^8.72.2",
"babel-plugin-inline-react-svg": "^2.0.2",
"babel-plugin-styled-components": "^2.3.0",
"globals": "^17.6.0",
"react": "^19.2.6",
"react-dom": "^19.2.6"
"babel-plugin-styled-components": "^2.4.0",
"globals": "^17.14.0",
"react": "^19.3.1",
"react-dom": "^19.3.1"
},
"devDependencies": {
"@babel/core": "^7.29.7",
"@babel/core": "^7.29.13",
"@babel/plugin-transform-private-property-in-object": "^7.29.7",
"@babel/preset-react": "^7.29.7",
"@cypress/webpack-dev-server": "5.6.1",
"@eslint/js": "^10.0.1",
"@nx/cypress": "^22.7.5",
"@nx/eslint": "^22.7.5",
"@nx/eslint-plugin": "22.7.5",
"@nx/js": "^22.7.5",
"@nx/react": "^22.7.5",
"@nx/storybook": "^22.7.5",
"@nx/vite": "^22.7.5",
"@nx/web": "^22.7.5",
"@nx/workspace": "^22.7.5",
"@storybook/addon-docs": "^10.4.1",
"@storybook/addon-links": "^10.4.1",
"@storybook/react": "^10.4.1",
"@storybook/react-vite": "10.3.6",
"@swc-node/register": "~1.11.1",
"@swc/cli": "~0.8.1",
"@swc/core": "~1.15.40",
"@swc/helpers": "~0.5.23",
"@testing-library/dom": "^10.4.1",
"@testing-library/react": "^16.3.2",
"@types/node": "^25.9.1",
"@types/react": "^19.2.15",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^6.0.2",
"@vitest/ui": "^4.1.8",
"@cypress/webpack-dev-server": "6.1.2",
"@eslint/js": "^9.39.5",
"@nx/cypress": "^24.0.6",
"@nx/eslint": "^24.0.6",
"@nx/eslint-plugin": "24.0.6",
"@nx/js": "^24.0.6",
"@nx/react": "^24.0.6",
"@nx/storybook": "^24.0.6",
"@nx/vite": "^24.0.6",
"@nx/web": "^24.0.6",
"@nx/workspace": "^24.0.6",
"@storybook/addon-docs": "^10.6.7",
"@storybook/addon-links": "^10.6.7",
"@storybook/react": "^10.6.7",
"@storybook/react-vite": "10.6.7",
"@swc-node/register": "~1.12.1",
"@swc/cli": "~0.8.2",
"@swc/core": "~1.16.22",
"@swc/helpers": "~0.5.24",
"@testing-library/dom": "^10.4.2",
"@testing-library/react": "^16.3.3",
"@types/node": "^26.6.6",
"@types/react": "^19.3.0",
"@types/react-dom": "^19.3.0",
"@vitejs/plugin-react": "^6.3.0",
"@vitest/ui": "^5.1.0",
"ajv": "^8.20.0",
"cypress": "^15.16.0",
"eslint": "^10.4.1",
"cypress": "^16.3.0",
"eslint": "^9.39.5",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-cypress": "^6.4.1",
"eslint-plugin-cypress": "^6.4.4",
"eslint-plugin-import": "2.32.0",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "7.1.1",
"eslint-plugin-storybook": "^10.4.1",
"glob": "^13.0.6",
"html-webpack-plugin": "^5.6.7",
"eslint-plugin-storybook": "^10.6.7",
"glob": "^14.0.4",
"html-webpack-plugin": "^5.6.8",
"jiti": "2.7.0",
"jsdom": "~29.1.1",
"jsdom": "~31.0.0",
"node-fetch": "^3.3.2",
"nx": "^22.7.5",
"prettier": "^3.8.3",
"storybook": "10.3.6",
"syncpack": "^15.3.1",
"nx": "^24.0.6",
"prettier": "^3.9.10",
"storybook": "10.6.7",
"syncpack": "^15.3.3",
"ts-node": "10.9.2",
"tslib": "^2.8.1",
"tslib": "^2.9.1",
"typescript": "~6.0.3",
"typescript-eslint": "^8.60.0",
"vite": "^8.0.11",
"vite-plugin-dts": "~5.0.1",
"vitest": "^4.1.5"
"typescript-eslint": "^8.72.2",
"vite": "^8.3.8",
"vite-plugin-dts": "~5.1.2",
"vitest": "^5.1.0"
},
"workspaces": [
"apps/**",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-mapcomponents-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"type": "module",
"license": "MIT",
"dependencies": {
"degit": "^2.8.4"
"degit": "^3.10.1"
}
}
Loading
Loading