Skip to content

Commit cbac86f

Browse files
authored
Merge pull request #4398 from hayemaxi/restructure3
fix: monorepo script changes
2 parents 06d3fff + b4ab623 commit cbac86f

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ jobs:
4949
echo "FEAT_NAME=" >> $GITHUB_ENV
5050
echo "TAG_NAME=prerelease" >> $GITHUB_ENV
5151
- run: npm ci
52-
- name: vsix
52+
- name: vsix # TODO: For packages/toolkit release only
5353
run: |
5454
npm run createRelease # Generate CHANGELOG.md
55-
npm run generateNonCodeFiles -w packages/toolkit
5655
cp ./README.quickstart.vscode.md ./README.md
56+
cd packages/toolkit
5757
npm run package -- --feature "$FEAT_NAME"
5858
- uses: actions/upload-artifact@v4
5959
with:

buildspec/packageTestVsix.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ phases:
2727
- export HOME=/home/codebuild-user
2828
# Generate CHANGELOG.md
2929
- npm run createRelease
30-
- npm run generateNonCodeFiles -w packages/toolkit
3130
- cp ./README.quickstart.vscode.md ./README.md
3231
- npm run package
3332

docs/ARCHITECTURE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Current quirks of the current monorepo status that should be resolved/evaluated
3131
- `packages/toolkit/scripts/` should be generalized and moved to the root of the project as needed.
3232
- LICENSE, README.md, and other non-code artifacts that must be packaged into the .vsix are currently
3333
being copied into the packaging subproject directory from the root project directory as part of the `copyFiles` task.
34+
- Pre-release only publishes packages/toolkit extension directly. It should be extended to other added extensions. See [`release.yml`](../.github/workflows/release.yml)
3435
- [**Running the test suites in VSCode has changed**](../CONTRIBUTING.md#test)
3536

3637
## Commands

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"scripts": {
2323
"prepare": "ts-node ./scripts/prepare.ts",
24-
"postinstall": "npm run buildCustomLintPlugin",
24+
"postinstall": "npm run buildCustomLintPlugin && npm run postinstall -ws --if-present",
2525
"buildCustomLintPlugin": "npm run build -w plugins/eslint-plugin-aws-toolkits",
2626
"compile": "npm run compile -w packages/",
2727
"testCompile": "npm run testCompile -w packages/",

packages/toolkit/scripts/build/package.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function main() {
148148
console.log(`VSIX Version: ${packageJson.version}`)
149149

150150
const vsixName = `aws-toolkit-vscode-${packageJson.version}.vsix`
151-
fs.moveSync(vsixName, `../../${vsixName}`)
151+
fs.moveSync(vsixName, `../../${vsixName}`, { overwrite: true })
152152
} catch (e) {
153153
console.log(e)
154154
throw Error('package.ts: failed')

0 commit comments

Comments
 (0)