Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions .github/workflows/ci-shopify-next-tailwind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
paths:
- 'starters/shopify-next-tailwind/**'

permissions:
contents: read

jobs:
format-check:
runs-on: ubuntu-latest
Expand All @@ -23,13 +26,13 @@ jobs:
with:
fetch-depth: 0

- name: Use Node.js
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
cache: ''

- name: Install dependencies
- name: Install dependencies
run: npm i
working-directory: starters/shopify-next-tailwind

Expand All @@ -39,13 +42,6 @@ jobs:

build:
runs-on: ubuntu-latest
env:
SESSION_SECRET: ${{ secrets.SHOPIFY_NEXT_SESSION_SECRET }}
STOREFRONT_API_KEY: ${{ secrets.SHOPIFY_NEXT_STOREFRONT_API_KEY }}
STOREFRONT_API_SECRET: ${{ secrets.SHOPIFY_NEXT_STOREFRONT_API_SECRET }}
PUBLIC_STOREFRONT_API_TOKEN: ${{ secrets.SHOPIFY_NEXT_PUBLIC_STOREFRONT_API_TOKEN }}
PUBLIC_STOREFRONT_API_VERSION: ${{ secrets.SHOPIFY_NEXT_PUBLIC_STOREFRONT_API_VERSION }}
PUBLIC_STORE_DOMAIN: ${{ secrets.SHOPIFY_NEXT_PUBLIC_STORE_DOMAIN }}

needs:
- format-check
Expand Down Expand Up @@ -75,5 +71,13 @@ jobs:
working-directory: starters/shopify-next-tailwind

- name: Build Project
if: github.event_name == 'push'
run: npm run build
working-directory: starters/shopify-next-tailwind
working-directory: starters/shopify-next-tailwind
env:
SESSION_SECRET: ${{ secrets.SHOPIFY_NEXT_SESSION_SECRET }}
STOREFRONT_API_KEY: ${{ secrets.SHOPIFY_NEXT_STOREFRONT_API_KEY }}
STOREFRONT_API_SECRET: ${{ secrets.SHOPIFY_NEXT_STOREFRONT_API_SECRET }}
PUBLIC_STOREFRONT_API_TOKEN: ${{ secrets.SHOPIFY_NEXT_PUBLIC_STOREFRONT_API_TOKEN }}
PUBLIC_STOREFRONT_API_VERSION: ${{ secrets.SHOPIFY_NEXT_PUBLIC_STOREFRONT_API_VERSION }}
PUBLIC_STORE_DOMAIN: ${{ secrets.SHOPIFY_NEXT_PUBLIC_STORE_DOMAIN }}
46 changes: 33 additions & 13 deletions packages/create-starter/src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'path';
import fs from 'fs/promises';
import { exec } from 'child_process';
import { execFile } from 'child_process';

export async function fileExists(path: string) {
try {
Expand All @@ -15,23 +15,43 @@ export async function fileExists(path: string) {
}
}

export async function initGitRepo(path: string, packageManager: string) {
function run(command: string, args: string[], cwd: string): Promise<void> {
return new Promise((resolve, reject) => {
exec(
`cd ${path} && git init && ${packageManager} ${
packageManager === 'deno' ? 'cache --lock=deno.lock --lock-write deps.ts' : 'install'
} && git add . && git commit -m 'init commit generated by starter.dev CLI' && cd ../`,
(err) => {
if (err) {
reject(err);
} else {
resolve(undefined);
}
execFile(command, args, { cwd }, (err) => {
if (err) {
reject(err);
} else {
resolve();
}
);
});
});
}

export async function initGitRepo(directoryPath: string, packageManager: string) {
const packageManagerExecutables = {
deno: 'deno',
npm: 'npm',
pnpm: 'pnpm',
yarn: 'yarn',
} as const;
const packageManagerExecutable = packageManagerExecutables[packageManager as keyof typeof packageManagerExecutables];

if (!packageManagerExecutable) {
throw new Error(`Unsupported package manager: ${packageManager}`);
}

await run('git', ['init'], directoryPath);
const packageManagerArgs = packageManager === 'deno' ? ['cache', '--lock=deno.lock', '--lock-write', 'deps.ts'] : ['install'];

if (process.platform === 'win32' && packageManager !== 'deno') {
await run('cmd.exe', ['/d', '/s', '/c', packageManagerExecutable, ...packageManagerArgs], directoryPath);
} else {
await run(packageManagerExecutable, packageManagerArgs, directoryPath);
}
await run('git', ['add', '.'], directoryPath);
await run('git', ['commit', '-m', 'init commit generated by starter.dev CLI'], directoryPath);
}

export async function removeLockFileIfExists(fileName: string, directoryPath: string): Promise<boolean> {
let removed: boolean;
try {
Expand Down
7 changes: 0 additions & 7 deletions packages/metrics-handler/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ provider:
environment:
GOOGLE_ANALYTICS_API_SECRET: ${env:GOOGLE_ANALYTICS_API_SECRET}
GOOGLE_ANALYTICS_MEASUREMENT_ID: ${env:GOOGLE_ANALYTICS_MEASUREMENT_ID}
iam:
role:
statements:
- Effect: 'Allow'
Resource: 'arn:aws:lambda:*:*:*'
Action:
- lambda:InvokeFunction
tracing:
apiGateway: true
lambda: true
Expand Down
Loading