Skip to content

fix: Use pnpm-workspace.yaml instead of .npmrc for pre/post script #603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fujidana wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Use pnpm-workspace.yaml instead of .npmrc for pre/post script #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 generators/app/generate-command-js.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default {
if (extensionConfig.pkgManager === 'yarn') {
generator.fs.copyTpl(generator.templatePath('.yarnrc'), generator.destinationPath('.yarnrc'), extensionConfig);
} else if (extensionConfig.pkgManager === 'pnpm') {
generator.fs.copyTpl(generator.templatePath('.npmrc-pnpm'), generator.destinationPath('.npmrc'), extensionConfig);
generator.fs.copyTpl(generator.templatePath('pnpm-workspace.yaml'), generator.destinationPath('pnpm-workspace.yaml'), extensionConfig);
}

extensionConfig.installDependencies = true;
Expand Down
2 changes: 1 addition & 1 deletion generators/app/generate-command-ts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default {
if (extensionConfig.pkgManager === 'yarn') {
generator.fs.copyTpl(generator.templatePath('.yarnrc'), generator.destinationPath('.yarnrc'), extensionConfig);
} else if (extensionConfig.pkgManager === 'pnpm') {
generator.fs.copyTpl(generator.templatePath('.npmrc-pnpm'), generator.destinationPath('.npmrc'), extensionConfig);
generator.fs.copyTpl(generator.templatePath('pnpm-workspace.yaml'), generator.destinationPath('pnpm-workspace.yaml'), extensionConfig);
}

extensionConfig.installDependencies = true;
Expand Down
2 changes: 1 addition & 1 deletion generators/app/generate-command-web.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default {
if (extensionConfig.pkgManager === 'yarn') {
generator.fs.copyTpl(generator.templatePath('.yarnrc'), generator.destinationPath('.yarnrc'), extensionConfig);
} else if (extensionConfig.pkgManager === 'pnpm') {
generator.fs.copyTpl(generator.templatePath('.npmrc-pnpm'), generator.destinationPath('.npmrc'), extensionConfig);
generator.fs.copyTpl(generator.templatePath('pnpm-workspace.yaml'), generator.destinationPath('pnpm-workspace.yaml'), extensionConfig);
}

extensionConfig.installDependencies = true;
Expand Down
2 changes: 1 addition & 1 deletion generators/app/generate-localization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export default {
if (extensionConfig.pkgManager === 'yarn') {
generator.fs.copyTpl(generator.templatePath('.yarnrc'), generator.destinationPath('.yarnrc'), extensionConfig);
} else if (extensionConfig.pkgManager === 'pnpm') {
generator.fs.copyTpl(generator.templatePath('.npmrc-pnpm'), generator.destinationPath('.npmrc'), extensionConfig);
generator.fs.copyTpl(generator.templatePath('pnpm-workspace.yaml'), generator.destinationPath('pnpm-workspace.yaml'), extensionConfig);
}

extensionConfig.installDependencies = true;
Expand Down
2 changes: 1 addition & 1 deletion generators/app/generate-notebook-renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default {
if (extensionConfig.pkgManager === 'yarn') {
generator.fs.copyTpl(generator.templatePath('.yarnrc'), generator.destinationPath('.yarnrc'), extensionConfig);
} else if (extensionConfig.pkgManager === 'pnpm') {
generator.fs.copyTpl(generator.templatePath('.npmrc-pnpm'), generator.destinationPath('.npmrc'), extensionConfig);
generator.fs.copyTpl(generator.templatePath('pnpm-workspace.yaml'), generator.destinationPath('pnpm-workspace.yaml'), extensionConfig);
}

extensionConfig.installDependencies = true;
Expand Down
1 change: 0 additions & 1 deletion generators/app/templates/ext-command-js/.npmrc-pnpm
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions generators/app/templates/ext-command-js/pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
enablePrePostScripts: true
1 change: 0 additions & 1 deletion generators/app/templates/ext-command-ts/.npmrc-pnpm
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions generators/app/templates/ext-command-ts/pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
enablePrePostScripts: true
1 change: 0 additions & 1 deletion generators/app/templates/ext-command-web/.npmrc-pnpm
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions generators/app/templates/ext-command-web/pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
enablePrePostScripts: true
1 change: 0 additions & 1 deletion generators/app/templates/ext-localization/.npmrc-pnpm
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions generators/app/templates/ext-localization/pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
enablePrePostScripts: true
1 change: 0 additions & 1 deletion generators/app/templates/ext-notebook-renderer/.npmrc-pnpm
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions generators/app/templates/ext-notebook-renderer/pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
enablePrePostScripts: true
10 changes: 5 additions & 5 deletions test/test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ describe('test code generator', { timeout: 20000 }, () => {
}
};

assertFiles(runResult, 'testCom', ['src/extension.ts', 'src/test/extension.test.ts', 'tsconfig.json', 'eslint.config.mjs', '.vscode-test.mjs', '.vscode/extensions.json', '.npmrc']);
assertFiles(runResult, 'testCom', ['src/extension.ts', 'src/test/extension.test.ts', 'tsconfig.json', 'eslint.config.mjs', '.vscode-test.mjs', '.vscode/extensions.json', 'pnpm-workspace.yaml']);

runResult.assertJsonFileContent('testCom/package.json', expectedPackageJSON);

Expand Down Expand Up @@ -932,7 +932,7 @@ describe('test code generator', { timeout: 20000 }, () => {
}
};

assertFiles(runResult, 'testCom', ['src/extension.ts', 'src/test/extension.test.ts', 'tsconfig.json', '.npmrc', 'webpack.config.js']);
assertFiles(runResult, 'testCom', ['src/extension.ts', 'src/test/extension.test.ts', 'tsconfig.json', 'pnpm-workspace.yaml', 'webpack.config.js']);

runResult.assertJsonFileContent('testCom/package.json', expectedPackageJSON);
} finally {
Expand Down Expand Up @@ -1117,7 +1117,7 @@ describe('test code generator', { timeout: 20000 }, () => {
}
};

assertFiles(runResult, 'testCom', ['extension.js', 'test/extension.test.js', 'jsconfig.json', '.npmrc']);
assertFiles(runResult, 'testCom', ['extension.js', 'test/extension.test.js', 'jsconfig.json', 'pnpm-workspace.yaml']);

runResult.assertJsonFileContent('testCom/package.json', expectedPackageJSON);
} finally {
Expand Down Expand Up @@ -1460,7 +1460,7 @@ describe('test code generator', { timeout: 20000 }, () => {
}
};

assertFiles(runResult, 'testCom', ['src/web/extension.ts', 'webpack.config.js', 'src/web/test/suite/extension.test.ts', 'src/web/test/suite/index.ts', 'tsconfig.json', '.npmrc']);
assertFiles(runResult, 'testCom', ['src/web/extension.ts', 'webpack.config.js', 'src/web/test/suite/extension.test.ts', 'src/web/test/suite/index.ts', 'tsconfig.json', 'pnpm-workspace.yaml']);

runResult.assertJsonFileContent('testCom/package.json', expectedPackageJSON);
} finally {
Expand Down Expand Up @@ -1696,7 +1696,7 @@ describe('test code generator', { timeout: 20000 }, () => {
])
};

assertFiles(runResult, 'json-renderer-ext', ['webpack.config.js', '.gitignore', 'eslint.config.mjs', '.vscode-test.mjs', '.npmrc']);
assertFiles(runResult, 'json-renderer-ext', ['webpack.config.js', '.gitignore', 'eslint.config.mjs', '.vscode-test.mjs', 'pnpm-workspace.yaml']);

runResult.assertJsonFileContent('json-renderer-ext/package.json', expectedPackageJSON);
} finally {
Expand Down