Skip to content

Commit 54a38c6

Browse files
author
Don McCurdy
authored
chore(ci): Fix build and release scripts (#77)
1 parent 7947f3f commit 54a38c6

File tree

18 files changed

+1229
-1116
lines changed

18 files changed

+1229
-1116
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@
22

33
## 0.1
44

5+
### 0.1.5
6+
7+
- feat: Update to deck.gl v9.1.8 (#77)
8+
- feat: Update to `@carto/api-client` v0.4.9 (#77)
9+
- chore(react): Begin adopting defaults for React Router v7 (#77)
10+
511
### 0.1.4
612

7-
- feat: Update to deck.gl version 9.1.0 (#66)
13+
- feat: Update to deck.gl v9.1.0 (#66)
814

915
### 0.1.3
1016

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3-
"version": "0.1.4",
3+
"version": "0.1.5-alpha.0",
44
"packages": [
55
"packages/*"
66
],

‎package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@
2121
"prepack": "yarn clean && yarn build"
2222
},
2323
"devDependencies": {
24-
"@eslint/compat": "^1.2.6",
25-
"@eslint/eslintrc": "^3.2.0",
26-
"@eslint/js": "^9.20.0",
24+
"@eslint/compat": "^1.2.7",
25+
"@eslint/eslintrc": "^3.3.1",
26+
"@eslint/js": "^9.23.0",
2727
"@types/eslint-config-prettier": "^6.11.3",
2828
"@types/eslint__eslintrc": "^2.1.2",
2929
"@types/meow": "^6.0.0",
30-
"eslint": "^9.19.0",
31-
"eslint-config-prettier": "^10.0.1",
32-
"eslint-plugin-react-hooks": "^5.1.0",
33-
"eslint-plugin-react-refresh": "^0.4.18",
34-
"eslint-plugin-vue": "^9.32.0",
35-
"globals": "^15.14.0",
36-
"lerna": "^8.1.9",
30+
"eslint": "^9.23.0",
31+
"eslint-config-prettier": "^10.1.1",
32+
"eslint-plugin-react-hooks": "^5.2.0",
33+
"eslint-plugin-react-refresh": "^0.4.19",
34+
"eslint-plugin-vue": "^9.33.0",
35+
"globals": "^15.15.0",
36+
"lerna": "^8.2.1",
3737
"meow": "^13.2.0",
38-
"prettier": "^3.4.2",
38+
"prettier": "^3.5.3",
3939
"rimraf": "^6.0.1",
4040
"typescript": "<5.6.0",
41-
"typescript-eslint": "^8.24.0",
42-
"vite": "^6.1.0"
41+
"typescript-eslint": "^8.28.0",
42+
"vite": "^6.2.4"
4343
}
4444
}

‎packages/create-angular/package.json‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"repository": "github:CartoDB/carto-app-templates",
55
"author": "Don McCurdy <donmccurdy@carto.com>",
66
"license": "MIT",
7-
"version": "0.1.4",
7+
"version": "0.1.5-alpha.0",
88
"type": "module",
99
"bin": "./scripts/create.js",
1010
"scripts": {
@@ -24,28 +24,29 @@
2424
"@angular/platform-browser-dynamic": "^18.2.13",
2525
"@angular/router": "^18.2.13",
2626
"@auth0/auth0-angular": "^2.2.3",
27-
"@carto/api-client": "^0.4.6",
28-
"@carto/create-common": "^0.1.4",
29-
"@deck.gl/aggregation-layers": "~9.1.0",
30-
"@deck.gl/carto": "~9.1.0",
31-
"@deck.gl/core": "~9.1.0",
32-
"@deck.gl/extensions": "~9.1.0",
33-
"@deck.gl/geo-layers": "~9.1.0",
34-
"@deck.gl/json": "~9.1.0",
35-
"@deck.gl/layers": "~9.1.0",
36-
"@deck.gl/mesh-layers": "~9.1.0",
27+
"@carto/api-client": "^0.4.9",
28+
"@carto/create-common": "^0.1.5-alpha.0",
29+
"@deck.gl/aggregation-layers": "~9.1.8",
30+
"@deck.gl/carto": "~9.1.8",
31+
"@deck.gl/core": "~9.1.8",
32+
"@deck.gl/extensions": "~9.1.8",
33+
"@deck.gl/geo-layers": "~9.1.8",
34+
"@deck.gl/json": "~9.1.8",
35+
"@deck.gl/layers": "~9.1.8",
36+
"@deck.gl/mesh-layers": "~9.1.8",
3737
"@loaders.gl/core": "^4.3.3",
38-
"@luma.gl/core": "~9.1.1",
39-
"@luma.gl/engine": "~9.1.1",
40-
"@luma.gl/shadertools": "~9.1.1",
38+
"@luma.gl/core": "~9.1.6",
39+
"@luma.gl/engine": "~9.1.6",
40+
"@luma.gl/shadertools": "~9.1.6",
4141
"maplibre-gl": "^4.7.1",
42-
"rxjs": "~7.8.1",
42+
"meow": "^13.2.0",
43+
"rxjs": "~7.8.2",
4344
"tslib": "^2.8.1",
4445
"zone.js": "~0.14.10"
4546
},
4647
"devDependencies": {
47-
"@angular-devkit/build-angular": "^18.2.14",
48-
"@angular/cli": "^18.2.14",
48+
"@angular-devkit/build-angular": "^18.2.16",
49+
"@angular/cli": "^18.2.16",
4950
"@angular/compiler-cli": "^18.2.13",
5051
"typescript": "<5.6.0"
5152
},

‎packages/create-angular/src/app/components/widgets/CategoryWidget.component.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
Filter,
1919
FilterType,
2020
WidgetSource,
21+
WidgetSourceProps,
2122
addFilter,
2223
getFilter,
2324
hasFilter,
@@ -79,7 +80,10 @@ import {
7980
})
8081
export class CategoryWidgetComponent {
8182
/** Widget-compatible data source, from vectorTableSource, vectorQuerySource, etc. */
82-
data = input.required<Promise<{ widgetSource: WidgetSource }>>();
83+
data =
84+
input.required<
85+
Promise<{ widgetSource: WidgetSource<WidgetSourceProps> }>
86+
>();
8387
/** Column containing category names. */
8488
column = input.required<string>();
8589
/** Operation used to aggregate features in each category. */

‎packages/create-angular/src/app/components/widgets/FormulaWidget.component.ts‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ import {
55
numberFormatter,
66
WidgetStatus,
77
} from '../../../utils';
8-
import { AggregationType, WidgetSource } from '@carto/api-client';
8+
import {
9+
AggregationType,
10+
WidgetSource,
11+
WidgetSourceProps,
12+
} from '@carto/api-client';
913

1014
/**
1115
* Formula widget, displaying a prominent 'scorecard' number.
@@ -29,7 +33,10 @@ import { AggregationType, WidgetSource } from '@carto/api-client';
2933
})
3034
export class FormulaWidgetComponent {
3135
/** Widget-compatible data source, from vectorTableSource, vectorQuerySource, etc. */
32-
data = input.required<Promise<{ widgetSource: WidgetSource }>>();
36+
data =
37+
input.required<
38+
Promise<{ widgetSource: WidgetSource<WidgetSourceProps> }>
39+
>();
3340
/** Column containing a value to be aggregated. */
3441
column = input<string>();
3542
/** Operation used to aggregate the specified column. */
@@ -64,7 +71,7 @@ export class FormulaWidgetComponent {
6471
)
6572
.then((response) => {
6673
this.status.set('complete');
67-
this.value.set(response.value);
74+
this.value.set(response.value as number);
6875
})
6976
.catch(() => {
7077
if (!abortController.signal.aborted) {

‎packages/create-common/package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@carto/create-common",
33
"packageManager": "yarn@4.2.2",
44
"author": "Don McCurdy <donmccurdy@carto.com>",
5-
"version": "0.1.4",
5+
"version": "0.1.5-alpha.0",
66
"license": "MIT",
77
"type": "module",
88
"sideEffects": false,
@@ -33,9 +33,7 @@
3333
"scripts": {
3434
"build": "microbundle --format cjs,modern --no-compress --target node --define VERSION=$npm_package_version",
3535
"dev": "microbundle watch --format cjs,modern --no-compress --target node --define VERSION=$npm_package_version",
36-
"dev:ssl": "yarn dev",
37-
"prepack": "yarn build",
38-
"prepublish": "yarn lint"
36+
"dev:ssl": "yarn dev"
3937
},
4038
"dependencies": {
4139
"glob": "^11.0.1",

‎packages/create-common/src/constants.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const TEMPLATE_EXCLUDE_PATHS = [
1111
];
1212

1313
/** List of dependencies in the template to be _removed_ from new projects. */
14-
export const TEMPLATE_EXCLUDE_DEPS = ['@carto/create-common'];
14+
export const TEMPLATE_EXCLUDE_DEPS = ['@carto/create-common', 'meow'];
1515

1616
/**
1717
* List of package.json fields to clear from new projects.

‎packages/create-react/package.json‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"repository": "github:CartoDB/carto-app-templates",
55
"author": "Don McCurdy <donmccurdy@carto.com>",
66
"license": "MIT",
7-
"version": "0.1.4",
7+
"version": "0.1.5-alpha.0",
88
"type": "module",
99
"bin": "./scripts/create.js",
1010
"scripts": {
@@ -15,35 +15,36 @@
1515
},
1616
"dependencies": {
1717
"@auth0/auth0-react": "^2.3.0",
18-
"@carto/api-client": "^0.4.6",
19-
"@carto/create-common": "^0.1.4",
20-
"@deck.gl/aggregation-layers": "~9.1.0",
21-
"@deck.gl/carto": "~9.1.0",
22-
"@deck.gl/core": "~9.1.0",
23-
"@deck.gl/extensions": "~9.1.0",
24-
"@deck.gl/geo-layers": "~9.1.0",
25-
"@deck.gl/json": "~9.1.0",
26-
"@deck.gl/layers": "~9.1.0",
27-
"@deck.gl/mesh-layers": "~9.1.0",
28-
"@deck.gl/react": "~9.1.0",
29-
"@deck.gl/widgets": "~9.1.0",
18+
"@carto/api-client": "^0.4.9",
19+
"@carto/create-common": "^0.1.5-alpha.0",
20+
"@deck.gl/aggregation-layers": "~9.1.8",
21+
"@deck.gl/carto": "~9.1.8",
22+
"@deck.gl/core": "~9.1.8",
23+
"@deck.gl/extensions": "~9.1.8",
24+
"@deck.gl/geo-layers": "~9.1.8",
25+
"@deck.gl/json": "~9.1.8",
26+
"@deck.gl/layers": "~9.1.8",
27+
"@deck.gl/mesh-layers": "~9.1.8",
28+
"@deck.gl/react": "~9.1.8",
29+
"@deck.gl/widgets": "~9.1.8",
3030
"@loaders.gl/core": "^4.3.3",
31-
"@luma.gl/core": "~9.1.1",
32-
"@luma.gl/engine": "~9.1.1",
33-
"@luma.gl/shadertools": "~9.1.1",
31+
"@luma.gl/core": "~9.1.6",
32+
"@luma.gl/engine": "~9.1.6",
33+
"@luma.gl/shadertools": "~9.1.6",
3434
"maplibre-gl": "^4.7.1",
35+
"meow": "^13.2.0",
3536
"react": "^18.3.1",
3637
"react-dom": "^18.3.1",
3738
"react-map-gl": "^7.1.9",
38-
"react-router-dom": "^6.29.0"
39+
"react-router-dom": "^6.30.0"
3940
},
4041
"devDependencies": {
41-
"@types/react": "^18.3.18",
42+
"@types/react": "^18.3.20",
4243
"@types/react-dom": "^18.3.5",
4344
"@vitejs/plugin-basic-ssl": "^1.2.0",
4445
"@vitejs/plugin-react": "^4.3.4",
4546
"typescript": "<5.6.0",
46-
"vite": "^6.1.0"
47+
"vite": "^6.2.4"
4748
},
4849
"packageManager": "yarn@4.2.2",
4950
"gitHead": "eee3523a24885fe41609c9739378a10dc90dab77",

‎packages/create-react/src/App.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function App() {
2828
scope: DEFAULT_APP_CONTEXT.oauth.scopes.join(' '),
2929
}}
3030
>
31-
<RouterProvider router={router} />
31+
<RouterProvider router={router} future={{ v7_startTransition: true }} />
3232
</Auth0Provider>
3333
</AppContext.Provider>
3434
);

0 commit comments

Comments
 (0)