diff --git a/blank_project/assembly/main.ts b/blank_project/assembly/main.ts index 8a81c1f9..1033bd21 100755 --- a/blank_project/assembly/main.ts +++ b/blank_project/assembly/main.ts @@ -1,6 +1,3 @@ -import "allocator/arena"; -export { memory }; - import { context, storage, near } from "./near"; import { Greeter } from "./model.near"; @@ -12,7 +9,7 @@ import { Greeter } from "./model.near"; // using `export` keyword. export function hello(): string { - let greeter = new Greeter("Hello"); + let greeter = new Greeter("hello"); return greeter.greet("world"); } // << hello-snippet diff --git a/blank_project/package.json b/blank_project/package.json index 054eae2b..c5a9185b 100644 --- a/blank_project/package.json +++ b/blank_project/package.json @@ -12,12 +12,12 @@ "test": "npm run build && jest test --env=near-shell/test_environment" }, "devDependencies": { - "assemblyscript-json": "github:nearprotocol/assemblyscript-json", + "assemblyscript-json": "github:nearprotocol/assemblyscript-json#update-as", "gh-pages": "^2.0.1", "gulp": "^3", "jest": "^22.4.4", "jest-environment-node": "^24.5.0", - "near-runtime-ts": "github:nearprotocol/near-runtime-ts", + "near-runtime-ts": "github:nearprotocol/near-runtime-ts#update-as1", "near-shell": "github:nearprotocol/near-shell" }, "wasmStudio": { diff --git a/gulp-utils.js b/gulp-utils.js index b1018e23..bbe50429 100644 --- a/gulp-utils.js +++ b/gulp-utils.js @@ -17,7 +17,8 @@ function compile(inputFile, outputFile, callback) { "--baseDir", "assembly", "--binaryFile", outputFile, "--sourceMap", - "--measure" + "--measure", + "--runtime", "stub" ], callback); } diff --git a/package.json b/package.json index ee15063f..3d14fad5 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ }, "devDependencies": {}, "dependencies": { - "assemblyscript": "github:nearprotocol/assemblyscript", + "assemblyscript": "github:nearprotocol/assemblyscript#assemblyscript-update", "jest-environment-node": "^24.5.0", "ncp": "^2.0.0", "nearlib": "github:nearprotocol/nearlib#nightshade", diff --git a/yarn.lock b/yarn.lock index 070df9e9..30296bf5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -282,9 +282,9 @@ integrity sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q== "@types/node@^10.1.0": - version "10.14.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.8.tgz#fe444203ecef1162348cd6deb76c62477b2cc6e9" - integrity sha512-I4+DbJEhLEg4/vIy/2gkWDvXBOOtPKV9EnLhYjMoqxcRW+TTZtUftkHktz/a8suoD5mUL7m6ReLrkPvSsCQQmw== + version "10.14.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.9.tgz#2e8d678039d27943ce53a1913386133227fd9066" + integrity sha512-NelG/dSahlXYtSoVPErrp06tYFrvzj8XLWmKA+X8x0W//4MqbUyZu++giUG/v0bjAT6/Qxa8IjodrfdACyb0Fg== "@types/stack-utils@^1.0.1": version "1.0.1" @@ -364,15 +364,16 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -"assemblyscript@github:nearprotocol/assemblyscript": - version "0.6.0" - resolved "https://codeload.github.com/nearprotocol/assemblyscript/tar.gz/97ddc48011d0875cac131e9847cee1f2a3cf523e" +"assemblyscript@github:nearprotocol/assemblyscript#assemblyscript-update": + version "0.7.0" + resolved "https://codeload.github.com/nearprotocol/assemblyscript/tar.gz/d8c4f1de18614c966f19b41f89ace2ef5cd876c5" dependencies: "@protobufjs/utf8" "^1.1.0" - binaryen "69.0.0-nightly.20190228" + binaryen "84.0.0-nightly.20190522" glob "^7.1.3" long "^4.0.0" - source-map-support "^0.5.10" + opencollective-postinstall "^2.0.0" + source-map-support "^0.5.11" assign-symbols@^1.0.0: version "1.0.0" @@ -418,10 +419,10 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" -binaryen@69.0.0-nightly.20190228: - version "69.0.0-nightly.20190228" - resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-69.0.0-nightly.20190228.tgz#e8acdb4341e240cd79285cc72867a8557244dedb" - integrity sha512-rF3UuWKyYc0+PX+HteNKB3rl5FIcwIfmCldFp2PShJ9lwUvTLqvMaGfco6/QhFSP0Q0iLdHxBFDn9LHief8FPg== +binaryen@84.0.0-nightly.20190522: + version "84.0.0-nightly.20190522" + resolved "https://registry.yarnpkg.com/binaryen/-/binaryen-84.0.0-nightly.20190522.tgz#31d3e8df90ec01509183d23d15b1ce16b53e87af" + integrity sha512-bxSPi3MOkFmK5W6VIlqxnOc1nYzpUCzT/tHz3C7sgbz7jTR2lOBlZnKStTJlBt018xeZK9/JpK/jXdduH7eQFg== brace-expansion@^1.1.7: version "1.1.11" @@ -1232,9 +1233,9 @@ jest-environment-node@^24.5.0: jest-util "^24.8.0" jest-haste-map@^24.8.0: - version "24.8.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz#51794182d877b3ddfd6e6d23920e3fe72f305800" - integrity sha512-ZBPRGHdPt1rHajWelXdqygIDpJx8u3xOoLyUBWRW28r3tagrgoepPrzAozW7kW9HrQfhvmiv1tncsxqHJO1onQ== + version "24.8.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.1.tgz#f39cc1d2b1d907e014165b4bd5a957afcb992982" + integrity sha512-SwaxMGVdAZk3ernAx2Uv2sorA7jm3Kx+lR0grp6rMmnY06Kn/urtKx1LPN2mGTea4fCT38impYT28FfcLUhX0g== dependencies: "@jest/types" "^24.8.0" anymatch "^2.0.0" @@ -1718,6 +1719,11 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +opencollective-postinstall@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" + integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== + os-homedir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" @@ -1947,9 +1953,9 @@ resolve-url@^0.2.1: integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= resolve@^1.10.0, resolve@^1.3.2: - version "1.11.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e" - integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw== + version "1.11.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232" + integrity sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw== dependencies: path-parse "^1.0.6" @@ -2110,7 +2116,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.10: +source-map-support@^0.5.11: version "0.5.12" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== @@ -2454,9 +2460,9 @@ yallist@^3.0.0, yallist@^3.0.3: integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== yargs-parser@^13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.0.tgz#7016b6dd03e28e1418a510e258be4bff5a31138f" - integrity sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA== + version "13.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" + integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== dependencies: camelcase "^5.0.0" decamelize "^1.2.0"