create-near-app 7.0.3 → 8.1.0

package/dist/app.js

@@ -39,14 +39,13 @@ const show = __importStar(require("./messages"));
     const prompt = await (0, user_input_1.promptAndGetConfig)();
     if (prompt === undefined)
         return;
-    const { config: { projectName, contract, frontend, components, install, }, projectPath, } = prompt;
+    const { config: { projectName, contract, frontend, install, }, projectPath, } = prompt;
     show.creatingApp();
     let createSuccess;
     try {
         createSuccess = await (0, make_1.createProject)({
             contract,
             frontend,
-            components,
             templatesDir: path_1.default.resolve(__dirname, '../templates'),
             projectPath,
         });

package/dist/make.js

@@ -32,12 +32,12 @@ 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, components, projectPath, templatesDir }) {
+async function createProject({ contract, frontend, projectPath, templatesDir }) {
     if (contract !== 'none') {
         await createContract({ contract, projectPath, templatesDir });
     }
     else {
-        await createGateway({ frontend, components, projectPath, templatesDir });
+        await createGateway({ frontend, projectPath, templatesDir });
     }
     return true;
 }
@@ -48,14 +48,10 @@ async function createContract({ contract, projectPath, templatesDir }) {
     fs_1.default.mkdirSync(projectPath, { recursive: true });
     await copyDir(sourceContractDir, projectPath);
 }
-async function createGateway({ frontend, components, projectPath, templatesDir }) {
+async function createGateway({ frontend, projectPath, templatesDir }) {
     const sourceFrontendDir = path_1.default.resolve(`${templatesDir}/frontend/${frontend}`);
     fs_1.default.mkdirSync(projectPath, { recursive: true });
     await copyDir(sourceFrontendDir, projectPath);
-    if (components) {
-        const sourceComponentsDir = path_1.default.resolve(`${templatesDir}/frontend/components/${frontend}`);
-        await copyDir(sourceComponentsDir, projectPath);
-    }
 }
 // Wrap `ncp` tool to wait for the copy to finish when using `await`
 function copyDir(source, dest) {

package/dist/messages.js

@@ -16,7 +16,7 @@ const welcome = () => (0, exports.show)((0, chalk_1.default) `
 👋 {bold {green Welcome to Near!}} Learn more: https://docs.near.org/
 🔧 Let's get your project ready.
 {blue ======================================================}
-(${tracking_1.trackingMessage})`);
+(${tracking_1.trackingMessage})\n`);
 exports.welcome = welcome;
 const setupFailed = () => (0, exports.show)((0, chalk_1.default) `{bold {red ==========================================}}
 {red ⛔️ There was a problem during the project setup}.
@@ -30,7 +30,8 @@ const successContractToText = (contract) => contract === 'none'
 exports.successContractToText = successContractToText;
 const frontendTemplates = {
     'next-page': 'NextJS (Classic)',
-    'next-app': 'NextJS (App Router)'
+    'next-app': 'NextJS (App Router)',
+    'vite-react': 'Vite React'
 };
 const successFrontendToText = (frontend) => frontend === 'none'
     ? ''

package/dist/tracking.js

@@ -5,27 +5,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 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 = '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`;
+const POSTHOG_API_KEY = 'phc_95PGQnbyatmj2TBRPWYfhbHfqB6wgZj5QRL8WY9gW20';
+const POSTHOG_API_URL = 'https://eu.i.posthog.com/capture';
+exports.trackingMessage = chalk_1.default.italic('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, components, contract) => {
+const trackUsage = async (frontend, contract) => {
     // prevents logging from CI
     if (process.env.NEAR_ENV === 'ci' || process.env.NODE_ENV === 'ci') {
-        console.log('Mixpanel logging is skipped in CI env');
+        console.log('PostHog logging is skipped in CI env');
         return;
     }
-    try {
-        const mixPanelProperties = {
-            frontend,
-            components,
-            contract,
+    const payload = {
+        distinct_id: 'create-near-app',
+        event: 'error',
+        properties: {
+            engine: process.versions.node,
             os: process.platform,
-            nodeVersion: process.versions.node,
-            timestamp: new Date().toString()
-        };
-        tracker.track('CNA', mixPanelProperties);
+        },
+        timestamp: new Date(),
+    };
+    if (contract !== 'none') {
+        payload.event = 'contract';
+        payload.properties.language = contract;
+    }
+    if (frontend !== 'none') {
+        payload.event = 'frontend';
+        payload.properties.framework = frontend;
+    }
+    const headers = new Headers();
+    headers.append('Content-Type', 'application/json');
+    try {
+        await fetch(POSTHOG_API_URL, {
+            method: 'POST',
+            body: JSON.stringify({
+                api_key: POSTHOG_API_KEY,
+                ...payload,
+            }),
+            headers,
+        });
     }
     catch (e) {
         console.error('Warning: problem while sending tracking data. Error: ', e);

package/dist/types.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.APPS = exports.FRONTENDS = exports.CONTRACTS = void 0;
 exports.CONTRACTS = ['ts', 'rs', 'none'];
-exports.FRONTENDS = ['next-app', 'next-page', 'none'];
+exports.FRONTENDS = ['next-app', 'next-page', 'vite-react', 'none'];
 exports.APPS = ['contract', 'gateway'];
 //# sourceMappingURL=types.js.map

package/dist/user-input.js

@@ -39,14 +39,13 @@ async function getUserArgs() {
         .argument('[projectName]')
         .option('--frontend [next-page|next-app|none]')
         .option('--contract [ts|rs|none]')
-        .option('--components')
         .option('--install')
         .addHelpText('after', 'You can create a frontend or a contract with tests');
     commander_1.program.parse();
     const options = commander_1.program.opts();
     const [projectName] = commander_1.program.args;
-    const { contract, frontend, install, components } = options;
-    return { contract, frontend, components, projectName, install, error: undefined };
+    const { contract, frontend, install } = options;
+    return { contract, frontend, projectName, install, error: undefined };
 }
 exports.getUserArgs = getUserArgs;
 const appChoices = [
@@ -62,10 +61,7 @@ const contractChoices = [
 const frontendChoices = [
     { title: 'NextJs (Classic)', description: 'A web-app built using Next.js Page Router', value: 'next-page' },
     { title: 'NextJS (App Router)', description: 'A web-app built using Next.js new App Router', value: 'next-app' },
-];
-const componentChoices = [
-    { title: 'No', value: false },
-    { title: 'Yes', value: true },
+    { title: 'Vite (React)', description: 'A web-app built using Vite with React', value: 'vite-react' },
 ];
 const appPrompt = {
     type: 'select',
@@ -79,12 +75,6 @@ const frontendPrompt = {
     message: 'Select a framework for your frontend',
     choices: frontendChoices,
 };
-const componentsPrompt = {
-    type: 'select',
-    name: 'components',
-    message: 'Are you planning in using on-chain NEAR Components (aka BOS Components)?',
-    choices: componentChoices,
-};
 const contractPrompt = [
     {
         type: 'select',
@@ -114,19 +104,19 @@ async function getUserAnswers() {
     const { app } = await promptUser(appPrompt);
     if (app === 'gateway') {
         // If gateway, ask for the framework to use
-        const { frontend, components, projectName, install } = await promptUser([frontendPrompt, componentsPrompt, namePrompts, npmPrompt]);
-        return { frontend, components, contract: 'none', projectName, install, error: undefined };
+        const { frontend, projectName, install } = await promptUser([frontendPrompt, namePrompts, npmPrompt]);
+        return { frontend, contract: 'none', projectName, install, error: undefined };
     }
     else {
         // If platform is Window, return the error
         if (process.platform === 'win32') {
-            return { frontend: 'none', components: false, contract: 'none', projectName: '', install: false, error: show.windowsWarning };
+            return { frontend: 'none', contract: 'none', projectName: '', install: false, error: show.windowsWarning };
         }
         // If contract, ask for the language for the contract
         let { contract } = await promptUser(contractPrompt);
         const { projectName } = await promptUser(namePrompts);
         const install = contract === 'ts' ? (await promptUser(npmPrompt)).install : false;
-        return { frontend: 'none', components: false, contract, projectName, install, error: undefined };
+        return { frontend: 'none', contract, projectName, install, error: undefined };
     }
 }
 exports.getUserAnswers = getUserAnswers;
@@ -139,7 +129,7 @@ async function promptAndGetConfig() {
         args = await getUserAnswers();
     }
     if (args.error) {
-        (0, tracking_1.trackUsage)('none', false, 'none');
+        (0, tracking_1.trackUsage)('none', 'none');
         return args.error();
     }
     // Homogenizing terminal args with prompt args
@@ -148,8 +138,8 @@ async function promptAndGetConfig() {
     if (!validateUserArgs(args))
         return;
     // track user input
-    const { frontend, components, contract } = args;
-    (0, tracking_1.trackUsage)(frontend, components, contract);
+    const { frontend, contract } = args;
+    (0, tracking_1.trackUsage)(frontend, contract);
     let path = (0, exports.projectPath)(args.projectName);
     if (fs_1.default.existsSync(path)) {
         return show.directoryExists(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-near-app",
-  "version": "7.0.3",
+  "version": "8.1.0",
   "description": "Quickly scaffold your dApp on NEAR Blockchain",
   "main": "index.js",
   "engines": {
@@ -27,16 +27,15 @@
     "chalk": "^4.1.2",
     "commander": "^11.0.0",
     "cross-spawn": "^7.0.3",
-    "mixpanel": "^0.18.0",
     "ncp": "^2.0.0",
     "prompts": "^2.4.2",
     "semver": "^7.5.3"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.22.5",
     "@babel/core": "^7.23.2",
-    "@babel/plugin-transform-react-jsx": "^7.22.15",
+    "@babel/eslint-parser": "^7.22.5",
     "@babel/plugin-syntax-flow": "^7.22.5",
+    "@babel/plugin-transform-react-jsx": "^7.22.15",
     "@commitlint/cli": "^17.6.6",
     "@commitlint/config-conventional": "^17.6.6",
     "@release-it/conventional-changelog": "^5.1.1",

package/templates/contracts/rs/.github/workflows/deploy-production.yml

@@ -0,0 +1,27 @@
+name: Deploy to production
+on:
+  push:
+    branches: [main]
+
+jobs:
+  test:
+    uses: ./.github/workflows/test.yml
+
+  deploy-staging:
+    name: Deploy to production
+    needs: [test]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install cargo-near CLI
+        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/download/cargo-near-v0.13.2/cargo-near-installer.sh | sh
+      - name: Deploy to production
+        run: |
+          cargo near deploy build-reproducible-wasm "${{ vars.NEAR_CONTRACT_PRODUCTION_ACCOUNT_ID }}" \
+            without-init-call \
+            network-config "${{ vars.NEAR_CONTRACT_PRODUCTION_NETWORK }}" \
+            sign-with-plaintext-private-key \
+              --signer-public-key "${{ vars.NEAR_CONTRACT_PRODUCTION_ACCOUNT_PUBLIC_KEY }}" \
+              --signer-private-key "${{ secrets.NEAR_CONTRACT_PRODUCTION_ACCOUNT_PRIVATE_KEY }}" \
+            send

package/templates/contracts/rs/.github/workflows/deploy-staging.yml

@@ -0,0 +1,56 @@
+name: Deploy to staging
+on:
+  pull_request:
+
+jobs:
+  test:
+    uses: ./.github/workflows/test.yml
+
+  deploy-staging:
+    name: Deploy to staging subaccount
+    permissions:
+      pull-requests: write
+    needs: [test]
+    runs-on: ubuntu-latest
+    env:
+      NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID: gh-${{ github.event.number }}.${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_ID }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install near CLI
+        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/near-cli-rs/releases/download/v0.11.1/near-cli-rs-installer.sh | sh
+      - name: Create staging account
+        if: github.event.action == 'opened' || github.event.action == 'reopened'
+        run: |
+          near account create-account fund-myself "${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }}" '10 NEAR' \
+            use-manually-provided-public-key "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_PUBLIC_KEY }}" \
+            sign-as "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_ID }}" \
+            network-config "${{ vars.NEAR_CONTRACT_STAGING_NETWORK }}" \
+            sign-with-plaintext-private-key \
+              --signer-public-key "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_PUBLIC_KEY }}" \
+              --signer-private-key "${{ secrets.NEAR_CONTRACT_STAGING_ACCOUNT_PRIVATE_KEY }}" \
+            send
+
+      - name: Install cargo-near CLI
+        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/download/cargo-near-v0.13.2/cargo-near-installer.sh | sh
+      - name: Deploy to staging
+        # `--skip-git-remote-check` was used
+        # as pull request git refs `refs/pull/NUMBER/merge` are somewhat harder to access and live only as long as PRs do
+        # 
+        # WASM reproducibility check akin to SourceScan won't be available for staging contracts, deployed from PRs 
+        run: |
+          cargo near deploy build-reproducible-wasm --skip-git-remote-check "${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }}" \
+            without-init-call \
+            network-config "${{ vars.NEAR_CONTRACT_STAGING_NETWORK }}" \
+            sign-with-plaintext-private-key \
+              --signer-public-key "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_PUBLIC_KEY }}" \
+              --signer-private-key "${{ secrets.NEAR_CONTRACT_STAGING_ACCOUNT_PRIVATE_KEY }}" \
+            send
+
+      - name: Comment on pull request
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh pr comment "${{ github.event.number }}" --body "Staging contract is deployed to ["'`'"${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }}"'`'" account](https://explorer.${{ vars.NEAR_CONTRACT_STAGING_NETWORK }}.near.org/accounts/${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }})"

package/templates/contracts/rs/.github/workflows/test.yml

@@ -0,0 +1,32 @@
+name: Test
+on:
+  workflow_call:
+
+jobs:
+  code-formatting:
+    name: Code Formatting
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - run: cargo fmt --check
+
+  code-linter:
+    name: Code Linter
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run cargo clippy
+        run: |
+          rustup component add clippy
+          cargo clippy --all-features --workspace --tests -- --warn clippy::all --warn clippy::nursery
+
+  tests:
+    name: Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Run cargo test
+        run: cargo test

package/templates/contracts/rs/.github/workflows/undeploy-staging.yml

@@ -0,0 +1,25 @@
+name: Undeploy staging
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  cleanup-staging:
+    name: Cleanup staging account
+    runs-on: ubuntu-latest
+    env:
+      NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID: gh-${{ github.event.number }}.${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_ID }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install near CLI
+        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/near-cli-rs/releases/download/v0.11.1/near-cli-rs-installer.sh | sh
+      - name: Remove staging account
+        run: |
+          near account delete-account "${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }}" \
+            beneficiary "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_ID }}" \
+            network-config "${{ vars.NEAR_CONTRACT_STAGING_NETWORK }}" \
+            sign-with-plaintext-private-key \
+              --signer-public-key "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_PUBLIC_KEY }}" \
+              --signer-private-key "${{ secrets.NEAR_CONTRACT_STAGING_ACCOUNT_PRIVATE_KEY }}" \
+            send