diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js index a77a7cb0c1..4e0c117078 100644 --- a/apps/remix-ide/webpack.config.js +++ b/apps/remix-ide/webpack.config.js @@ -60,13 +60,13 @@ module.exports = composePlugins(withNx(), withReact(), (config) => { // add copy & provide plugin config.plugins.push( - /* + new CopyPlugin({ patterns: [ - { from: '../../node_modules/monaco-editor/dev/vs', to: 'assets/js/monaco-editor/dev/vs' } + { from: '../../node_modules/monaco-editor/min/vs', to: 'assets/js/monaco-editor/min/vs' } ].filter(Boolean) }), - */ + new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'], url: ['url', 'URL'], diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx index 4d0d6df24c..3df0397c03 100644 --- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx +++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx @@ -87,7 +87,8 @@ type errorMarker = { file: string } -//loader.config({ paths: { vs: 'assets/js/monaco-editor/dev/vs' } }) + +loader.config({ paths: { vs: 'assets/js/monaco-editor/min/vs' } }) export type DecorationsReturn = { currentDecorations: Array diff --git a/package.json b/package.json index a75e8e7ce8..b6505fde6b 100644 --- a/package.json +++ b/package.json @@ -174,7 +174,6 @@ "jszip": "^3.6.0", "latest-version": "^5.1.0", "merge": "^2.1.1", - "npm-install-version": "^6.0.2", "path-browserify": "^1.0.1", "prettier": "^2.7.1", @@ -235,8 +234,8 @@ "@nrwl/web": "15.7.1", "@nrwl/webpack": "15.7.1", "@nrwl/workspace": "^15.7.1", - "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10", "@openzeppelin/contracts-upgradeable": "^4.8.1", + "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10", "@svgr/webpack": "^6.5.1", "@testing-library/react": "13.4.0", "@types/axios": "^0.14.0", @@ -324,6 +323,7 @@ "minixhr": "^4.0.0", "mkdirp": "^0.5.1", "mocha": "^8.0.1", + "monaco-editor": "^0.30.1", "nanohtml": "^1.6.3", "nightwatch": "^2.3", "nodemon": "^2.0.4", diff --git a/yarn.lock b/yarn.lock index f7c4974536..5cd1986312 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19603,6 +19603,11 @@ mold-source-map@~0.4.0: convert-source-map "^1.1.0" through "~2.2.7" +monaco-editor@^0.30.1: + version "0.30.1" + resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.30.1.tgz#47f8d18a0aa2264fc5654581741ab8d7bec01689" + integrity sha512-B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg== + move-concurrently@^1.0.1, move-concurrently@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"