diff --git a/libs/remix-analyzer/tsconfig.json b/libs/remix-analyzer/tsconfig.json index 07886d4f6c..d3fe07838c 100644 --- a/libs/remix-analyzer/tsconfig.json +++ b/libs/remix-analyzer/tsconfig.json @@ -1,22 +1,24 @@ { - "extends": "../../tsconfig.json", "include": ["src", "index.ts"], "compilerOptions": { "target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */ "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ "lib": ["dom", "es2018"], /* Specify library files to be included in the compilation. */ - "types": ["node"], "declaration": true, /* Generates corresponding '.d.ts' file. */ "sourceMap": true, /* Generates corresponding '.map' file. */ "outDir": "./dist", /* Redirect output structure to the directory. */ /* Strict Type-Checking Options */ "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" ], "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + /* Experimental Options */ + "experimentalDecorators": false, /* Enables experimental support for ES7 decorators. */ } -} - +} \ No newline at end of file diff --git a/libs/remix-analyzer/tsconfig.lib.json b/libs/remix-analyzer/tsconfig.lib.json deleted file mode 100644 index f08f6935f9..0000000000 --- a/libs/remix-analyzer/tsconfig.lib.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "commonjs", - "outDir": "../../dist/out-tsc", - "declaration": true, - "rootDir": "./", - "types": ["node"] - } -} \ No newline at end of file diff --git a/libs/remix-astwalker/tsconfig.json b/libs/remix-astwalker/tsconfig.json index 7c86df784b..992cba4254 100644 --- a/libs/remix-astwalker/tsconfig.json +++ b/libs/remix-astwalker/tsconfig.json @@ -1,5 +1,4 @@ { - "extends": "../../tsconfig.json", "include": ["src"], "exclude": ["node_modules", "src/@types" ], "compilerOptions": { @@ -9,10 +8,15 @@ "lib": ["dom", "es2018"], /* Specify library files to be included in the compilation. */ "declaration": true, /* Generates corresponding '.d.ts' file. */ "sourceMap": true, /* Generates corresponding '.map' file. */ + "outDir": "./dist", /* Redirect output structure to the directory. */ /* Strict Type-Checking Options */ "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"], /* 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": [ @@ -24,4 +28,4 @@ // Disables strictNullChecks "strictNullChecks": false } -} +} \ No newline at end of file diff --git a/libs/remix-astwalker/tsconfig.lib.json b/libs/remix-astwalker/tsconfig.lib.json deleted file mode 100644 index 8a8e244640..0000000000 --- a/libs/remix-astwalker/tsconfig.lib.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "commonjs", - "outDir": "../../dist/out-tsc", - "declaration": true, - "rootDir": "./src", - "types": ["node"] - } -} \ No newline at end of file diff --git a/libs/remix-solidity/tsconfig.json b/libs/remix-solidity/tsconfig.json index 5968a43b4c..9cb9baf18e 100644 --- a/libs/remix-solidity/tsconfig.json +++ b/libs/remix-solidity/tsconfig.json @@ -1,20 +1,24 @@ { - "extends": "../../tsconfig.json", - "include": ["src", "index.ts"], - "compilerOptions": { - "target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */ - "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ - "lib": ["dom", "es2018"], /* Specify library files to be included in the compilation. */ - "types": ["node"], - "declaration": true, /* Generates corresponding '.d.ts' file. */ - "sourceMap": true, /* Generates corresponding '.map' file. */ - /* Strict Type-Checking Options */ - "strict": true, /* Enable all strict type-checking options. */ - "noImplicitAny": false, - "typeRoots": [ - "./@types", - "./node_modules/@types" - ] - } + "include": ["src", "index.ts"], + "compilerOptions": { + "target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */ + "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ + "lib": ["dom", "es2018"], /* Specify library files to be included in the compilation. */ + "declaration": true, /* Generates corresponding '.d.ts' file. */ + "sourceMap": true, /* Generates corresponding '.map' file. */ + "outDir": "./dist", /* Redirect output structure to the directory. */ + /* Strict Type-Checking Options */ + "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" + ], + "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + /* Experimental Options */ + "experimentalDecorators": false, /* Enables experimental support for ES7 decorators. */ } - \ No newline at end of file +} \ No newline at end of file diff --git a/libs/remix-solidity/tsconfig.lib.json b/libs/remix-solidity/tsconfig.lib.json deleted file mode 100644 index f08f6935f9..0000000000 --- a/libs/remix-solidity/tsconfig.lib.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "commonjs", - "outDir": "../../dist/out-tsc", - "declaration": true, - "rootDir": "./", - "types": ["node"] - } -} \ No newline at end of file diff --git a/libs/remix-tests/tsconfig.json b/libs/remix-tests/tsconfig.json index 6a0207fab2..45cd9f683f 100644 --- a/libs/remix-tests/tsconfig.json +++ b/libs/remix-tests/tsconfig.json @@ -1,19 +1,24 @@ { - "extends": "../../tsconfig.json", "include": ["src"], "compilerOptions": { "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */ "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ "lib": ["dom", "es2018"], /* Specify library files to be included in the compilation. */ - "types": ["node"], "declaration": true, /* Generates corresponding '.d.ts' file. */ "sourceMap": true, /* Generates corresponding '.map' file. */ + "outDir": "./dist", /* Redirect output structure to the directory. */ /* Strict Type-Checking Options */ "strict": true, /* Enable all strict type-checking options. */ - "noImplicitAny": false, + "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" - ] + ], + "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + /* Experimental Options */ + "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ } -} +} \ No newline at end of file diff --git a/libs/remix-tests/tsconfig.lib.json b/libs/remix-tests/tsconfig.lib.json deleted file mode 100644 index 8a8e244640..0000000000 --- a/libs/remix-tests/tsconfig.lib.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "commonjs", - "outDir": "../../dist/out-tsc", - "declaration": true, - "rootDir": "./src", - "types": ["node"] - } -} \ No newline at end of file diff --git a/libs/remix-url-resolver/tsconfig.json b/libs/remix-url-resolver/tsconfig.json index f515d42b6c..4a075211c5 100644 --- a/libs/remix-url-resolver/tsconfig.json +++ b/libs/remix-url-resolver/tsconfig.json @@ -1,17 +1,21 @@ { - "extends": "../../tsconfig.json", "compileOnSave": false, "include": ["./src"], "compilerOptions": { + "baseUrl": "./src", + "outDir": "./dist", "sourceMap": true, "declaration": true, "module": "commonjs", "strict": true, "noImplicitAny": false, "strictPropertyInitialization": false, + "experimentalDecorators": true, "target": "es5", "typeRoots": ["node_modules/@types"], "lib": ["dom", "es2018"], - "types": ["node"], + "paths": { + "remix-url-resolver": ["./"] + } } -} +} \ No newline at end of file diff --git a/libs/remix-url-resolver/tsconfig.lib.json b/libs/remix-url-resolver/tsconfig.lib.json deleted file mode 100644 index 8a8e244640..0000000000 --- a/libs/remix-url-resolver/tsconfig.lib.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "commonjs", - "outDir": "../../dist/out-tsc", - "declaration": true, - "rootDir": "./src", - "types": ["node"] - } -} \ No newline at end of file diff --git a/package.json b/package.json index f13a9b2f71..89cc63bf6d 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "start": "nx start", "serve": "nx serve", "build": "nx build", + "build:tslibs": "nx run-many --target=build --projects=remix-analyzer,remix-astwalker,remix-solidity,remix-tests,remix-url-resolver", "test": "nx test", "lint": "nx lint", "lint:libs": "nx run-many --target=lint --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver", diff --git a/workspace.json b/workspace.json index 3793a0734b..d7b5817edb 100644 --- a/workspace.json +++ b/workspace.json @@ -86,13 +86,14 @@ }, "test": {}, "build": { - "builder": "@nrwl/node:package", + "builder": "@nrwl/workspace:run-commands", "options": { - "outputPath": "dist/libs/remix-analyzer", - "tsConfig": "libs/remix-analyzer/tsconfig.lib.json", - "packageJson": "libs/remix-analyzer/package.json", - "main": "libs/remix-analyzer/index.ts", - "assets": ["libs/remix-analyzer/*.md"] + "commands": [ + { + "command": "./../../node_modules/.bin/npm-run-all build" + } + ], + "cwd": "libs/remix-analyzer" } } } @@ -116,13 +117,14 @@ }, "test": {}, "build": { - "builder": "@nrwl/node:package", + "builder": "@nrwl/workspace:run-commands", "options": { - "outputPath": "dist/libs/remix-astwalker", - "tsConfig": "libs/remix-astwalker/tsconfig.lib.json", - "packageJson": "libs/remix-astwalker/package.json", - "main": "libs/remix-astwalker/src/index.ts", - "assets": ["libs/remix-astwalker/*.md"] + "commands": [ + { + "command": "./../../node_modules/.bin/npm-run-all build" + } + ], + "cwd": "libs/remix-astwalker" } } } @@ -236,13 +238,14 @@ }, "test": {}, "build": { - "builder": "@nrwl/node:package", + "builder": "@nrwl/workspace:run-commands", "options": { - "outputPath": "dist/libs/remix-solidity", - "tsConfig": "libs/remix-solidity/tsconfig.lib.json", - "packageJson": "libs/remix-solidity/package.json", - "main": "libs/remix-solidity/index.ts", - "assets": ["libs/remix-solidity/*.md"] + "commands": [ + { + "command": "./../../node_modules/.bin/npm-run-all build" + } + ], + "cwd": "libs/remix-solidity" } } } @@ -266,13 +269,14 @@ }, "test": {}, "build": { - "builder": "@nrwl/node:package", + "builder": "@nrwl/workspace:run-commands", "options": { - "outputPath": "dist/libs/remix-tests", - "tsConfig": "libs/remix-tests/tsconfig.lib.json", - "packageJson": "libs/remix-tests/package.json", - "main": "libs/remix-tests/src/index.ts", - "assets": ["libs/remix-tests/*.md"] + "commands": [ + { + "command": "./../../node_modules/.bin/npm-run-all build" + } + ], + "cwd": "libs/remix-tests" } } } @@ -296,13 +300,14 @@ }, "test": {}, "build": { - "builder": "@nrwl/node:package", + "builder": "@nrwl/workspace:run-commands", "options": { - "outputPath": "dist/libs/remix-url-resolver", - "tsConfig": "libs/remix-url-resolver/tsconfig.lib.json", - "packageJson": "libs/remix-url-resolver/package.json", - "main": "libs/remix-url-resolver/src/index.ts", - "assets": ["libs/remix-url-resolver/*.md"] + "commands": [ + { + "command": "./../../node_modules/.bin/npm-run-all build" + } + ], + "cwd": "libs/remix-url-resolver" } } }