Skip to content

Commit

Permalink
Merge pull request #105 from ObsidianLabs/develop
Browse files Browse the repository at this point in the history
fix: sync the eth and electron components code.
  • Loading branch information
flowfire authored Apr 12, 2022
2 parents 4f63873 + f30291d commit 74d85e8
Show file tree
Hide file tree
Showing 3 changed files with 455 additions and 619 deletions.
3 changes: 2 additions & 1 deletion config-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const {
addWebpackPlugin,
} = require('customize-cra')
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
const isAppleSilicon = Boolean(os.cpus().find(cpu => cpu.model.startsWith('Apple M')))
const isAppleSilicon = Boolean(os.cpus().find(cpu => cpu.model.startsWith('Apple M')))

function findWebpackPlugin (plugins, pluginName) {
return plugins.find(plugin => plugin.constructor.name === pluginName)
Expand Down Expand Up @@ -67,6 +67,7 @@ const overrides = [
'@obsidians/project': `@obsidians/${process.env.BUILD}-project`,
'@obsidians/contract': `@obsidians/${process.env.BUILD}-contract`,
'@obsidians/explorer': `@obsidians/${process.env.BUILD}-explorer`,
'@obsidians/sdk': `@obsidians/${process.env.BUILD}-sdk`,
'@obsidians/network': `@obsidians/${process.env.BUILD}-network`,
'@obsidians/node': `@obsidians/${process.env.BUILD}-node`,
'@obsidians/premium-editor': path.resolve(__dirname, process.env.PREMIUM_EDITOR || 'empty.js'),
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"monaco-editor-webpack-plugin": "^1.9.0",
"native-ext-loader": "^2.3.0",
"node-fetch": "^2.6.1",
"node-sass": "^6.0.0",
"node-sass": "npm:sass",
"react": "^17.0.1",
"react-app-rewired": "^2.1.8",
"react-dom": "^17.0.1",
Expand All @@ -100,7 +100,7 @@
"resolutions": {
"@solidity-parser/parser": "^0.12.1",
"node-abi": "3.5.0",
"sass-loader": "10.2.0",
"node-sass": "npm:sass",
"react-highlight": "^0.13.0"
},
"workspaces": [
Expand Down
Loading

0 comments on commit 74d85e8

Please sign in to comment.