diff --git a/generators/app/generate-command-js.js b/generators/app/generate-command-js.js index 289e2e62..92a8a3b5 100644 --- a/generators/app/generate-command-js.js +++ b/generators/app/generate-command-js.js @@ -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; diff --git a/generators/app/generate-command-ts.js b/generators/app/generate-command-ts.js index e5dbb59b..6e1369fb 100644 --- a/generators/app/generate-command-ts.js +++ b/generators/app/generate-command-ts.js @@ -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; diff --git a/generators/app/generate-command-web.js b/generators/app/generate-command-web.js index 055df50e..f9d04e64 100644 --- a/generators/app/generate-command-web.js +++ b/generators/app/generate-command-web.js @@ -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; diff --git a/generators/app/generate-localization.js b/generators/app/generate-localization.js index e9e88192..91d1aa34 100644 --- a/generators/app/generate-localization.js +++ b/generators/app/generate-localization.js @@ -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; diff --git a/generators/app/generate-notebook-renderer.js b/generators/app/generate-notebook-renderer.js index aa4ffedd..a638deb0 100644 --- a/generators/app/generate-notebook-renderer.js +++ b/generators/app/generate-notebook-renderer.js @@ -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; diff --git a/generators/app/templates/ext-command-js/.npmrc-pnpm b/generators/app/templates/ext-command-js/.npmrc-pnpm deleted file mode 100644 index 37d1b604..00000000 --- a/generators/app/templates/ext-command-js/.npmrc-pnpm +++ /dev/null @@ -1 +0,0 @@ -enable-pre-post-scripts = true \ No newline at end of file diff --git a/generators/app/templates/ext-command-js/pnpm-workspace.yaml b/generators/app/templates/ext-command-js/pnpm-workspace.yaml new file mode 100644 index 00000000..18f41b6c --- /dev/null +++ b/generators/app/templates/ext-command-js/pnpm-workspace.yaml @@ -0,0 +1 @@ +enablePrePostScripts: true diff --git a/generators/app/templates/ext-command-ts/.npmrc-pnpm b/generators/app/templates/ext-command-ts/.npmrc-pnpm deleted file mode 100644 index 37d1b604..00000000 --- a/generators/app/templates/ext-command-ts/.npmrc-pnpm +++ /dev/null @@ -1 +0,0 @@ -enable-pre-post-scripts = true \ No newline at end of file diff --git a/generators/app/templates/ext-command-ts/pnpm-workspace.yaml b/generators/app/templates/ext-command-ts/pnpm-workspace.yaml new file mode 100644 index 00000000..18f41b6c --- /dev/null +++ b/generators/app/templates/ext-command-ts/pnpm-workspace.yaml @@ -0,0 +1 @@ +enablePrePostScripts: true diff --git a/generators/app/templates/ext-command-web/.npmrc-pnpm b/generators/app/templates/ext-command-web/.npmrc-pnpm deleted file mode 100644 index 37d1b604..00000000 --- a/generators/app/templates/ext-command-web/.npmrc-pnpm +++ /dev/null @@ -1 +0,0 @@ -enable-pre-post-scripts = true \ No newline at end of file diff --git a/generators/app/templates/ext-command-web/pnpm-workspace.yaml b/generators/app/templates/ext-command-web/pnpm-workspace.yaml new file mode 100644 index 00000000..18f41b6c --- /dev/null +++ b/generators/app/templates/ext-command-web/pnpm-workspace.yaml @@ -0,0 +1 @@ +enablePrePostScripts: true diff --git a/generators/app/templates/ext-localization/.npmrc-pnpm b/generators/app/templates/ext-localization/.npmrc-pnpm deleted file mode 100644 index 37d1b604..00000000 --- a/generators/app/templates/ext-localization/.npmrc-pnpm +++ /dev/null @@ -1 +0,0 @@ -enable-pre-post-scripts = true \ No newline at end of file diff --git a/generators/app/templates/ext-localization/pnpm-workspace.yaml b/generators/app/templates/ext-localization/pnpm-workspace.yaml new file mode 100644 index 00000000..18f41b6c --- /dev/null +++ b/generators/app/templates/ext-localization/pnpm-workspace.yaml @@ -0,0 +1 @@ +enablePrePostScripts: true diff --git a/generators/app/templates/ext-notebook-renderer/.npmrc-pnpm b/generators/app/templates/ext-notebook-renderer/.npmrc-pnpm deleted file mode 100644 index 37d1b604..00000000 --- a/generators/app/templates/ext-notebook-renderer/.npmrc-pnpm +++ /dev/null @@ -1 +0,0 @@ -enable-pre-post-scripts = true \ No newline at end of file diff --git a/generators/app/templates/ext-notebook-renderer/pnpm-workspace.yaml b/generators/app/templates/ext-notebook-renderer/pnpm-workspace.yaml new file mode 100644 index 00000000..18f41b6c --- /dev/null +++ b/generators/app/templates/ext-notebook-renderer/pnpm-workspace.yaml @@ -0,0 +1 @@ +enablePrePostScripts: true diff --git a/test/test.mjs b/test/test.mjs index cf9a32cb..93e1808c 100644 --- a/test/test.mjs +++ b/test/test.mjs @@ -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); @@ -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 { @@ -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 { @@ -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 { @@ -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 {