Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/remix-ide/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
}
let versions = {
'0.7.7': 'assets/js/0.7.7/app.js', // commit 7b5c7ae3de935e0ccc32eadfd83bf7349478491e
'0.8.0': 'build/app.js'
'0.8.0': 'main.js'
}
for (let k in assets[versionToLoad]) {
let app = document.createElement('link')
Expand Down
10 changes: 10 additions & 0 deletions apps/remix-ide/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"types": ["node"]
},
"exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
"include": ["**/*.js", "**/*.ts"]
}

12 changes: 12 additions & 0 deletions apps/remix-ide/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"allowJs": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"types": ["node"]
},
"files": [],
"include": ["**/*.js", "**/*.ts"]
}

24 changes: 24 additions & 0 deletions apps/remix-ide/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
const nodeExternals = require('webpack-node-externals')
const webpackConfig = require('@nrwl/react/plugins/webpack')
const path = require('path')

module.exports = (config) => {
return {
...webpackConfig(config),
target: 'node', // in order to ignore built-in modules like path, fs, etc.
externals: [nodeExternals()], // in order to ignore all modules in node_modules folder
resolve: {
extensions: ['.js', '.ts', '.json'],
alias: {
'remix-analyzer': path.resolve(__dirname, '../../libs/remix-analyzer/index.ts'),
'remix-astwalker': path.resolve(__dirname, '../../libs/remix-astwalker/src/index.ts'),
'remix-debug': path.resolve(__dirname, '../../libs/remix-debug/index.js'),
'remix-lib': path.resolve(__dirname, '../../libs/remix-lib/index.js'),
'remix-simulator': path.resolve(__dirname, '../../libs/remix-simulator/index.js'),
'remix-solidity': path.resolve(__dirname, '../../libs/remix-solidity/index.ts'),
'remix-tests': path.resolve(__dirname, '../../libs/remix-tests/src/index.ts'),
'remix-url-resolver': path.resolve(__dirname, '../../libs/remix-url-resolver/src/index.ts')
}
}
}
}
2 changes: 1 addition & 1 deletion libs/remix-analyzer/src/solidity-analyzer/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'
import { AstWalker } from 'remix-astwalker'
import list from './modules/list'
import { CompilationResult, AnalyzerModule, AnalysisReportObj, AnalysisReport } from 'types'
import { CompilationResult, AnalyzerModule, AnalysisReportObj, AnalysisReport } from '../types'

type ModuleObj = {
name: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { getStateVariableDeclarationsFromContractNode, getInheritsFromName, getC
getFunctionOrModifierDefinitionParameterPart, getType, getDeclaredVariableName, getFunctionDefinitionReturnParameterPart } from './staticAnalysisCommon'
import { AstWalker } from 'remix-astwalker'
import { FunctionDefinitionAstNode, ParameterListAstNode, ModifierDefinitionAstNode, ContractHLAst, VariableDeclarationAstNode,
FunctionHLAst, ReportObj, ReportFunction, VisitFunction, ModifierHLAst, CompilationResult } from 'types'
FunctionHLAst, ReportObj, ReportFunction, VisitFunction, ModifierHLAst, CompilationResult } from '../../types'

type WrapFunction = ((contracts: ContractHLAst[], isSameName: boolean) => ReportObj[])

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

import { FunctionHLAst, ContractHLAst, FunctionCallGraph, ContractCallGraph, Context, FunctionCallAstNode } from "types"
import { FunctionHLAst, ContractHLAst, FunctionCallGraph, ContractCallGraph, Context, FunctionCallAstNode } from "../../types"
import { isLocalCallGraphRelevantNode, isExternalDirectCall, getFullQualifiedFunctionCallIdent,
getFullQuallyfiedFuncDefinitionIdent, getContractName } from './staticAnalysisCommon'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { FunctionDefinitionAstNode, ModifierDefinitionAstNode, ParameterListAstNode, ForStatementAstNode,
WhileStatementAstNode, VariableDeclarationAstNode, ContractDefinitionAstNode, InheritanceSpecifierAstNode,
MemberAccessAstNode, BinaryOperationAstNode, FunctionCallAstNode, ExpressionStatementAstNode, UnaryOperationAstNode,
IdentifierAstNode, IndexAccessAstNode, BlockAstNode, AssignmentAstNode, InlineAssemblyAstNode, IfStatementAstNode, CompiledContractObj, ABIParameter } from "types"
IdentifierAstNode, IndexAccessAstNode, BlockAstNode, AssignmentAstNode, InlineAssemblyAstNode, IfStatementAstNode, CompiledContractObj, ABIParameter } from "../../types"
import { util } from 'remix-lib'

type SpecialObjDetail = {
Expand Down
3 changes: 1 addition & 2 deletions libs/remix-analyzer/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig.json",
"include": ["src", "index.ts"],
"compilerOptions": {
"target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
Expand All @@ -11,8 +12,6 @@
"strict": true, /* Enable all strict type-checking options. */
"noImplicitAny": false, /* Raise error on expressions and declarations with an implied 'any' type. */
/* Module Resolution Options */
"baseUrl": "./src", /* Base directory to resolve non-absolute module names. */
"paths": { "remix-analyzer": ["./"] }, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
"typeRoots": [
"./@types",
"./node_modules/@types"
Expand Down
2 changes: 0 additions & 2 deletions libs/remix-astwalker/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
"noImplicitAny": false, /* Raise error on expressions and declarations with an implied 'any' type. */

/* Module Resolution Options */
"baseUrl": "./src", /* Base directory to resolve non-absolute module names. */
"paths": { "remix-tests": ["./"] }, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
"typeRoots": ["./@types", "node_modules/@types"], /* List of folders to include type definitions from. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
"types": [
Expand Down
2 changes: 1 addition & 1 deletion libs/remix-solidity/src/compiler/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
let jobs: Record<'sources', SourceWithTarget> [] = []

this.state.worker.addEventListener('message', (msg: Record <'data', MessageFromWorker>) => {
Expand Down
3 changes: 1 addition & 2 deletions libs/remix-solidity/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig.json",
"include": ["src", "index.ts"],
"compilerOptions": {
"target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
Expand All @@ -11,8 +12,6 @@
"strict": true, /* Enable all strict type-checking options. */
"noImplicitAny": false, /* Raise error on expressions and declarations with an implied 'any' type. */
/* Module Resolution Options */
"baseUrl": "./src", /* Base directory to resolve non-absolute module names. */
"paths": { "remix-solidity": ["./"] }, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
"typeRoots": [
"./@types",
"./node_modules/@types"
Expand Down
2 changes: 1 addition & 1 deletion libs/remix-tests/src/deployer.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import async from 'async'
import { execution } from 'remix-lib'
import Web3 from 'web3'
import { compilationInterface } from 'types'
import { compilationInterface } from './types'

/**
* @dev Deploy all contracts from compilation result
Expand Down
2 changes: 1 addition & 1 deletion libs/remix-tests/src/fileSystem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ fs.walkSync = function (start: string, callback: Function) {
})
}

export = fs
export default fs
3 changes: 1 addition & 2 deletions libs/remix-tests/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"extends": "../../tsconfig.json",
"include": ["src"],
"compilerOptions": {
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
Expand All @@ -11,8 +12,6 @@
"strict": true, /* Enable all strict type-checking options. */
"noImplicitAny": false, /* Raise error on expressions and declarations with an implied 'any' type. */
/* Module Resolution Options */
"baseUrl": "./src", /* Base directory to resolve non-absolute module names. */
"paths": { "remix-tests": ["./"] }, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
"typeRoots": [
"./@types",
"./node_modules/@types"
Expand Down
5 changes: 1 addition & 4 deletions libs/remix-url-resolver/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"extends": "../../tsconfig.json",
"compileOnSave": false,
"include": ["./src"],
"compilerOptions": {
"baseUrl": "./src",
"outDir": "./dist",
"sourceMap": true,
"declaration": true,
Expand All @@ -14,8 +14,5 @@
"target": "es5",
"typeRoots": ["node_modules/@types"],
"lib": ["dom", "es2018"],
"paths": {
"remix-url-resolver": ["./"]
}
}
}
Loading