Merge pull request #468 from paritytech/read-example-from-rs

read example code from crate
use-ink · Nov 14, 2022 · 0e164fb · 0e164fb
2 parents 776bcf2 + d5aa98c
commit 0e164fb
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 59 deletions.
diff --git a/crates/sandbox/src/build_command.rs b/crates/sandbox/src/build_command.rs
@@ -131,7 +131,7 @@ fn build_execution_command() -> Vec<String> {
         "rm -rf {}/contract.* {}/metadata.json",
         target_dir, target_dir
     );
-    let build_cmd = "cargo contract build --offline --skip-linting 2>&1".to_string();
+    let build_cmd = "cargo contract build --offline 2>&1".to_string();
     let move_cmd = format!("mv {}/contract.contract {}", target_dir, DOCKER_OUTPUT);
 
     let command = format!("{} && {} && {}", clean_cmd, build_cmd, move_cmd);

diff --git a/crates/sandbox/src/lib.rs b/crates/sandbox/src/lib.rs
@@ -165,7 +165,7 @@ pub enum FormattingResult {
 // CONSTANTS
 // -------------------------------------------------------------------------------------------------
 
-const DOCKER_PROCESS_TIMEOUT_HARD: Duration = Duration::from_secs(30);
+const DOCKER_PROCESS_TIMEOUT_HARD: Duration = Duration::from_secs(60);
 
 // -------------------------------------------------------------------------------------------------
 // TRAIT IMPLEMENTATION

diff --git a/packages/ink-editor/src/example-code.ts b/packages/ink-editor/src/example-code.ts
diff --git a/packages/ink-editor/src/index.tsx b/packages/ink-editor/src/index.tsx
@@ -1,4 +1,5 @@
-import exampleCode from './example-code';
+// See: https://github.com/webpack/webpack/issues/12900
+import exampleCode from '../../../crates/contract/lib.txt!=!../../../crates/contract/lib.rs';
 import { InkEditor, InkEditorProps } from './ink-editor';
 export { exampleCode, InkEditor };
 export type { InkEditorProps };
diff --git a/packages/ink-editor/src/module.d.ts b/packages/ink-editor/src/module.d.ts
@@ -1 +1,2 @@
 declare module 'monaco-editor/esm/vs/basic-languages/rust/rust';
+declare module '*.rs';
diff --git a/packages/ink-editor/webpack.config.js b/packages/ink-editor/webpack.config.js
@@ -41,6 +41,10 @@ const webpackConfig = {
           },
         ],
       },
+      {
+        test: /\.txt$/,
+        type: 'asset/source',
+      },
     ],
   },
   plugins: [

diff --git a/packages/playground/src/context/side-effects/load-code.ts b/packages/playground/src/context/side-effects/load-code.ts
@@ -3,7 +3,8 @@ import { MessageDispatch } from '../messages/reducer';
 import { gistLoadRequest } from '@paritytech/ink-editor/api/gists';
 import { GistCreateResponse } from '@paritytech/commontypes';
 import qs from 'qs';
-import exampleCode from '@paritytech/ink-editor/example-code';
+// See: https://github.com/webpack/webpack/issues/12900
+import exampleCode from '../../../../../crates/contract/lib.txt!=!../../../../../crates/contract/lib.rs';
 import { GIST_LOAD_URL } from '~/env';
 
 type Params = { id?: string };
@@ -67,6 +68,7 @@ export async function loadCode(state: State, dispatch: Dispatch): Promise<string
 
   const params = parseParams(window.location.search.substring(1));
   if (!params.id) {
+    console.log('!!!!!!', exampleCode);
     return exampleCode;
   }
 

diff --git a/packages/playground/src/module.d.ts b/packages/playground/src/module.d.ts
@@ -1 +1,2 @@
 declare module 'monaco-editor/esm/vs/basic-languages/rust/rust';
+declare module '*.rs';
diff --git a/packages/playground/webpack.config.js b/packages/playground/webpack.config.js
@@ -44,6 +44,10 @@ const localConfig = {
           },
         ],
       },
+      {
+        test: /\.txt$/,
+        type: 'asset/source',
+      },
     ],
   },
   optimization: {