raw loader

apps/remix-ide/webpack.config.js

@@ -18,7 +18,9 @@ module.exports = config => {
   
   nxWebpackConfig.module.rules.push({ test: /\.txt$/, use: 'raw-loader' })
   nxWebpackConfig.module.rules.push({ test: /\.sol$/, use: 'raw-loader' })
+
   nxWebpackConfig.module.rules.push({ test: /\.test\.js$/, use: 'raw-loader' })
+
   nxWebpackConfig.module.rules.push({ test: /\web3.ts$/, use: 'raw-loader' })
   nxWebpackConfig.module.rules.push({ test: /\ethers.ts$/, use: 'raw-loader' })
 

libs/remix-ui/workspace/src/lib/actions/workspace.ts

@@ -6,6 +6,7 @@ import { checkSlash, checkSpecialChars } from '@remix-ui/helper'
 
 import { JSONStandardInput, WorkspaceTemplate } from '../types'
 import { QueryParams } from '@remix-project/remix-lib'
+import * as templateWithContent from '@remix-project/remix-ws-templates'
 
 
 const LOCALHOST = ' - connect to localhost - '
@@ -151,13 +152,17 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
 
     default:
       try {
-        // const templateWithContent = await import('../templates')
+        console.log('templateWithContent--->', templateWithContent)
-        const templateWithContent = await import('remix-ws-templates')
         const templateList = Object.keys(templateWithContent)
         if (!templateList.includes(template)) break
-        const files = templateWithContent[template]
+        console.log('templateWithContent--->', templateWithContent[template])
+        // @ts-ignore
+        const files = await templateWithContent[template]()
+        console.log('files--->', files)
         for (const file in files) {
           try {
+            // const f2 = await import(files[file])
+            // console.log('files-with await f2-->', f2)
             await workspaceProvider.set(file, files[file])
           } catch (error) {
             console.error(error)

libs/remix-ws-templates/.eslintrc

@@ -0,0 +1,12 @@
+{ 
+  "extends": "../../.eslintrc", 
+  "rules": {
+  }, 
+  "env": {
+      "browser": true,
+      "amd": true,
+      "node": true,
+      "es6": true
+  },
+  "ignorePatterns": ["!**/*"] 
+}

libs/remix-ws-templates/README.md

@@ -0,0 +1,7 @@
+# remix-ws-templates
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test remix-ws-templates` to execute the unit tests via [Jest](https://jestjs.io).

libs/remix-ws-templates/erc20/index.js

@@ -1,8 +0,0 @@
-export default {
-    'contracts/SampleERC20.sol': require('./contracts/SampleERC20.sol').default,
-    'scripts/deploy_with_ethers.ts': require('./scripts/deploy_with_ethers.ts').default,
-    'scripts/deploy_with_web3.ts': require('./scripts/deploy_with_web3.ts').default,
-    'scripts/ethers.ts': require('./scripts/ethers.ts').default,
-    'scripts/web3.ts': require('./scripts/web3.ts').default,
-    'tests/SampleERC20_test.sol': require('./tests/SampleERC20_test.sol').default
-}

libs/remix-ws-templates/index.js

@@ -1,3 +0,0 @@
-export { default as remixDefault } from './remixDefault'
-export { default as erc20 } from './erc20'
-// export { default as blank } from './blank'

libs/remix-ws-templates/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "remix-ws-templates",
+    "name": "@remix-project/remix-ws-templates",
     "version": "1.0.0",
     "description": "",
-  "main": "index.js",
+    "main": "src/index.js",
     "scripts": {
       "test": "echo \"Error: no test specified\" && exit 1"
     },

libs/remix-ws-templates/src/index.ts

@@ -0,0 +1,3 @@
+export { default as remixDefault } from './templates/remixDefault'
+export { default as erc20 } from './templates/erc20'
+export { default as blank } from './templates/blank'

libs/remix-ws-templates/src/templates/blank/index.ts

@@ -0,0 +1 @@
+export default {}

libs/remix-ws-templates/src/templates/erc20/index.ts

@@ -0,0 +1,18 @@
+export default async () => {
+    // @ts-ignore
+    console.log('------>', await import('raw-loader!./contracts/SampleERC20.sol'))
+    return {
+        // @ts-ignore
+        'contracts/SampleERC20.sol': (await import('raw-loader!./contracts/SampleERC20.sol')).default,
+        // @ts-ignore
+        'scripts/deploy_with_ethers.ts': (await import('raw-loader!./scripts/deploy_with_ethers.ts')).default,
+        // @ts-ignore
+        'scripts/deploy_with_web3.ts': (await import('raw-loader!./scripts/deploy_with_web3.ts')).default,
+        // @ts-ignore
+        'scripts/ethers.ts': (await import('raw-loader!./scripts/ethers.ts')).default,
+        // @ts-ignore
+        'scripts/web3.ts': (await import('raw-loader!./scripts/web3.ts')).default,
+        // @ts-ignore
+        'tests/SampleERC20_test.sol': (await import('raw-loader!./tests/SampleERC20_test.sol')).default
+    }
+}

libs/remix-ws-templates/src/templates/erc20/scripts/deploy_with_ethers.ts

@@ -1,4 +1,4 @@
-import { deploy } from './ethers.ts'
+import { deploy } from './ethers'
 
 (async () => {
     try {

libs/remix-ws-templates/src/templates/erc20/scripts/deploy_with_web3.ts

@@ -1,4 +1,4 @@
-import { deploy } from './web3.ts'
+import { deploy } from './web3'
 
 (async () => {
     try {

libs/remix-ws-templates/src/templates/erc20/scripts/ethers.ts

@@ -1,4 +1,7 @@
-export const deploy = async (contractName: string, args: Array<any>, from?: string) => {    
+
+
+
+export const deploy = async (contractName: string, args: Array<any>, from?: string): Promise<any> => {    
 
     console.log(`deploying ${contractName}`)
     // Note that the script needs the ABI which is generated from the compilation artifact.
@@ -21,4 +24,4 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
     // The contract is NOT deployed yet; we must wait until it is mined
     await contract.deployed()
     return contract
-}: Promise<any>
+}

libs/remix-ws-templates/src/templates/erc20/scripts/web3.ts

@@ -1,4 +1,4 @@
-export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number) => {
+export const deploy = async (contractName: string, args: Array<any>, from?: string, gas?: number): Promise<any> => {
 
     console.log(`deploying ${contractName}`)
     // Note that the script needs the ABI which is generated from the compilation artifact.
@@ -21,4 +21,4 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
         gas: gas || 1500000
     })
     return newContractInstance.options    
-}: Promise<any>
+}

libs/remix-ws-templates/src/templates/remixDefault/scripts/deploy_with_ethers.ts

@@ -2,7 +2,7 @@
 // Please make sure to compile "./contracts/1_Storage.sol" file before running this script.
 // And use Right click -> "Run" from context menu of the file to run the script. Shortcut: Ctrl+Shift+S
 
-import { deploy } from './ethers.ts'
+import { deploy } from './ethers'
 
 (async () => {
     try {

libs/remix-ws-templates/src/templates/remixDefault/scripts/deploy_with_web3.ts

@@ -2,7 +2,7 @@
 // Please make sure to compile "./contracts/1_Storage.sol" file before running this script.
 // And use Right click -> "Run" from context menu of the file to run the script. Shortcut: Ctrl+Shift+S
 
-import { deploy } from './web3.ts'
+import { deploy } from './web3'
 
 (async () => {
     try {

libs/remix-ws-templates/src/templates/remixDefault/scripts/ethers.ts

@@ -15,7 +15,7 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
     if (from) {
         contract = await factory.connect(from).deploy(...args);
     } else {
-        contract = await factory.deploy(...arguments);
+        contract = await factory.deploy(...args);
     }    
 
     // The contract is NOT deployed yet; we must wait until it is mined

libs/remix-ws-templates/src/types/index.d.ts

@@ -0,0 +1,4 @@
+declare var remix:any
+declare var ethers:any
+declare var web3:any
+declare var web3Provider:any

libs/remix-ws-templates/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "types": ["node"],
+  },
+  "include": ["**/*.ts"]
+}

libs/remix-ws-templates/tsconfig.lib.json

@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "rootDir": "./src",
+    "types": ["node"]
+  },
+  "exclude": [
+    "**/*.spec.ts",
+    "tests/"
+  ],
+  "include": ["**/*.ts", "**/*.sol"]
+}

nx.json

@@ -165,6 +165,9 @@
     },
     "remix-ui-permission-handler": {
       "tags": []
+    },
+    "remix-ws-templates": {
+      "tags": []
     }
   },
   "targetDependencies": {

tsconfig.base.json

@@ -75,10 +75,19 @@
       ],
       "@remix-ui/theme-module": ["libs/remix-ui/theme-module/src/index.ts"],
       "@remix-ui/panel": ["libs/remix-ui/panel/src/index.ts"],
-      "@remix-ui/editor-context-view": ["libs/remix-ui/editor-context-view/src/index.ts"],
+      "@remix-ui/editor-context-view": [
-      "@remix-ui/solidity-unit-testing": ["libs/remix-ui/solidity-unit-testing/src/index.ts"],
+        "libs/remix-ui/editor-context-view/src/index.ts"
+      ],
+      "@remix-ui/solidity-unit-testing": [
+        "libs/remix-ui/solidity-unit-testing/src/index.ts"
+      ],
       "@remix-ui/run-tab": ["libs/remix-ui/run-tab/src/index.ts"],
-      "@remix-ui/permission-handler": ["libs/remix-ui/permission-handler/src/index.ts"]
+      "@remix-ui/permission-handler": [
+        "libs/remix-ui/permission-handler/src/index.ts"
+      ],
+      "@remix-project/remix-ws-templates": [
+        "libs/remix-ws-templates/src/index.ts"
+      ]
     }
   },
   "exclude": ["node_modules", "tmp"]

workspace.json

@@ -1,4 +1,3 @@
-
 {
   "version": 1,
   "projects": {
@@ -1010,7 +1009,6 @@
             "tsConfig": ["libs/remix-ui/home-tab/tsconfig.lib.json"],
             "exclude": ["**/node_modules/**", "!libs/remix-ui/home-tab/**/*"]
           }
-
         }
       }
     },
@@ -1101,8 +1099,13 @@
           "builder": "@nrwl/linter:lint",
           "options": {
             "linter": "eslint",
-            "tsConfig": ["libs/remix-ui/vertical-icons-panel/tsconfig.lib.json"],
+            "tsConfig": [
-            "exclude": ["**/node_modules/**", "!libs/remix-ui/vertical-icons-panel/**/*"]
+              "libs/remix-ui/vertical-icons-panel/tsconfig.lib.json"
+            ],
+            "exclude": [
+              "**/node_modules/**",
+              "!libs/remix-ui/vertical-icons-panel/**/*"
+            ]
           }
         }
       }
@@ -1146,7 +1149,9 @@
           "builder": "@nrwl/linter:lint",
           "options": {
             "linter": "eslint",
-            "tsConfig": ["libs/remix-ui/solidity-unit-testing/tsconfig.lib.json"],
+            "tsConfig": [
+              "libs/remix-ui/solidity-unit-testing/tsconfig.lib.json"
+            ],
             "exclude": [
               "**/node_modules/**",
               "!libs/remix-ui/solidity-unit-testing/**/*"
@@ -1165,7 +1170,10 @@
           "options": {
             "linter": "eslint",
             "tsConfig": ["libs/remix-ui/editor-context-view/tsconfig.lib.json"],
-            "exclude": ["**/node_modules/**", "!libs/remix-ui/editor-context-view/**/*"]
+            "exclude": [
+              "**/node_modules/**",
+              "!libs/remix-ui/editor-context-view/**/*"
+            ]
           }
         }
       }
@@ -1180,7 +1188,11 @@
           "options": {
             "linter": "eslint",
             "tsConfig": ["libs/remix-ui/run-tab/tsconfig.lib.json"],
-            "exclude": ["**/node_modules/**", "libs/remix-ui/run-tab/**/*.d.ts", "!libs/remix-ui/run-tab/**/*"]
+            "exclude": [
+              "**/node_modules/**",
+              "libs/remix-ui/run-tab/**/*.d.ts",
+              "!libs/remix-ui/run-tab/**/*"
+            ]
           }
         }
       }
@@ -1195,7 +1207,24 @@
           "options": {
             "linter": "eslint",
             "tsConfig": ["libs/remix-ui/permission-handler/tsconfig.lib.json"],
-            "exclude": ["**/node_modules/**", "libs/remix-ui/permission-handler/**/*.d.ts", "!libs/remix-ui/permission-handler/**/*"]
+            "exclude": [
+              "**/node_modules/**",
+              "libs/remix-ui/permission-handler/**/*.d.ts",
+              "!libs/remix-ui/permission-handler/**/*"
+            ]
+          }
+        }
+      }
+    },
+    "remix-ws-templates": {
+      "root": "libs/remix-ws-templates",
+      "sourceRoot": "libs/remix-ws-templates/src",
+      "projectType": "library",
+      "architect": {
+        "lint": {
+          "builder": "@nrwl/linter:eslint",
+          "options": {
+            "lintFilePatterns": ["libs/remix-ws-templates/**/*.ts"]
           }
         }
       }