Merge branch 'main' of github.com:storyblok/field-plugin

Author: demetriusfeijoo

.github/actions/cli-checks-env/action.yml

@@ -12,9 +12,9 @@ runs:
       shell: bash
     - run: yarn install
       shell: bash
-    - run: yarn workspace @storyblok/field-plugin build
+    - run: yarn build:lib
       shell: bash
     - run: cd packages/field-plugin && npm link
       shell: bash
-    - run: yarn workspace @storyblok/field-plugin-cli build
+    - run: yarn build:cli
       shell: bash

.github/workflows/ci-cli.yml

@@ -18,38 +18,38 @@ jobs:
       - run: |
           yarn workspace @storyblok/field-plugin-cli test
           yarn workspace @storyblok/manifest-helper test
-      - run: yarn workspace @storyblok/field-plugin-cli build
+      - run: yarn build:cli
   standalone-vue2:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Prepare test environment
         uses: ./.github/actions/cli-checks-env
-      - run: npx field-plugin --dir=${{runner.temp}} --pluginName=temp-single-field-plugin --template=vue2 --structure=standalone --packageManager=npm
+      - run: yarn dev:cli --dir=${{runner.temp}} --pluginName=temp-single-field-plugin --template=vue2 --structure=standalone --packageManager=npm
       - run: cd ${{runner.temp}}/temp-single-field-plugin && npm link @storyblok/field-plugin && npm run build
   standalone-vue3:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Prepare test environment
         uses: ./.github/actions/cli-checks-env
-      - run: npx field-plugin --dir=${{runner.temp}} --pluginName=temp-single-field-plugin --template=vue3 --structure=standalone --packageManager=npm
+      - run: yarn dev:cli --dir=${{runner.temp}} --pluginName=temp-single-field-plugin --template=vue3 --structure=standalone --packageManager=npm
       - run: cd ${{runner.temp}}/temp-single-field-plugin && npm link @storyblok/field-plugin && npm run build
   standalone-react:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Prepare test environment
         uses: ./.github/actions/cli-checks-env
-      - run: npx field-plugin --dir=${{runner.temp}} --pluginName=temp-single-field-plugin --template=react --structure=standalone --packageManager=npm
+      - run: yarn dev:cli --dir=${{runner.temp}} --pluginName=temp-single-field-plugin --template=react --structure=standalone --packageManager=npm
       - run: cd ${{runner.temp}}/temp-single-field-plugin && npm link @storyblok/field-plugin && npm run build
   monorepo-vue2:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Prepare test environment
         uses: ./.github/actions/cli-checks-env
-      - run: npx field-plugin --dir=${{runner.temp}} --repoName=temp-monorepo-field-plugin --pluginName=test-plugin --template=vue2 --structure=monorepo --packageManager=npm
+      - run: yarn dev:cli --dir=${{runner.temp}} --repoName=temp-monorepo-field-plugin --pluginName=test-plugin --template=vue2 --structure=monorepo --packageManager=npm
         env:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
       - run: cd ${{runner.temp}}/temp-monorepo-field-plugin && npm link @storyblok/field-plugin && npm run build --workspace=test-plugin
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Prepare test environment
         uses: ./.github/actions/cli-checks-env
-      - run: npx field-plugin --dir=${{runner.temp}} --repoName=temp-monorepo-field-plugin --pluginName=test-plugin --template=vue3 --structure=monorepo --packageManager=npm
+      - run: yarn dev:cli --dir=${{runner.temp}} --repoName=temp-monorepo-field-plugin --pluginName=test-plugin --template=vue3 --structure=monorepo --packageManager=npm
         env:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
       - run: cd ${{runner.temp}}/temp-monorepo-field-plugin && npm link @storyblok/field-plugin && cd packages/test-plugin && npx vite build
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Prepare test environment
         uses: ./.github/actions/cli-checks-env
-      - run: npx field-plugin --dir=${{runner.temp}} --repoName=temp-monorepo-field-plugin --pluginName=test-plugin --template=react --structure=monorepo --packageManager=npm
+      - run: yarn dev:cli --dir=${{runner.temp}} --repoName=temp-monorepo-field-plugin --pluginName=test-plugin --template=react --structure=monorepo --packageManager=npm
         env:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
       - run: cd ${{runner.temp}}/temp-monorepo-field-plugin && npm link @storyblok/field-plugin && npm run build --workspace=test-plugin

.github/workflows/ci-library.yml

@@ -27,4 +27,4 @@ jobs:
           yarn workspace @storyblok/field-plugin test
           yarn workspace @storyblok/manifest-helper test
       - name: Build
-        run: yarn workspace @storyblok/field-plugin build
+        run: yarn build:lib

.github/workflows/npm-publish-cli.yml

@@ -19,7 +19,7 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
       - run: yarn install --immutable
       - name: Build the CLI
-        run: yarn workspace @storyblok/field-plugin-cli build
+        run: yarn build:cli
       - name: Publish the package to NPM
         run: ./scripts/publish.ts cli
         env:

.github/workflows/npm-publish-library.yml

@@ -19,7 +19,7 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
       - run: yarn install --immutable
       - name: Build the library
-        run: yarn workspace @storyblok/field-plugin build
+        run: yarn build:lib
       - name: Copy the root's readme file
         run: cp README.md packages/field-plugin/
       - name: Publish the package to NPM

.gitignore

@@ -2,6 +2,7 @@
 node_modules
 dist
 packages/*/dist
+**/.turbo/
 
 # local env files
 .env.local
@@ -44,4 +45,4 @@ packages/cli/templates/**/.yarn/*
 !packages/cli/templates/**/.yarn/plugins
 !packages/cli/templates/**/.yarn/releases
 !packages/cli/templates/**/.yarn/sdks
-!packages/cli/templates/**/.yarn/versions
+!packages/cli/templates/**/.yarn/versions

.yarnrc.yml

@@ -1,9 +1,11 @@
-defaultSemverRangePrefix: ""
+defaultSemverRangePrefix: ''
 
 nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
+    spec: '@yarnpkg/plugin-workspace-tools'
 
 yarnPath: .yarn/releases/yarn-3.2.4.cjs
+
+nmHoistingLimits: workspaces

CONTRIBUTING.md

@@ -93,10 +93,10 @@ To test the CLI, make any changes under `packages/cli` and then run the followin
 yarn build:cli
 ```
 
-To test the local version of the CLI, run `npx field-plugin <command>`. It is recommended to test the CLI outside of the Field Plugin SDK repository. To do this, run the following:
+To test the local version of the CLI, run `yarn dev:cli <command>`. It is recommended to test the CLI outside of the Field Plugin SDK repository. To do this, run the following:
 
 ```sh
-npx field-plugin create --dir ../<SOME-TEST-DIRECTORY>
+yarn dev:cli create --dir ../<SOME-TEST-DIRECTORY>
 ```
 
 A plugin will be created under the test directory.

eslint.config.js

@@ -58,6 +58,13 @@ export default [
       ],
       'react/prop-types': 'off',
       'vue/multi-word-component-names': 'off',
+      'vue/html-self-closing': 'off',
+    },
+  },
+  {
+    files: ['packages/cli/templates/vue2/**'],
+    rules: {
+      'vue/require-prop-types': 'off',
     },
   },
 ]

package.json

@@ -12,7 +12,7 @@
   "workspaces": [
     "packages/*",
     "packages/cli/templates/*",
-    "packages/field-plugin/helpers/*"
+    "packages/lib-helpers/*"
   ],
   "engines": {
     "yarn": "^3.2.4"
@@ -21,11 +21,11 @@
   "main": "dist/index.js",
   "type": "module",
   "scripts": {
-    "postinstall": "yarn build:lib && yarn prepare-dev-configs",
-    "build": "yarn build:lib && yarn workspaces foreach --exclude @storyblok/field-plugin run build",
-    "build:lib": "yarn workspace @storyblok/field-plugin build",
-    "build:cli": "yarn workspace @storyblok/field-plugin-cli build",
-    "build:sandbox": "yarn build:lib && yarn workspace sandbox build",
+    "postinstall": "yarn build && yarn prepare-dev-configs",
+    "build": "turbo run build",
+    "build:lib": "turbo run build --filter=./packages/field-plugin",
+    "build:cli": "turbo run build --filter=./packages/cli",
+    "build:sandbox": "turbo run build --filter=./packages/sandbox",
     "prepare-dev-configs": "./scripts/prepare-dev-vite-configs.mjs",
     "test": "yarn test:lib",
     "test:lib": "yarn workspace @storyblok/field-plugin test",
@@ -35,6 +35,7 @@
     "check:types": "yarn workspaces foreach run check:types",
     "lint": "eslint .",
     "dev:demo": "yarn workspace demo dev",
+    "dev:cli": "yarn workspace @storyblok/field-plugin-cli dev",
     "dev:lib": "yarn workspace @storyblok/field-plugin dev",
     "dev:sandbox": "yarn workspace sandbox dev",
     "dev:template": "yarn workspace field-plugin-${0}-template dev --config node_modules/.${0}-vite.config.ts",
@@ -48,24 +49,25 @@
     "bump-version": "./scripts/bump-version.ts"
   },
   "devDependencies": {
-    "@eslint/js": "9.11.0",
+    "@eslint/js": "9.11.1",
     "@storyblok/mui": "0.2.0",
-    "@types/node": "18.19.17",
-    "eslint": "9.11.0",
+    "@types/node": "18.19.54",
+    "eslint": "8.57.1",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-react": "7.36.1",
+    "eslint-plugin-react": "7.37.0",
     "eslint-plugin-react-hooks": "4.6.2",
     "eslint-plugin-react-refresh": "0.4.12",
     "eslint-plugin-vue": "9.28.0",
     "globals": "15.9.0",
     "kleur": "4.1.5",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.3",
     "prompts": "2.4.2",
-    "semver": "7.6.0",
+    "semver": "7.6.3",
     "tsx": "3.14.0",
-    "typescript": "^5.3.3",
-    "typescript-eslint": "8.6.0",
-    "vite": "5.1.3",
+    "turbo": "2.1.3",
+    "typescript": "5.6.2",
+    "typescript-eslint": "8.8.0",
+    "vite": "5.4.8",
     "vite-plugin-dts": "1.7.3",
     "vue-eslint-parser": "9.4.3",
     "zx": "7.2.3"