Merge branch 'desktopoffline' of https://github.com/ethereum/remix-project into desktopoffline

desktopoffline
bunsenstraat 12 months ago
commit 2b9c699366
  1. 6
      .circleci/config.yml
  2. 7
      apps/remixdesktop/package.json
  3. 2
      apps/remixdesktop/src/plugins/scriptRunner.ts
  4. 2
      package.json
  5. 5
      yarn.lock

@ -125,7 +125,7 @@ jobs:
yarn add node-pty
yarn --ignore-optional
yarn add @remix-project/remix-ws-templates
yarn dist --linux
yarn dist
rm -rf release/*-unpacked
- save_cache:
key: remixdesktop-linux-deps-{{ checksum "apps/remixdesktop/yarn.lock" }}
@ -169,7 +169,7 @@ jobs:
cp -r dist/apps/remix-ide apps/remixdesktop/build/remix-ide
cd apps/remixdesktop/
yarn
yarn dist --win
yarn dist
rm -rf release/*-unpacked
- save_cache:
key: remixdesktop-windows-deps-{{ checksum "apps/remixdesktop/yarn.lock" }}
@ -214,7 +214,7 @@ jobs:
mkdir apps/remixdesktop/build
cp -r dist/apps/remix-ide apps/remixdesktop/build/remix-ide
cd apps/remixdesktop
USE_HARD_LINKS=false yarn dist --mac
USE_HARD_LINKS=false yarn dist
rm -rf release/mac*
- store_artifacts:
path: apps/remixdesktop/release/

@ -22,9 +22,9 @@
"category": "public.app-category.productivity"
},
"scripts": {
"start:dev": "tsc && cross-env NODE_ENV=development electron --inspect=5858 .",
"start:production": "tsc && cross-env NODE_ENV=production electron .",
"dist": "tsc && electron-builder",
"start:dev": "tsc && cp -R node_modules/yarn build/tools/ && cross-env NODE_ENV=development electron --inspect=5858 .",
"start:production": "tsc && && cp -R node_modules/yarn build/tools/ && cross-env NODE_ENV=production electron .",
"dist": "tsc && cp -R node_modules/yarn build/tools/ && electron-builder -p never",
"postinstall": "electron-builder install-app-deps"
},
"devDependencies": {
@ -64,6 +64,7 @@
"files": [
"build/**/*"
],
"publish": [],
"mac": {
"category": "public.app-category.productivity",
"target": [

@ -46,7 +46,7 @@ class ScriptRunnerClient extends ElectronBasePluginClient {
async execute(content: string, dir: string): Promise<void> {
this.call('terminal' as any, 'log', this.workingDir)
const child = utilityProcess.fork(path.join(__dirname,'/../tools/yarn/bin/', 'yarn.js'), [`--cwd=${this.workingDir}`, 'add', 'web3'], {
const child = utilityProcess.fork(path.join(__dirname,'/../tools/yarn/bin/', 'yarn.js'), [`--cwd=${this.workingDir}`], {
stdio: 'pipe',
})
child && child.stdout && child.stdout.on('data', (data) => {

@ -207,8 +207,8 @@
"react-tabs": "^3.2.2",
"react-zoom-pan-pinch": "^3.0.2",
"regenerator-runtime": "0.13.7",
"rlp": "^3.0.0",
"remark-gfm": "^3.0.1",
"rlp": "^3.0.0",
"rss-parser": "^3.12.0",
"signale": "^1.4.0",
"snarkjs": "^0.7.0",

@ -29421,6 +29421,11 @@ yarn-or-npm@^3.0.1:
cross-spawn "^6.0.5"
pkg-dir "^4.2.0"
yarn@^1.22.21:
version "1.22.21"
resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.21.tgz#1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
integrity sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg==
yauzl@^2.10.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"

Loading…
Cancel
Save