Skip to content

Commit

Permalink
Release/5.2.5 (#910)
Browse files Browse the repository at this point in the history
* adds lavamoat allow scripts, adds setup command to use instead of install

* adds allow scripts and configures allow list for all workspaces

* adds edge build job

* comments out edge build step

---------

Co-authored-by: Aristides Staffieri <aristides.staffieri@stellar.org>
  • Loading branch information
piyalbasu and aristidesstaffieri authored Jul 27, 2023
1 parent ece87d6 commit c0a36a6
Show file tree
Hide file tree
Showing 12 changed files with 655 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/runTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: 16.14.0
- run: yarn install
- run: yarn setup
- run: yarn build:freighter-api
- run: yarn test:ci
2 changes: 1 addition & 1 deletion .github/workflows/submitBeta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: "16.14"
- run: yarn install && yarn build:freighter-api && yarn build:extension:production
- run: yarn setup && yarn build:freighter-api && yarn build:extension:production
- name: Use BETA icons
run: |
rm -rf ./extension/build/images
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/submitProduction.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: "16.14"
- run: yarn install && yarn build:freighter-api && yarn build:extension:production --define 'process.env.AMPLITUDE_KEY="${{ secrets.AMPLITUDE_KEY }}"' --define 'process.env.SENTRY_KEY="${{ secrets.SENTRY_KEY }}"'
- run: yarn setup && yarn build:freighter-api && yarn build:extension:production --define 'process.env.AMPLITUDE_KEY="${{ secrets.AMPLITUDE_KEY }}"' --define 'process.env.SENTRY_KEY="${{ secrets.SENTRY_KEY }}"'
- name: Install zip
uses: montudor/action-zip@c25e01d7489d0274569440a2f0281b4569df16bc #v0.1.1
- name: Zip extension build
Expand Down Expand Up @@ -109,6 +109,14 @@ jobs:
client-id: ${{ secrets.EXTENSION_CLIENT_ID }}
client-secret: ${{ secrets.EXTENSION_CLIENT_SECRET }}
refresh-token: ${{ secrets.EXTENSION_REFRESH_TOKEN }}
# - name: Submit extension to Edge
# uses: wdzeng/edge-addon@v1
# with:
# product-id: ${{ secrets.EDGE_PRODUCT_ID }}
# zip-path: ${{ secrets.EDGE_ZIP_PATH }}
# client-id: ${{ secrets.EDGE_CLIENT_ID }}
# client-secret: ${{ secrets.EDGE_CLIENT_SECRET }}
# access-token-url: ${{ secrets.EDGE_ACCESS_TOKEN_URL }}
- name: Slack Notification
uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7 #v2.2.0
env:
Expand Down
1 change: 1 addition & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ignore-scripts true
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
enableScripts: false
9 changes: 8 additions & 1 deletion @shared/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,19 @@
"@stellar/wallet-sdk": "^0.8.0",
"bignumber.js": "^9.1.1",
"prettier": "^2.0.5",
"stellar-sdk": "^10.4.1",
"soroban-client": "^0.9.1",
"stellar-sdk": "^10.4.1",
"typescript": "~3.7.2",
"webextension-polyfill": "^0.10.0"
},
"devDependencies": {
"@lavamoat/allow-scripts": "^2.3.1",
"@stellar/prettier-config": "^1.0.1"
},
"lavamoat": {
"allowScripts": {
"soroban-client>stellar-base>sodium-native": false,
"stellar-sdk>stellar-base>sodium-native": false
}
}
}
10 changes: 8 additions & 2 deletions @shared/constants/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,16 @@
"prettier": "@stellar/prettier-config",
"version": "1.0.0",
"dependencies": {
"typescript": "~3.7.2",
"stellar-sdk": "^10.4.1"
"stellar-sdk": "^10.4.1",
"typescript": "~3.7.2"
},
"devDependencies": {
"@lavamoat/allow-scripts": "^2.3.1",
"@stellar/prettier-config": "^1.0.1"
},
"lavamoat": {
"allowScripts": {
"stellar-sdk>stellar-base>sodium-native": false
}
}
}
5 changes: 4 additions & 1 deletion @stellar/freighter-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@
"start": "webpack --config webpack.dev.js --watch --mode development"
},
"types": "build/@stellar/freighter-api/src/index.d.ts",
"dependencies": {}
"dependencies": {},
"devDependencies": {
"@lavamoat/allow-scripts": "^2.3.1"
}
}
10 changes: 10 additions & 0 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,15 @@
"react-dom": "^17.0.2",
"react-is": "^16.13.1",
"styled-components": "^5.0.1"
},
"devDependencies": {
"@lavamoat/allow-scripts": "^2.3.1"
},
"lavamoat": {
"allowScripts": {
"@docusaurus/core>@babel/runtime-corejs3>core-js-pure": false,
"@docusaurus/core>core-js": false,
"@docusaurus/core>file-loader>webpack>watchpack>watchpack-chokidar2>chokidar>fsevents": false
}
}
}
15 changes: 15 additions & 0 deletions extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"license": "Apache-2.0",
"prettier": "@stellar/prettier-config",
"scripts": {
"setup": "yarn install && yarn allow-scripts",
"build": "webpack --config webpack.extension.js",
"build:experimental": "yarn build --env.EXPERIMENTAL=true",
"build:production": "yarn build --env.PRODUCTION",
Expand Down Expand Up @@ -71,6 +72,7 @@
"redux": "^4.0.5",
"sass": "^1.22.10",
"sass-loader": "8.0.0",
"ses": "^0.18.5",
"simplebar-react": "^2.3.6",
"soroban-client": "^0.9.1",
"stellar-hd-wallet": "^0.0.10",
Expand All @@ -81,5 +83,18 @@
"tslib": "2.0.0",
"webextension-polyfill": "^0.10.0",
"yup": "^0.29.1"
},
"devDependencies": {
"@lavamoat/allow-scripts": "^2.3.1"
},
"lavamoat": {
"allowScripts": {
"@testing-library/react>@testing-library/dom>aria-query>@babel/runtime-corejs3>core-js-pure": false,
"css-loader>webpack>watchpack>watchpack-chokidar2>chokidar>fsevents": false,
"simplebar-react>simplebar>core-js": false,
"soroban-client>stellar-base>sodium-native": false,
"stellar-hd-wallet>stellar-base>sodium-native": false,
"stellar-sdk>stellar-base>sodium-native": false
}
}
}
16 changes: 15 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"**/terser-webpack-plugin": "^1.4.3"
},
"scripts": {
"setup": "yarn install && yarn allow-scripts",
"build": "run-p --print-label build:freighter-api build:docs build:extension",
"build:netlify": "cd docs && npm i && npm run build",
"build:extension-preview": "run-s build:freighter-api build:extension:experimental",
Expand All @@ -32,7 +33,7 @@
"start:extension": "yarn workspace extension start",
"start:extension:experimental": "yarn workspace extension start:experimental",
"start:unpacked": "yarn workspace extension start:unpacked-extension",
"install-if-package-changed": "git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD | grep --quiet yarn.lock && yarn install || exit 0",
"install-if-package-changed": "git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD | grep --quiet yarn.lock && yarn setup || exit 0",
"test:ci": "jest --ci",
"test": "jest -o --watch",
"prepare": "husky install"
Expand Down Expand Up @@ -113,5 +114,18 @@
"webpack-cli": "3.3.10",
"webpack-dev-server": "3.10.3",
"webpack-merge": "4.2.2"
},
"devDependencies": {
"@lavamoat/allow-scripts": "^2.3.1",
"@lavamoat/preinstall-always-fail": "^1.0.0"
},
"lavamoat": {
"allowScripts": {
"@lavamoat/preinstall-always-fail": false,
"@testing-library/dom>aria-query>@babel/runtime-corejs3>core-js-pure": false,
"babel-polyfill>core-js": false,
"webpack-dev-server>chokidar>fsevents": true,
"webpack>watchpack>watchpack-chokidar2>chokidar>fsevents": true
}
}
}
Loading

0 comments on commit c0a36a6

Please sign in to comment.