create-near-app 4.1.0 → 5.0.0-rc.0

package/dist/messages.js

@@ -24,7 +24,7 @@ Please refer to https://github.com/near/create-near-app README to troubleshoot.
 Notice: some platforms aren't supported (yet).
 {bold {red ==========================================}}`);
 exports.setupFailed = setupFailed;
-const successContractToText = (contract) => (0, chalk_1.default) `with a smart contract in {bold ${contract === 'rust' ? 'Rust' : contract === 'js' ? 'JavaScript' : 'AssemblyScript'}}`;
+const successContractToText = (contract) => (0, chalk_1.default) `with a smart contract in {bold ${contract === 'rust' ? 'Rust' : 'JavaScript'}}`;
 exports.successContractToText = successContractToText;
 const successFrontendToText = (frontend) => frontend === 'none' ? '' : (0, chalk_1.default) ` and a frontend template${frontend === 'react' ? (0, chalk_1.default) `{bold  in React.js}` : ''}`;
 exports.successFrontendToText = successFrontendToText;
@@ -48,7 +48,7 @@ ${contract === 'rust' ? (0, chalk_1.default) `🦀 If you are new to Rust please
 exports.setupSuccess = setupSuccess;
 const argsError = () => (0, exports.show)((0, chalk_1.default) `{red Arguments error}
 Run {blue npx create-near-app} without arguments, or use:
-npx create-near-app <projectName> --contract rust|js|assemblyscript --frontend react|vanilla|none --tests js|rust`);
+npx create-near-app <projectName> --contract rust|js --frontend react|vanilla|none --tests js|rust`);
 exports.argsError = argsError;
 const unsupportedNodeVersion = (supported) => (0, exports.show)((0, chalk_1.default) `{red We support node.js version ${supported} or later}`);
 exports.unsupportedNodeVersion = unsupportedNodeVersion;

package/dist/package-json.js

@@ -41,10 +41,6 @@ const buildScript = (hasFrontend) => hasFrontend ? {
 };
 const buildContractScript = (contract) => {
     switch (contract) {
-        case 'assemblyscript':
-            return {
-                'build:contract': 'cd contract && npm run build',
-            };
         case 'js':
             return {
                 'build:contract': 'cd contract && npm run build',
@@ -57,7 +53,6 @@ const buildContractScript = (contract) => {
 };
 const deployScript = (contract) => {
     switch (contract) {
-        case 'assemblyscript':
         case 'js':
             return {
                 'deploy': 'cd contract && npm run deploy',
@@ -71,102 +66,48 @@ const deployScript = (contract) => {
 const unitTestScripts = (contract) => {
     switch (contract) {
         case 'js':
-        case 'assemblyscript':
             return { 'test:unit': 'cd contract && npm test' };
         case 'rust':
             return { 'test:unit': 'cd contract && cargo test' };
     }
 };
 const integrationTestScripts = (contract, tests) => {
+    let wasm_path = '';
     switch (contract) {
-        case 'assemblyscript':
-            if (tests === 'js') {
-                return {
-                    'test:integration': 'npm run build:contract && cd integration-tests && npm test -- -- "./contract/build/release/hello_near.wasm"',
-                };
-            }
-            else {
-                return {
-                    'test:integration': 'npm run build:contract && cd integration-tests && cargo run --example integration-tests "../contract/build/release/hello_near.wasm"',
-                };
-            }
         case 'js':
-            if (tests === 'js') {
-                return {
-                    'test:integration': 'npm run build:contract && cd integration-tests && npm test  -- -- "./contract/build/hello_near.wasm"',
-                };
-            }
-            else {
-                return {
-                    'test:integration': 'npm run build:contract && cd integration-tests && cargo run --example integration-tests "../contract/build/hello_near.wasm"',
-                };
-            }
+            wasm_path = 'contract/build/hello_near.wasm';
+            break;
+        case 'rust':
+            wasm_path = 'contract/target/wasm32-unknown-unknown/release/hello_near.wasm';
+            break;
+    }
+    let run_test = '';
+    switch (tests) {
+        case 'js':
+            run_test = `npm test -- -- "./${wasm_path}"`;
+            break;
         case 'rust':
-            if (tests === 'js') {
-                return {
-                    'test:integration': 'npm run build:contract && cd integration-tests && npm test  -- -- "./contract/target/wasm32-unknown-unknown/release/hello_near.wasm"',
-                };
-            }
-            else {
-                return {
-                    'test:integration': 'npm run build:contract && cd integration-tests && cargo run --example integration-tests "../contract/target/wasm32-unknown-unknown/release/hello_near.wasm"',
-                };
-            }
+            run_test = `cargo run --example integration-tests "../${wasm_path}"`;
+            break;
     }
+    return {
+        'test:integration': `cd integration-tests && ${run_test}`,
+    };
 };
 const npmInstallScript = (contract, hasFrontend, tests) => {
+    const frontend_install = hasFrontend ? 'cd frontend && npm install && cd ..' : 'echo no frontend';
+    const test_install = (tests === 'js') ? 'cd integration-tests && npm install && cd ..' : 'echo rs tests';
+    let contract_install = '';
     switch (contract) {
-        case 'assemblyscript':
-            if (hasFrontend) {
-                if (tests === 'js') {
-                    return { 'postinstall': 'cd contract && npm install --ignore-scripts && cd ../integration-tests && npm install && cd ../frontend && npm install && cd ..' };
-                }
-                else {
-                    return { 'postinstall': 'cd contract && npm install --ignore-scripts && cd ../frontend && npm install && cd ..' };
-                }
-            }
-            else {
-                if (tests === 'js') {
-                    return { 'postinstall': 'cd contract && npm install --ignore-scripts && cd ../integration-tests && npm install && cd ..' };
-                }
-                else {
-                    return { 'postinstall': 'cd contract && npm install --ignore-scripts && cd ..' };
-                }
-            }
         case 'js':
-            if (hasFrontend) {
-                if (tests === 'js') {
-                    return { 'postinstall': 'cd contract && npm install && cd ../integration-tests && npm install && cd ../frontend && npm install && cd ..' };
-                }
-                else {
-                    return { 'postinstall': 'cd contract && npm install && cd ../frontend && npm install && cd ..' };
-                }
-            }
-            else {
-                if (tests === 'js') {
-                    return { 'postinstall': 'cd contract && npm install && cd ../integration-tests && npm install && cd ..' };
-                }
-                else {
-                    return { 'postinstall': 'cd contract && npm install && cd ..' };
-                }
-            }
+            contract_install = 'cd contract && npm install';
+            break;
         case 'rust':
-            if (hasFrontend) {
-                if (tests === 'js') {
-                    return { 'postinstall': 'cd frontend && npm install && cd ../integration-tests && npm install && cd ..' };
-                }
-                else {
-                    return { 'postinstall': 'cd frontend && npm install && cd ..' };
-                }
-            }
-            else {
-                if (tests === 'js') {
-                    return { 'postinstall': 'cd ./integration-tests && npm install && cd ..' };
-                }
-                else {
-                    return {};
-                }
-            }
+            contract_install = 'echo rs contract';
+            break;
     }
+    return {
+        'postinstall': `${frontend_install} && ${test_install} && ${contract_install}`
+    };
 };
 //# sourceMappingURL=package-json.js.map

package/dist/types.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TESTING_FRAMEWORKS = exports.FRONTENDS = exports.CONTRACTS = void 0;
-exports.CONTRACTS = ['assemblyscript', 'js', 'rust'];
+exports.CONTRACTS = ['js', 'rust'];
 exports.FRONTENDS = ['react', 'vanilla', 'none'];
 exports.TESTING_FRAMEWORKS = ['rust', 'js'];
 //# sourceMappingURL=types.js.map

package/dist/user-input.js

@@ -77,7 +77,6 @@ exports.validateUserArgs = validateUserArgs;
 const contractChoices = [
     { title: 'TypeScript', value: 'js' },
     { title: 'Rust', value: 'rust' },
-    { title: 'AssemblyScript', value: 'assemblyscript' },
 ];
 const testsChoices = [
     { title: 'Rust Sandbox Tests', value: 'rust' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-near-app",
-  "version": "4.1.0",
+  "version": "5.0.0-rc.0",
   "description": "Quickly scaffold your dApp on NEAR Blockchain",
   "main": "index.js",
   "engines": {

package/templates/frontend/react/ui-components.js

@@ -43,12 +43,12 @@ export function EducationalText() {
       </p>
       <ol>
         <li>
-          Look in <code>src/App.js</code> and <code>src/utils.js</code> – you'll see <code>get_greeting</code> and <code>set_greeting</code> being called on <code>contract</code>. What's this?
+          Look in <code>src/App.js</code> - you'll see <code>getGreeting</code> and <code>setGreeting</code> being called on <code>contract</code>. What's this?
         </li>
         <li>
-          Ultimately, this <code>contract</code> code is defined in <code>assembly/main.ts</code> – this is the source code for your <a target="_blank" rel="noreferrer" href="https://docs.near.org/docs/develop/contracts/overview">smart contract</a>.</li>
+          Ultimately, this <code>contract</code> code is defined in <code>./contract</code> – this is the source code for your <a target="_blank" rel="noreferrer" href="https://docs.near.org/docs/develop/contracts/overview">smart contract</a>.</li>
         <li>
-          When you run <code>npm run dev</code>, the code in <code>assembly/main.ts</code> gets deployed to the NEAR testnet. You can see how this happens by looking in <code>package.json</code> at the <code>scripts</code> section to find the <code>dev</code> command.</li>
+          When you run <code>npm run deploy</code>, the code in <code>./contract</code> gets deployed to the NEAR testnet. You can see how this happens by looking in <code>package.json</code>.</li>
       </ol>
       <hr />
       <p>

package/templates/frontend/vanilla/index.html

@@ -60,20 +60,18 @@
       </p>
       <ol>
         <li>
-          Look in <code>index.js</code> and <code>near-api.js</code> – you'll see <code>get_greeting</code>
-          and <code>set_greeting</code> being called on <code>contract</code>.
+          Look in <code>./frontend/index.js</code> – you'll see <code>getGreeting</code>
+          and <code>setGreeting</code> being called on <code>contract</code>.
           What's this?
         </li>
         <li>
           Ultimately, this <code>contract</code> code is defined in
-          <code>assembly/index.ts</code> – this is the source code for your
+          <code>./contract</code> – this is the source code for your
           <a target="_blank" href="https://docs.near.org/docs/develop/contracts/overview">smart contract</a>.
         </li>
         <li>
-          When you run <code>npm run dev</code>, the code in
-          <code>assembly/index.ts</code> gets deployed to the NEAR testnet. You
-          can see how this happens by looking in <code>package.json</code> at the
-          <code>scripts</code> section to find the <code>dev</code> command.
+          When you run <code>npm run dev</code>, the contract's code gets deployed
+          to the NEAR testnet. You can see how this happens by looking in <code>package.json</code>.
         </li>
       </ol>
       <hr>

package/templates/contracts/assemblyscript/README.md

@@ -1,26 +0,0 @@
-Hello NEAR!
-===========
-
-A [smart contract] written in [AssemblyScript] for an app initialized with [create-near-app]
-
-
-Quick Start
-===========
-
-Before you compile this code, you will need to install [Node.js] ≥ 16
-
-
-Exploring The Code
-==================
-
-1. The main smart contract code lives in `assembly/index.ts`.
-2. There are two functions to the smart contract: `get_greeting` and `set_greeting`.
-3. Tests: You can run smart contract tests with the `npm run test` script. This runs
-   standard AssemblyScript tests using [as-pect].
-
-
-  [smart contract]: https://docs.near.org/develop/welcome
-  [AssemblyScript]: https://www.assemblyscript.org/
-  [create-near-app]: https://github.com/near/create-near-app
-  [Node.js]: https://nodejs.org/en/download/package-manager/
-  [as-pect]: https://www.npmjs.com/package/@as-pect/cli

package/templates/contracts/assemblyscript/as-pect.config.js

@@ -1 +0,0 @@
-module.exports = require('near-sdk-as/imports');

package/templates/contracts/assemblyscript/asconfig.json

@@ -1,3 +0,0 @@
-{
-  "extends": "near-sdk-as/asconfig.json"
-}

package/templates/contracts/assemblyscript/assembly/__tests__/as-pect.d.ts

@@ -1 +0,0 @@
-/// <reference types="@as-pect/assembly/types/as-pect" />

package/templates/contracts/assemblyscript/assembly/__tests__/main.spec.ts

@@ -1,11 +0,0 @@
-import { set_greeting, get_greeting } from '..';
-
-describe('Greeting ', () => {
-  it('should get the default greeting', () => {
-    expect(get_greeting()).toBe('Hello');
-  });
-  it('should change the greeting', () => {
-    set_greeting('howdy');
-    expect(get_greeting()).toBe('howdy');
-  });
-});

package/templates/contracts/assemblyscript/assembly/as_types.d.ts

@@ -1 +0,0 @@
-/// <reference types="near-sdk-as/assembly/as_types" />

package/templates/contracts/assemblyscript/assembly/index.ts

@@ -1,23 +0,0 @@
-/*
- * Example smart contract written in AssemblyScript
- *
- * Learn more about writing NEAR smart contracts with AssemblyScript:
- * https://near-docs.io/develop/welcome
- *
- */
-
-import { logging, storage } from 'near-sdk-as';
-
-const DEFAULT_MESSAGE = 'Hello';
-
-// Public method - returns the greeting saved, defaulting to DEFAULT_MESSAGE
-export function get_greeting(): string {
-  return storage.getPrimitive<string>('message', DEFAULT_MESSAGE);
-}
-
-// Public method - accepts a greeting, such as 'howdy', and records it
-export function set_greeting(message: string): void {
-  // Use logging.log to record logs permanently to the blockchain!
-  logging.log(`Saving greeting '${message}'`);
-  storage.set<string>('message', message);
-}

package/templates/contracts/assemblyscript/assembly/tsconfig.json

@@ -1,6 +0,0 @@
-{
-  "extends": "assemblyscript/std/assembly.json",
-  "include": [
-    "./**/*.ts"
-  ]
-}

package/templates/contracts/assemblyscript/package.json

@@ -1,14 +0,0 @@
-{
-  "name": "hello_near",
-  "version": "1.0.0",
-  "license": "(MIT AND Apache-2.0)",
-  "scripts": {
-    "build": "asb",
-    "deploy": "npm run build && rm -rf neardev && near dev-deploy --wasmFile ./build/release/hello_near.wasm",
-    "test": "asp --nologo"
-  },
-  "dependencies": {
-    "near-cli": "^3.3.0",
-    "near-sdk-as": "^3.2.3"
-  }
-}