Linked remix-solidity lib to local lib

apps/remix-ide/ci/makeMockCompiler.js

@@ -2,7 +2,7 @@
 
 var fs = require('fs')
 var compiler = require('solc')
-var compilerInput = require('remix-solidity').CompilerInput
+var compilerInput = require('@remix-project/remix-solidity').CompilerInput
 var defaultVersion = 'v0.6.6+commit.6c089d02'
 const path = require('path')
 

apps/remix-ide/src/app/compiler/compiler-helpers.js

@@ -1,6 +1,6 @@
 'use strict'
 import { canUseWorker } from './compiler-utils'
-import { Compiler } from 'remix-solidity'
+import { Compiler } from '@remix-project/remix-solidity'
 import CompilerAbstract from './compiler-abstract'
 
 export const compile = async (compilationTargets, settings) => {

apps/remix-ide/src/app/tabs/compileTab/compileTab.js

@@ -1,7 +1,7 @@
 const async = require('async')
 const EventEmitter = require('events')
 var remixTests = require('remix-tests')
-var Compiler = require('remix-solidity').Compiler
+var Compiler = require('@remix-project/remix-solidity').Compiler
 var CompilerImport = require('../../compiler/compiler-imports')
 
 // TODO: move this to the UI

apps/remix-ide/test/compiler-test.js

@@ -2,7 +2,7 @@
 
 var test = require('tape')
 
-var Compiler = require('remix-solidity').Compiler
+var Compiler = require('@remix-project/remix-solidity').Compiler
 
 test('compiler.compile smoke', function (t) {
   t.plan(1)

apps/remix-ide/webpack.config.js

@@ -1,21 +1,13 @@
 const nxWebpack = require('@nrwl/react/plugins/webpack')
+const path = require('path')
+const webpack = require('webpack')
 
 module.exports = config => {
     const nxWebpackConfig = nxWebpack(config)
-    const { module, module: { rules } } = nxWebpackConfig
+    const { module, module: { rules }, plugins } = nxWebpackConfig
 
     return {
         ...nxWebpackConfig,
-        module: {
-            ...module,
-            rules: [
-                ...rules,
-                {
-                    test: /\.compiler\.js$/,
-                    use: { loader: 'worker-loader' }
-                }
-            ]
-        },
         node: {
             fs: 'empty',
             tls: 'empty',

libs/remix-solidity/src/compiler/compiler.ts

@@ -211,7 +211,7 @@ export class Compiler {
    */
 
   loadWorker (url: string): void {
-    this.state.worker = webworkify(require('./compiler-worker.js').default)
+    this.state.worker = webworkify(require('./compiler-worker').default)
     const jobs: Record<'sources', SourceWithTarget> [] = []
 
     this.state.worker.addEventListener('message', (msg: Record <'data', MessageFromWorker>) => {

package.json

@@ -141,6 +141,7 @@
     "http-server": "^0.11.1",
     "npm-install-version": "^6.0.2",
     "time-stamp": "^2.2.0",
+    "webworkify-webpack": "^2.1.5",
     "winston": "^3.3.3"
   },
   "devDependencies": {
@@ -151,7 +152,7 @@
     "@babel/plugin-transform-runtime": "^7.10.4",
     "@babel/polyfill": "^7.4.4",
     "@babel/preset-env": "^7.10.4",
-    "@babel/preset-es2015": "latest",
+    "@babel/preset-es2015": "^7.0.0-beta.53",
     "@babel/preset-es2017": "latest",
     "@babel/preset-stage-0": "^7.0.0",
     "@babel/register": "^7.4.4",