Skip to content
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.

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

refactor: move toolkit to monorepo structure #4342

Merged
merged 35 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ee06aba
initial restructure
hayemaxi Jan 25, 2024
00f58a3
some initial changes to scripts, package jsons
hayemaxi Jan 25, 2024
681feb5
build script updates
hayemaxi Jan 26, 2024
65f7b0e
fix references and remove createRelease from root package.json
hayemaxi Jan 26, 2024
b706495
fix up . config files and move .vscodeignore to toolkit package
hayemaxi Jan 26, 2024
865831a
update scripts
hayemaxi Jan 26, 2024
4c8ddf2
move types, fix tsconfig, scripts
hayemaxi Jan 27, 2024
e483b28
fix linting, add header to gitignore-parser.d.ts
hayemaxi Jan 29, 2024
d90ee4a
move templates/, syntaxes/ resources/ to packages/toolkit/. command …
hayemaxi Jan 29, 2024
7bccd17
enable browser webpack again, copy doc files over for extension packing.
hayemaxi Jan 29, 2024
f4b4f10
move src/browser workspace from toolkit package.json to root package.…
hayemaxi Jan 29, 2024
bd6e4ed
update some CI commands to use -w packages/toolkit
hayemaxi Jan 29, 2024
aa81e7b
update .gitignore + temp update to remove generated resources
hayemaxi Jan 30, 2024
f8bdf6e
remove generated resources
hayemaxi Jan 30, 2024
b1c2346
update .gitignore and .prettierignore, temp move endpoints.json to or…
hayemaxi Jan 30, 2024
d0e2c38
update .prettierignore for endpoints.json, move endpoints.json under …
hayemaxi Jan 30, 2024
e3613e6
restore newline in endspoints.json
hayemaxi Jan 30, 2024
88d86c7
fix vscode debugging configurations, misc package.json updates.
hayemaxi Jan 31, 2024
2a24633
update format, lint scripts, and .ignore files
hayemaxi Jan 31, 2024
752d504
move .c8rc.json to packages/toolkit
hayemaxi Jan 31, 2024
797b44c
add testCompile root shortcut
hayemaxi Jan 31, 2024
575a3f6
update .test-coverage output path
hayemaxi Jan 31, 2024
81740b2
add generateNonCodeFiles script root shortcut
hayemaxi Jan 31, 2024
c69c256
temp: delete package.json
hayemaxi Feb 5, 2024
9164073
Merge branch 'master' of https://github.com/aws/aws-toolkit-vscode in…
hayemaxi Feb 5, 2024
ed75c6f
restore root package.json and package-lock.json after mainline merge
hayemaxi Feb 5, 2024
897087c
move createRelease script to root, update packaging ignore.
hayemaxi Feb 5, 2024
e3b0d57
script moves packaged .vsix to root
hayemaxi Feb 5, 2024
64c98e5
restore codecov.yml to original
hayemaxi Feb 5, 2024
817fe4a
update .eslintignore
hayemaxi Feb 5, 2024
00b742c
fix testRunner to output report to top-level .test-reports/
hayemaxi Feb 5, 2024
dd0024a
restore SNAPSHOT to toolkit package.json
hayemaxi Feb 5, 2024
db9f77c
Merge branch 'master' of https://github.com/aws/aws-toolkit-vscode in…
hayemaxi Feb 5, 2024
21c66e2
Add/update documentation.
hayemaxi Feb 5, 2024
8fee66b
remove merge conflict resolution anomaly: download.ts
hayemaxi Feb 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 6 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
node_modules/**
dist/**
node_modules/
dist/
src.gen/**
**/*.json
**/*.gen.ts
types/*.d.ts

# This file is accessed in the subpackage level, so relative paths are used here:
src/shared/telemetry/clienttelemetry.d.ts
src/codewhisperer/client/codewhispererclient.d.ts
src/codewhisperer/client/codewhispereruserclient.d.ts
src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
**/*.gen.ts
src/testFixtures/**
types/*.d.ts
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
project: './tsconfig.json',
project: ['./packages/*/tsconfig.json', './plugins/*/tsconfig.json'],
tsconfigRootDir: __dirname,
},
env: {
Expand Down
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
* @aws/aws-ides-team
src/codewhisperer/ @aws/codewhisperer-team
src/amazonqFeatureDev/ @aws/earlybird
src/codewhispererChat/ @aws/aws-mynah
src/amazonq/ @aws/aws-mynah
packages/toolkit/src/codewhisperer/ @aws/codewhisperer-team
packages/toolkit/src/amazonqFeatureDev/ @aws/earlybird
packages/toolkit/src/codewhispererChat/ @aws/aws-mynah
packages/toolkit/src/amazonq/ @aws/aws-mynah
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
version: 2
updates:
- package-ecosystem: 'npm'
directory: '/' # Location of package manifests.
directory: './packages/toolkit/' # Location of package manifests.
target-branch: 'master' # Avoid updates to "staging".
commit-message:
prefix: 'deps'
Expand All @@ -25,7 +25,7 @@ updates:
- '@smithy*'
- 'smithy*'
- package-ecosystem: 'github-actions'
directory: '/'
directory: './packages/toolkit/'
target-branch: 'master' # Avoid updates to "staging".
commit-message:
prefix: 'deps'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: vsix
run: |
npm run createRelease # Generate CHANGELOG.md
npm run generateNonCodeFiles
npm run generateNonCodeFiles -w packages/toolkit
cp ./README.quickstart.vscode.md ./README.md
npm run package -- --feature "$FEAT_NAME"
- uses: actions/upload-artifact@v4
Expand Down
36 changes: 21 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
out
dist
node_modules
.vscode-test/
coverage/
.vscode-test
coverage
*.vsix
*.bk
**/.DS_Store
Expand All @@ -12,34 +12,40 @@ quickStart*.html
README.quickstart.cloud9.md
README.quickstart.vscode.md
.gitcommit
resources/debugger/__pycache__
__pycache__

# Generated if running the `depcruise` command from the documentation example
/dependency-graph.svg

# Auto generated definitions
src/**/*.gen.ts
packages/toolkit/src/**/*.gen.ts
src.gen/*
# Telemetry definition for testing adding telemetry
src/shared/telemetry/vscodeTelemetry.json
packages/toolkit/src/shared/telemetry/vscodeTelemetry.json

# Test reports
.test-reports/
.test-reports

# Auto generated type definitions
src/shared/telemetry/clienttelemetry.d.ts
src/codewhisperer/client/codewhispererclient.d.ts
src/codewhisperer/client/codewhispereruserclient.d.ts
src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
packages/toolkit/src/shared/telemetry/clienttelemetry.d.ts
packages/toolkit/src/codewhisperer/client/codewhispererclient.d.ts
packages/toolkit/src/codewhisperer/client/codewhispereruserclient.d.ts
packages/toolkit/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts

# Generated by tests
src/testFixtures/**/bin
src/testFixtures/**/obj
packages/toolkit/src/testFixtures/**/bin
packages/toolkit/src/testFixtures/**/obj

# Generated by copyFiles.ts
packages/toolkit/README*
packages/toolkit/CHANGELOG.md
packages/toolkit/LICENSE
packages/toolkit/NOTICE

# Icons
resources/icons/cloud9/generated/**
resources/fonts/aws-toolkit-icons.woff
resources/css/icons.css
packages/toolkit/resources/icons/cloud9/generated/**
packages/toolkit/resources/fonts/aws-toolkit-icons.woff
packages/toolkit/resources/css/icons.css

# local configuration
.local.env
Expand Down
15 changes: 9 additions & 6 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
out
resources/endpoints.json
CHANGELOG.md
src/shared/telemetry/service-2.json
.changes
src/testFixtures/**
*.d.ts
*.gen.ts
dist/**
types/*.d.ts
dist
src.gen/**
plugins/*/dist/**

# Duplicate entries because prettier can be ran from root or within the workspace/subpackage.
# TODO: Avoid this.
src/shared/telemetry/service-2.json
src/testFixtures/**

packages/toolkit/src/shared/telemetry/service-2.json
packages/toolkit/src/testFixtures/**
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
},
"typescript.preferences.importModuleSpecifier": "relative",
"javascript.preferences.importModuleSpecifier": "relative",
"typescript.tsdk": "node_modules/typescript/lib"
"typescript.tsdk": "node_modules/typescript/lib",
"npm.packageManager": "npm"
}
20 changes: 0 additions & 20 deletions .vscodeignore

This file was deleted.

2 changes: 1 addition & 1 deletion buildspec/packageTestVsix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ phases:
- export HOME=/home/codebuild-user
# Generate CHANGELOG.md
- npm run createRelease
- npm run generateNonCodeFiles
- npm run generateNonCodeFiles -w packages/toolkit
- cp ./README.quickstart.vscode.md ./README.md
- npm run package

Expand Down
8 changes: 4 additions & 4 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ coverage:
codewhisperer:
target: 70%
paths:
- src/codewhisperer/*
- packages/toolkitsrc/codewhisperer/*
flags:
- 'codewhisperer'
amazonqFeatureDev:
target: 70%
paths:
- src/amazonqFeatureDev/*
- packages/toolkit/src/amazonqFeatureDev/*
flags:
- 'amazonqFeatureDev'
patch: no
Expand All @@ -38,7 +38,7 @@ github_checks:
flags:
codewhisperer:
paths:
- src/codewhisperer/
- packages/toolkit/src/codewhisperer/
amazonqFeatureDev:
paths:
- src/amazonqFeatureDev/
- packages/toolkit/src/amazonqFeatureDev/
Loading
Loading