From 15fc4da344917ddc1f19b4bc16c50862d12bb1fd Mon Sep 17 00:00:00 2001 From: Aniket-Engg Date: Wed, 11 May 2022 13:52:18 +0530 Subject: [PATCH] raw loader for templates --- apps/remix-ide/webpack.config.js | 9 ----- .../workspace/src/lib/actions/workspace.ts | 5 --- .../src/templates/blank/index.ts | 2 +- .../src/templates/erc20/index.ts | 10 +++--- .../src/templates/remixDefault/index.ts | 35 ++++++++++++------- 5 files changed, 28 insertions(+), 33 deletions(-) diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js index 38802e0380..c6d1f19000 100644 --- a/apps/remix-ide/webpack.config.js +++ b/apps/remix-ide/webpack.config.js @@ -15,15 +15,6 @@ fs.writeFileSync('./apps/remix-ide/src/assets/version.json', JSON.stringify(vers module.exports = config => { const nxWebpackConfig = nxWebpack(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' }) - const webpackConfig = { ...nxWebpackConfig, node: { diff --git a/libs/remix-ui/workspace/src/lib/actions/workspace.ts b/libs/remix-ui/workspace/src/lib/actions/workspace.ts index 2fd1f95fe8..909b88d0c9 100644 --- a/libs/remix-ui/workspace/src/lib/actions/workspace.ts +++ b/libs/remix-ui/workspace/src/lib/actions/workspace.ts @@ -152,17 +152,12 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe default: try { - console.log('templateWithContent--->', templateWithContent) const templateList = Object.keys(templateWithContent) if (!templateList.includes(template)) break - 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) diff --git a/libs/remix-ws-templates/src/templates/blank/index.ts b/libs/remix-ws-templates/src/templates/blank/index.ts index 56004c9f9e..6840e8d560 100644 --- a/libs/remix-ws-templates/src/templates/blank/index.ts +++ b/libs/remix-ws-templates/src/templates/blank/index.ts @@ -1 +1 @@ -export default {} \ No newline at end of file +export default async () => { return {}} \ No newline at end of file diff --git a/libs/remix-ws-templates/src/templates/erc20/index.ts b/libs/remix-ws-templates/src/templates/erc20/index.ts index 3ee2d68ccd..cc1f087b55 100644 --- a/libs/remix-ws-templates/src/templates/erc20/index.ts +++ b/libs/remix-ws-templates/src/templates/erc20/index.ts @@ -1,17 +1,15 @@ 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, + '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, + '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, + 'scripts/ethers.ts': (await import('!!raw-loader!./scripts/ethers.ts')).default, // @ts-ignore - 'scripts/web3.ts': (await import('raw-loader!./scripts/web3.ts')).default, + '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 } diff --git a/libs/remix-ws-templates/src/templates/remixDefault/index.ts b/libs/remix-ws-templates/src/templates/remixDefault/index.ts index 7140e4a49a..683c616397 100644 --- a/libs/remix-ws-templates/src/templates/remixDefault/index.ts +++ b/libs/remix-ws-templates/src/templates/remixDefault/index.ts @@ -1,13 +1,24 @@ -export default { - 'contracts/1_Storage.sol': require('./contracts/1_Storage.sol').default, - 'contracts/2_Owner.sol': require('./contracts/2_Owner.sol').default, - 'contracts/3_Ballot.sol': require('./contracts/3_Ballot.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/Ballot_test.sol': require('./tests/Ballot_test.sol').default, - 'tests/storage.test.js': require('./tests/storage.test.js').default, - 'README.txt': require('./README.txt').default, - +export default async () => { + return { + // @ts-ignore + 'contracts/1_Storage.sol': (await import('raw-loader!./contracts/1_Storage.sol')).default, + // @ts-ignore + 'contracts/2_Owner.sol': (await import('raw-loader!./contracts/2_Owner.sol')).default, + // @ts-ignore + 'contracts/3_Ballot.sol': (await import('raw-loader!./contracts/3_Ballot.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/Ballot_test.sol': (await import('raw-loader!./tests/Ballot_test.sol')).default, + // @ts-ignore + 'tests/storage.test.js': (await import('!!raw-loader!./tests/storage.test.js')).default, + // @ts-ignore + 'README.txt': (await import('raw-loader!./README.txt')).default, + } } \ No newline at end of file