Skip to content

Commit

Permalink
Merge pull request #22 from 51ngul4r1ty/tech/000307/same-typescript-t…
Browse files Browse the repository at this point in the history
…hroughout-monorepo

Consistent Typescript Version + `.gitignore` Updates
  • Loading branch information
51ngul4r1ty authored Feb 10, 2024
2 parents 46fc601 + d49bfb4 commit f587911
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 85 deletions.
30 changes: 27 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,17 @@ on: [push]
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- name: Node & NPM versions
run: |
echo Node Version
Expand All @@ -17,8 +25,24 @@ jobs:
npm --version
echo
- name: Install NPM packages
run: npm ci
- name: Build All Packages
run: npm ci -ws
- name: Build Rich Types Package
run: |
echo Building...
npm run build-all
npm run build-pkg:rich-types
- name: Build Client SDK
run: |
echo Building...
npm run build-pkg:client-sdk
- name: Build Shared Package
run: |
echo Building...
npm run build-pkg:shared
- name: Build VS Code Extension
run: |
echo Building...
npm run build-pkg:extension
- name: Build Web App
run: |
echo Building...
npm run build-pkg:web-app
86 changes: 11 additions & 75 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
"dist-pkg:extension": "npm run build-all-pkgs:shared && npm run build-pkg:extension && npm run build-vsix -w packages/vscode-extension",
"check-prereqs-pkg:web-app": "npm run check:prereqs -w packages/web-app",
"docker-pkg:web-app": "npm run build-pkg:web-app && npm run -w packages/web-app build:docker",
"clean-node-modules": "npx rimraf node_modules",
"clean-all": "npm run clean-all:node-modules && npm run clean-all:dist",
"clean-all:dist": "npm run clean:dist -ws --if-present",
"clean-all:node-modules": "npm run clean:node-modules -ws --if-present",
"clean:node-modules": "rimraf node_modules",
"package-pkg:extension": "npm run package -w packages/vscode-extension",
"publish-pkg:shared": "npm publish -w packages/shared",
"publish-alpha:shared": "npm run publish-alpha -w packages/shared",
Expand Down Expand Up @@ -54,6 +57,6 @@
"devDependencies": {
"prettier": "2.7.1",
"rimraf": "3.0.2",
"typescript": "4.2.4"
"typescript": "4.6.4"
}
}
1 change: 1 addition & 0 deletions packages/api-types/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dist/
3 changes: 1 addition & 2 deletions packages/client-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
"rollup-plugin-json": "4.0.0",
"rollup-plugin-node-resolve": "5.2.0",
"rollup-plugin-typescript2": "0.31.2",
"ts-node": "10.7.0",
"typescript": "4.6.4"
"ts-node": "10.7.0"
},
"dependencies": {
"@atoll/api-types": "1.0.0",
Expand Down
1 change: 1 addition & 0 deletions packages/rest-fetch/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dist/
3 changes: 1 addition & 2 deletions packages/rich-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"rollup": "2.71.1",
"rollup-plugin-json": "4.0.0",
"rollup-plugin-node-resolve": "5.2.0",
"rollup-plugin-typescript2": "0.31.2",
"typescript": "4.6.4"
"rollup-plugin-typescript2": "0.31.2"
}
}
1 change: 0 additions & 1 deletion packages/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
"mocha": "9.2.2",
"ts-loader": "9.2.8",
"ts-node": "10.7.0",
"typescript": "4.5.5",
"webpack": "5.75.0",
"webpack-cli": "4.9.2"
},
Expand Down

0 comments on commit f587911

Please sign in to comment.