From 201d9b887ed683d0a52c8cf88d2cc91790711eca Mon Sep 17 00:00:00 2001
From: dark64 <darem966@gmail.com>
Date: Mon, 6 Jan 2020 20:53:50 +0100
Subject: [PATCH] make imports public in core, remove ci steps for zokrates_js

---
 .circleci/config.yml      | 34 +---------------------------------
 zokrates_core/src/lib.rs  |  2 +-
 zokrates_js/.dockerignore |  8 ++++++++
 zokrates_js/Cargo.lock    |  8 ++++----
 4 files changed, 14 insertions(+), 38 deletions(-)
 create mode 100644 zokrates_js/.dockerignore

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b120f162..27018eb0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -112,27 +112,6 @@ jobs:
       - run:
           name: Release
           command: ./scripts/release.sh
-  zokrates_js_build:
-    docker:
-      - image: blockchainit/rust-wasm-env:latest
-    steps:
-      - checkout
-      - run:
-          command: cd zokrates_js && npm run build
-  zokrates_js_test:
-    docker:
-      - image: circleci/node
-    steps:
-      - checkout
-      - run:
-          command: cd zokrates_js && npm run test
-  zokrates_js_publish:
-    docker:
-      - image: blockchainit/rust-wasm-env:latest
-    steps:
-      - checkout
-      - run:
-          command: cd zokrates_js && ./publish.sh
 workflows:
   version: 2
   build-test-and-deploy:
@@ -141,8 +120,6 @@ workflows:
       - test
       - wasm_test
       - integration_test
-      - zokrates_js_build
-      - zokrates_js_test
       - deploy:
           filters:
             branches:
@@ -152,13 +129,4 @@ workflows:
             - build
             - test
             - wasm_test
-            - integration_test
-            - zokrates_js_build
-            - zokrates_js_test
-      - zokrates_js_publish:
-          filters:
-            branches:
-              only:
-                - master
-          requires:
-            - deploy
\ No newline at end of file
+            - integration_test
\ No newline at end of file
diff --git a/zokrates_core/src/lib.rs b/zokrates_core/src/lib.rs
index 7b96a742..dd2c9ff6 100644
--- a/zokrates_core/src/lib.rs
+++ b/zokrates_core/src/lib.rs
@@ -28,7 +28,7 @@ extern crate zokrates_pest_ast;
 
 mod embed;
 mod flatten;
-mod imports;
+pub mod imports;
 mod optimizer;
 mod parser;
 mod semantics;
diff --git a/zokrates_js/.dockerignore b/zokrates_js/.dockerignore
new file mode 100644
index 00000000..44f5edd1
--- /dev/null
+++ b/zokrates_js/.dockerignore
@@ -0,0 +1,8 @@
+pkg/
+node_modules/
+target/
+npm-debug.log
+.git
+.gitignore
+.vscode
+.idea
\ No newline at end of file
diff --git a/zokrates_js/Cargo.lock b/zokrates_js/Cargo.lock
index 4d0c227c..41764dfd 100644
--- a/zokrates_js/Cargo.lock
+++ b/zokrates_js/Cargo.lock
@@ -933,13 +933,13 @@ dependencies = [
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
- "zokrates_core 0.4.0",
+ "zokrates_core 0.4.1",
  "zokrates_field 0.3.4",
 ]
 
 [[package]]
 name = "zokrates_core"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "bellman_ce 0.3.1 (git+https://github.com/matter-labs/bellman)",
  "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -988,7 +988,7 @@ dependencies = [
 
 [[package]]
 name = "zokrates_js"
-version = "1.0.18"
+version = "1.0.19"
 dependencies = [
  "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -996,7 +996,7 @@ dependencies = [
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.56 (registry+https://github.com/rust-lang/crates.io-index)",
  "zokrates_abi 0.1.0",
- "zokrates_core 0.4.0",
+ "zokrates_core 0.4.1",
  "zokrates_field 0.3.4",
 ]