Skip to content
Merged
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
40 changes: 40 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
version: 2

updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
time: "09:00"
timezone: "America/Guayaquil"
open-pull-requests-limit: 10
target-branch: "development"
groups:
strapi:
patterns:
- "@strapi/*"
dnd-kit:
patterns:
- "@dnd-kit/*"
react:
patterns:
- "react"
- "react-dom"
- "@types/react"
- "@types/react-dom"
ignore:
- dependency-name: "@strapi/strapi"
update-types: ["version-update:semver-major"]
- dependency-name: "@strapi/design-system"
update-types: ["version-update:semver-major"]

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
time: "09:00"
timezone: "America/Guayaquil"
open-pull-requests-limit: 5
target-branch: "development"
51 changes: 51 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: CI

on:
push:
branches:
- main
- development
- production
pull_request:
workflow_call:

jobs:
ci:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
run: npm ci

- name: Type check (server)
run: npm run test:ts:back

- name: Type check (admin)
run: npm run test:ts:front

- name: Build
run: npm run build

- name: Verify plugin
run: npm run verify

- name: Check version not already published
run: |
VERSION=$(node -p "require('./package.json').version")
if npm view strapi-plugin-form-builder-cms@$VERSION version 2>/dev/null; then
echo "❌ Version $VERSION is already published on npm. Bump the version before merging."
exit 1
fi
echo "✅ Version $VERSION is not yet published."

- name: Dry run publish
run: npm publish --dry-run --access public
20 changes: 19 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
jobs:
publish:
if: github.event.pull_request.merged == true
needs: ci
runs-on: ubuntu-latest

steps:
Expand All @@ -31,8 +32,22 @@ jobs:
id: pkg
run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT

- name: Set npm tag
id: tag
run: |
VERSION=$(node -p "require('./package.json').version")
if [[ "$VERSION" == *"alpha"* ]]; then
echo "tag=alpha" >> $GITHUB_OUTPUT
elif [[ "$VERSION" == *"beta"* ]]; then
echo "tag=beta" >> $GITHUB_OUTPUT
elif [[ "$VERSION" == *"rc"* ]]; then
echo "tag=rc" >> $GITHUB_OUTPUT
else
echo "tag=latest" >> $GITHUB_OUTPUT
fi

- name: Publish to npm
run: npm publish --access public
run: npm publish --access public --tag ${{ steps.tag.outputs.tag }}
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

Expand All @@ -44,3 +59,6 @@ jobs:
body: |
Published from PR #${{ github.event.pull_request.number }}: ${{ github.event.pull_request.title }}
generate_release_notes: true

ci:
uses: ./.github/workflows/ci.yml
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ public/uploads/*
dist
build

# Compiled JS files inside src (TypeScript sources only)
server/src/**/*.js
admin/src/**/*.js


############################
# Node.js
Expand Down
2 changes: 1 addition & 1 deletion admin/src/components/DropZone.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function SortableFieldRow({
{...attributes}
{...listeners}
style={{ cursor: 'grab', color: 'var(--strapi-neutral-400)', padding: '0 4px' }}
onClick={(e) => e.stopPropagation()}
onClick={(e: React.MouseEvent) => e.stopPropagation()}
>
<Drag />
</Box>
Expand Down
2 changes: 1 addition & 1 deletion admin/src/components/EmbedModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function EmbedModal({ formId, open, onClose }: Props) {
};

return (
<Modal.Root open={open} onOpenChange={(v) => !v && onClose()}>
<Modal.Root open={open} onOpenChange={(v: boolean) => !v && onClose()}>
<Modal.Content style={{ maxWidth: 600, width: '100%' }}>
<Modal.Header>
<Typography variant="beta">Embed this form</Typography>
Expand Down
2 changes: 1 addition & 1 deletion admin/src/components/FieldSettingsPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ export function FieldSettingsPanel({ field, onChange }: Props) {
<Field.Root style={{ flex: 1 }}>
<SingleSelect
value={rule.type}
onChange={(val) => updateValidation(i, { type: String(val), value: undefined, message: '' })}
onChange={(val: string | number) => updateValidation(i, { type: String(val), value: undefined, message: '' })}
size="S"
>
{available.map((opt) => (
Expand Down
2 changes: 1 addition & 1 deletion admin/src/components/FormPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ export function FormPreview({ title, fields, settings, open, onClose }: Props) {
if (!open) return null;

return (
<Modal.Root open={open} onOpenChange={(v) => !v && onClose()}>
<Modal.Root open={open} onOpenChange={(v: boolean) => !v && onClose()}>
<Modal.Content style={{ maxWidth: 760, width: '100%' }}>
<Modal.Header>
<Typography variant="beta">Preview — {title}</Typography>
Expand Down
2 changes: 1 addition & 1 deletion admin/src/pages/SubmissionsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export function SubmissionsPage() {
<SingleSelect
aria-label="Filter by status"
value={statusFilter}
onChange={(val) => setStatusFilter(String(val))}
onChange={(val: string | number) => setStatusFilter(String(val))}
placeholder="All statuses"
size="S"
>
Expand Down
37 changes: 26 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
{
"version": "0.0.0",
"keywords": [],
"name": "strapi-plugin-form-builder-cms",
"version": "1.0.0-alpha.1",
"description": "Visual drag-and-drop form builder plugin for Strapi 5. Create, publish and embed forms on any website.",
"keywords": [
"strapi",
"strapi-plugin",
"form-builder",
"forms",
"drag-and-drop",
"cms"
],
"license": "MIT",
"author": "dev.cluna <dev.cluna@gmail.com>",
"repository": {
"type": "git",
"url": "git+https://github.com/devCluna/strapi-plugin-form-builder-cms.git"
},
"bugs": {
"url": "https://github.com/devCluna/strapi-plugin-form-builder-cms/issues"
},
"homepage": "https://github.com/devCluna/strapi-plugin-form-builder-cms#readme",
"type": "commonjs",
"exports": {
"./package.json": "./package.json",
Expand All @@ -27,8 +46,8 @@
"watch": "strapi-plugin watch",
"watch:link": "strapi-plugin watch:link",
"verify": "strapi-plugin verify",
"test:ts:front": "run -T tsc -p admin/tsconfig.json",
"test:ts:back": "run -T tsc -p server/tsconfig.json"
"test:ts:front": "npx tsc -p admin/tsconfig.json --noEmit",
"test:ts:back": "npx tsc -p server/tsconfig.json --noEmit"
},
"dependencies": {
"@dnd-kit/core": "^6.3.1",
Expand Down Expand Up @@ -67,11 +86,7 @@
"strapi": {
"kind": "plugin",
"name": "strapi-plugin-form-builder-cms",
"displayName": "",
"description": ""
},
"name": "strapi-plugin-form-builder-cms",
"description": "",
"license": "MIT",
"author": "dev.cluna <dev.cluna@gmail.com>"
"displayName": "Form Builder CMS",
"description": "Visual drag-and-drop form builder plugin for Strapi 5"
}
}
Loading