Skip to content

Commit d4ae4e0

Browse files
committed
Merge remote-tracking branch 'public/ch-test-dom-chromium' into erikeldridge-vertex-api
2 parents 78fed95 + d8f8fb3 commit d4ae4e0

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

package.json

+10-5
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,16 @@
5656
"type": "git",
5757
"url": "git+https://github.com/firebase/firebase-js-sdk.git"
5858
},
59-
"workspaces": [
60-
"packages/*",
61-
"integration/*",
62-
"repo-scripts/*"
63-
],
59+
"workspaces": {
60+
"packages": [
61+
"packages/*",
62+
"integration/*",
63+
"repo-scripts/*"
64+
],
65+
"nohoist": [
66+
"**/vertexai/@types/dom-chromium-ai"
67+
]
68+
},
6469
"devDependencies": {
6570
"@babel/core": "7.26.8",
6671
"@babel/plugin-transform-modules-commonjs": "7.26.3",

packages/vertexai/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"@firebase/component": "0.6.13",
5353
"@firebase/logger": "0.4.4",
5454
"@firebase/util": "1.11.0",
55+
"@types/dom-chromium-ai": "0.0.6",
5556
"tslib": "^2.1.0"
5657
},
5758
"license": "Apache-2.0",
@@ -79,4 +80,4 @@
7980
],
8081
"reportDir": "./coverage/node"
8182
}
82-
}
83+
}

scripts/release/utils/workspace.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ const writeFile = promisify(_writeFile);
2727

2828
const {
2929
workspaces: rawWorkspaces
30-
}: { workspaces: string[] } = require(`${root}/package.json`);
31-
const workspaces = rawWorkspaces.map(workspace => `${root}/${workspace}`);
30+
}: { workspaces: { packages: string[] } } = require(`${root}/package.json`);
31+
const workspaces = rawWorkspaces.packages.map(
32+
workspace => `${root}/${workspace}`
33+
);
3234

3335
export function mapWorkspaceToPackages(
3436
workspaces: string[]

0 commit comments

Comments
 (0)