Skip to content

Commit 483b28e

Browse files
authored
Merge pull request #3902 from iclanton/fix-create-scripts
[rush] Fix missing create-scripts.js file.
2 parents 0e81e9f + a2fbefe commit 483b28e

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/rush",
5+
"comment": "Fix an issue where `create-scripts.js` does not exist during `rush deploy`.",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/rush"
10+
}

libraries/rush-lib/src/logic/deploy/DeployManager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { RushConfigurationProject } from '../../api/RushConfigurationProject';
3131
import { DeployScenarioConfiguration, IDeployScenarioProjectJson } from './DeployScenarioConfiguration';
3232
import { PnpmfileConfiguration } from '../pnpm/PnpmfileConfiguration';
3333
import { matchesWithStar } from './Utils';
34-
import { scriptsFolderName } from '../../utilities/PathConstants';
34+
import { createLinksScriptFilename, scriptsFolderPath } from '../../utilities/PathConstants';
3535

3636
// (@types/npm-packlist is missing this API)
3737
declare module 'npm-packlist' {
@@ -665,7 +665,7 @@ export class DeployManager {
665665
if (deployState.scenarioConfiguration.json.linkCreation === 'script') {
666666
console.log('Copying create-links.js');
667667
FileSystem.copyFile({
668-
sourcePath: `${scriptsFolderName}/create-links.js`,
668+
sourcePath: `${scriptsFolderPath}/${createLinksScriptFilename}`,
669669
destinationPath: path.join(deployState.targetRootFolder, 'create-links.js'),
670670
alreadyExistsBehavior: AlreadyExistsBehavior.Error
671671
});

libraries/rush-lib/src/utilities/PathConstants.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ export const assetsFolderPath: string = `${rushLibFolderRootPath}/assets`;
1616
/**
1717
* The folder name ("scripts") where the scripts in rush-lib are built.
1818
*/
19-
export const scriptsFolderName: string = 'scripts';
19+
const scriptsFolderName: string = 'scripts';
2020

2121
export const pnpmfileShimFilename: string = 'PnpmfileShim.js';
2222
export const installRunScriptFilename: string = 'install-run.js';
2323
export const installRunRushScriptFilename: string = 'install-run-rush.js';
2424
export const installRunRushxScriptFilename: string = 'install-run-rushx.js';
2525
export const installRunRushPnpmScriptFilename: string = 'install-run-rush-pnpm.js';
26+
export const createLinksScriptFilename: string = 'create-links.js';
2627

2728
/**
2829
* The path to the scripts folder in rush-lib/dist.

libraries/rush-lib/webpack.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ module.exports = () => {
121121
[PathConstants.installRunRushPnpmScriptFilename]: {
122122
import: `${__dirname}/lib-esnext/scripts/install-run-rush-pnpm.js`,
123123
...SCRIPT_ENTRY_OPTIONS
124+
},
125+
[PathConstants.createLinksScriptFilename]: {
126+
import: `${__dirname}/lib-esnext/scripts/create-links.js`,
127+
...SCRIPT_ENTRY_OPTIONS
124128
}
125129
})
126130
];

0 commit comments

Comments
 (0)