create-near-app 6.0.0 → 6.0.1

package/dist/app.js

@@ -42,7 +42,6 @@ const show = __importStar(require("./messages"));
             contract,
             frontend,
             tests,
-            projectName,
             templatesDir: path_1.default.resolve(__dirname, '../templates'),
             projectPath,
         });

package/dist/make.js

@@ -32,22 +32,21 @@ const cross_spawn_1 = __importDefault(require("cross-spawn"));
 const fs_1 = __importDefault(require("fs"));
 const ncp_1 = require("ncp");
 const path_1 = __importDefault(require("path"));
-async function createProject({ contract, frontend, tests, projectPath, projectName, templatesDir }) {
+async function createProject({ contract, frontend, tests, projectPath, templatesDir }) {
     if (contract !== 'none') {
-        await createContract({ contract, tests, projectPath, projectName, templatesDir });
+        await createContract({ contract, tests, projectPath, templatesDir });
     }
     else {
-        await createGateway({ frontend, projectPath, projectName, templatesDir });
+        await createGateway({ frontend, projectPath, templatesDir });
     }
     return true;
 }
 exports.createProject = createProject;
-async function createContract({ contract, tests, projectPath, projectName, templatesDir }) {
+async function createContract({ contract, tests, projectPath, templatesDir }) {
     // contract folder
     const sourceContractDir = path_1.default.resolve(templatesDir, 'contracts', contract);
-    const targetContractDir = projectPath;
-    fs_1.default.mkdirSync(targetContractDir, { recursive: true });
-    await copyDir(sourceContractDir, targetContractDir);
+    fs_1.default.mkdirSync(projectPath, { recursive: true });
+    await copyDir(sourceContractDir, projectPath);
     // copy sandbox-test dir
     const targetTestDir = path_1.default.resolve(projectPath, `sandbox-${tests}`);
     const sourceTestDir = path_1.default.resolve(`${templatesDir}/sandbox-tests/sandbox-${tests}`);
@@ -71,11 +70,10 @@ async function createContract({ contract, tests, projectPath, projectName, templ
         }
     }
 }
-async function createGateway({ frontend, projectPath, projectName, templatesDir }) {
+async function createGateway({ frontend, projectPath, templatesDir }) {
     const sourceFrontendDir = path_1.default.resolve(`${templatesDir}/frontend/${frontend}`);
-    const targetFrontendDir = path_1.default.resolve(`${projectPath}`);
-    fs_1.default.mkdirSync(targetFrontendDir, { recursive: true });
-    await copyDir(sourceFrontendDir, targetFrontendDir);
+    fs_1.default.mkdirSync(projectPath, { recursive: true });
+    await copyDir(sourceFrontendDir, projectPath);
 }
 // Wrap `ncp` tool to wait for the copy to finish when using `await`
 function copyDir(source, dest) {

package/dist/messages.js

@@ -56,9 +56,10 @@ ${!install ? (0, chalk_1.default) `   - {inverse Install all dependencies}
    - {inverse Start your app}:
          {blue pnpm {bold run dev}}`;
 exports.gatewayInstructions = gatewayInstructions;
-const argsError = () => (0, exports.show)((0, chalk_1.default) `{red Arguments error}
+const argsError = (msg) => (0, exports.show)((0, chalk_1.default) `{red Arguments error: {white ${msg}}}
+
 Run {blue npx create-near-app} without arguments, or use:
-npx create-near-app <projectName> --frontend next|vanilla|none --contract rs|ts|none --tests rs|ts|none`);
+npx create-near-app <projectName> [--frontend next|vanilla|none] [--contract rs|ts|none --tests rs|ts|none]`);
 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/tracking.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackUsage = exports.trackingMessage = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const mixpanel_1 = __importDefault(require("mixpanel"));
-const MIXPANEL_TOKEN = 'df164f13212cbb0dfdae991da60e87f2';
+const MIXPANEL_TOKEN = '24177ef1ec09ffea5cb6f68909c66a61';
 const tracker = mixpanel_1.default.init(MIXPANEL_TOKEN);
 exports.trackingMessage = (0, chalk_1.default) `Near collects anonymous information on the commands used. No personal information that could identify you is shared`;
 // TODO: track different failures & install usage
-const trackUsage = async (frontend, contract) => {
+const trackUsage = async (frontend, contract, testing) => {
     // prevents logging from CI
     if (process.env.NEAR_ENV === 'ci' || process.env.NODE_ENV === 'ci') {
         console.log('Mixpanel logging is skipped in CI env');
@@ -20,11 +20,12 @@ const trackUsage = async (frontend, contract) => {
         const mixPanelProperties = {
             frontend,
             contract,
+            testing,
             os: process.platform,
             nodeVersion: process.versions.node,
             timestamp: new Date().toString()
         };
-        tracker.track('track create near app', mixPanelProperties);
+        tracker.track('CNA', mixPanelProperties);
     }
     catch (e) {
         console.error('Warning: problem while sending tracking data. Error: ', e);

package/dist/user-input.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.projectPath = exports.promptAndGetConfig = exports.getUserAnswers = exports.validateUserArgs = exports.getUserArgs = void 0;
+exports.projectPath = exports.promptAndGetConfig = exports.getUserAnswers = exports.getUserArgs = void 0;
 const types_1 = require("./types");
 const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = __importDefault(require("prompts"));
@@ -38,8 +38,8 @@ const fs_1 = __importDefault(require("fs"));
 async function getUserArgs() {
     commander_1.program
         .argument('[projectName]')
-        .option('--contract [ts|rs|none]')
         .option('--frontend [next|vanilla|none]')
+        .option('--contract [ts|rs|none]')
         .option('--tests [rs|ts|none]')
         .option('--install')
         .addHelpText('after', 'You can create a frontend or a contract with tests');
@@ -50,31 +50,6 @@ async function getUserArgs() {
     return { contract, frontend, projectName, tests, install };
 }
 exports.getUserArgs = getUserArgs;
-function validateUserArgs(args) {
-    if (args === null) {
-        return 'error';
-    }
-    const { projectName, contract, frontend, tests } = args;
-    const hasAllOptions = contract !== undefined && frontend !== undefined;
-    const hasPartialOptions = contract !== undefined || frontend !== undefined;
-    const hasProjectName = projectName !== undefined;
-    const hasAllArgs = hasAllOptions && hasProjectName;
-    const hasNoArgs = !hasPartialOptions && !hasProjectName;
-    const optionsAreValid = hasAllOptions
-        && types_1.FRONTENDS.includes(frontend)
-        && types_1.CONTRACTS.includes(contract)
-        && types_1.TESTING_FRAMEWORKS.includes(tests);
-    if (hasNoArgs) {
-        return 'none';
-    }
-    else if (hasAllArgs && optionsAreValid) {
-        return 'ok';
-    }
-    else {
-        return 'error';
-    }
-}
-exports.validateUserArgs = validateUserArgs;
 const appChoices = [
     { title: 'A Near Gateway (Web App)', description: 'A multi-chain App that talks with Near contracts and Near components', value: 'gateway' },
     { title: 'A Near Smart Contract', description: 'A smart contract to be deployed in the Near Blockchain', value: 'contract' },
@@ -161,20 +136,20 @@ async function promptAndGetConfig() {
     }
     // process cli args
     let args = await getUserArgs();
-    if (args.contract && (!args.tests || args.frontend)) {
-        return show.argsError();
-    }
-    if (args.frontend && (args.tests || args.contract)) {
-        return show.argsError();
-    }
     // If no args, prompt user
-    if (!args.contract && !args.frontend) {
+    if (!args.projectName) {
         show.welcome();
         args = await getUserAnswers();
     }
+    // Homogenizing terminal args with prompt args
+    args.contract = args.contract || 'none';
+    args.frontend = args.frontend || 'none';
+    args.tests = args.tests || 'none';
+    if (!validateUserArgs(args))
+        return;
     // track user input
-    const { frontend, contract } = args;
-    (0, tracking_1.trackUsage)(frontend, contract);
+    const { frontend, contract, tests } = args;
+    (0, tracking_1.trackUsage)(frontend, contract, tests);
     let path = (0, exports.projectPath)(args.projectName);
     if (fs_1.default.existsSync(path)) {
         return show.directoryExists(path);
@@ -184,4 +159,40 @@ async function promptAndGetConfig() {
 exports.promptAndGetConfig = promptAndGetConfig;
 const projectPath = (projectName) => `${process.cwd()}/${projectName}`;
 exports.projectPath = projectPath;
+const validateUserArgs = (args) => {
+    if (!types_1.FRONTENDS.includes(args.frontend)) {
+        show.argsError(`Invalid frontend type: ${args.frontend}`);
+        return false;
+    }
+    if (!types_1.CONTRACTS.includes(args.contract)) {
+        show.argsError(`Invalid contract type: ${args.contract}`);
+        return false;
+    }
+    if (!types_1.TESTING_FRAMEWORKS.includes(args.tests)) {
+        show.argsError(`Invalid testing framework: ${args.tests}`);
+        return false;
+    }
+    if (!args.projectName) {
+        show.argsError('Please provide a project name');
+        return false;
+    }
+    if ((args.contract === 'none') === (args.frontend === 'none')) {
+        console.log(args.contract, args.frontend);
+        show.argsError('Please create a contract OR a frontend');
+        return false;
+    }
+    if (args.contract !== 'none' && args.tests === 'none') {
+        show.argsError('Please select a testing framework for your contract');
+        return false;
+    }
+    if (args.frontend !== 'none' && args.tests !== 'none') {
+        show.argsError('Remove the --tests flag when creating a frontend');
+        return false;
+    }
+    if (args.contract === 'ts' && args.tests === 'rs') {
+        show.argsError('We currently do not support creating a contract in TS with Rust tests, please create it manually');
+        return false;
+    }
+    return true;
+};
 //# sourceMappingURL=user-input.js.map

package/package.json

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

package/templates/sandbox-tests/sandbox-ts/ava.config.cjs

@@ -1,9 +1,9 @@
-require("util").inspect.defaultOptions.depth = 5; // Increase AVA's printing depth
+require('util').inspect.defaultOptions.depth = 5; // Increase AVA's printing depth
 
 module.exports = {
-  timeout: "300000",
-  files: ["src/*.ava.ts"],
+  timeout: '300000',
+  files: ['src/*.ava.ts'],
   failWithoutAssertions: false,
-  extensions: ["ts"],
-  require: ["ts-node/register"],
+  extensions: ['ts'],
+  require: ['ts-node/register'],
 };