Skip to content

Commit b87ae89

Browse files
authored
Include some folders that were missing from cache. (#5153)
* Include some folders that were missing from cache. * fixup! Include some folders that were missing from cache. * Move ambientTypes.d.ts
1 parent 1477de0 commit b87ae89

File tree

9 files changed

+75
-7
lines changed

9 files changed

+75
-7
lines changed

build-tests/heft-minimal-rig-usage-test/config/rush-project.json renamed to build-tests/heft-minimal-rig-test/profiles/default/config/rush-project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"operationSettings": [
55
{
66
"operationName": "_phase:build",
7-
"outputFolderNames": ["lib", "dist"]
7+
"outputFolderNames": ["lib", "lib-commonjs", "dist"]
88
},
99
{
1010
"operationName": "_phase:test",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/rush",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/rush"
10+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@rushstack/hashed-folder-copy-plugin",
5+
"comment": "Move the `ambientTypes.d.ts` file to `dist` and use the `exports` and `typesVersions` fields in `package.json` to maintain `@rushstack/hashed-folder-copy-plugin/ambientTypes` references.",
6+
"type": "minor"
7+
}
8+
],
9+
"packageName": "@rushstack/hashed-folder-copy-plugin"
10+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-project.schema.json",
3+
"extends": "local-node-rig/profiles/default/config/rush-project.json",
4+
"operationSettings": [
5+
{
6+
"operationName": "_phase:build",
7+
"outputFolderNames": ["lib-shim"]
8+
}
9+
]
10+
}

rigs/local-node-rig/profiles/default/config/rush-project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"operationSettings": [
55
{
66
"operationName": "_phase:build",
7-
"outputFolderNames": [".heft"]
7+
"outputFolderNames": [".heft", "lib-esnext"]
88
},
99
{
1010
"operationName": "_phase:test",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-project.schema.json",
3+
"extends": "local-node-rig/profiles/default/config/rush-project.json",
4+
"operationSettings": [
5+
{
6+
"operationName": "_phase:build",
7+
"outputFolderNames": ["webview"]
8+
}
9+
]
10+
}

webpack/hashed-folder-copy-plugin/.gitignore

-1
This file was deleted.

webpack/hashed-folder-copy-plugin/config/heft.json

+10-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,15 @@
66
// TODO: Add comments
77
"phasesByName": {
88
"build": {
9-
"cleanFiles": [{ "includeGlobs": ["ambientTypes.d.ts"] }],
9+
"cleanFiles": [
10+
{
11+
"includeGlobs": [
12+
// TODO: Remove eventually. This file used to be created, but isn't anymore.
13+
// However, it may still exist on some local clones.
14+
"ambientTypes.d.ts"
15+
]
16+
}
17+
],
1018

1119
"tasksByName": {
1220
"copy-ambient-types": {
@@ -18,7 +26,7 @@
1826
{
1927
"sourcePath": "./src",
2028
"includeGlobs": ["ambientTypes.d.ts"],
21-
"destinationFolders": ["."]
29+
"destinationFolders": ["dist"]
2230
}
2331
]
2432
}

webpack/hashed-folder-copy-plugin/package.json

+23-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,29 @@
22
"name": "@rushstack/hashed-folder-copy-plugin",
33
"version": "1.0.80",
44
"description": "Webpack plugin for copying a folder to the output directory with a hash in the folder name.",
5-
"typings": "dist/hashed-folder-copy-plugin.d.ts",
6-
"main": "lib/index.js",
5+
"exports": {
6+
".": {
7+
"types": "./dist/hashed-folder-copy-plugin.d.ts",
8+
"default": "./lib/index.js"
9+
},
10+
"./ambientTypes": {
11+
"types": "./dist/ambientTypes.d.ts"
12+
},
13+
"./lib/*": {
14+
"types": "./lib/*.d.ts",
15+
"default": "./lib/*.js"
16+
}
17+
},
18+
"typesVersions": {
19+
"*": {
20+
".": [
21+
"./dist/hashed-folder-copy-plugin.d.ts"
22+
],
23+
"ambientTypes": [
24+
"./dist/ambientTypes.d.ts"
25+
]
26+
}
27+
},
728
"license": "MIT",
829
"repository": {
930
"type": "git",

0 commit comments

Comments
 (0)