Merge pull request strapi#17479 from strapi/chore/ts-color-picker-be

neuroo · Jul 28, 2023 · 6c81e74 · 6c81e74
2 parents 7dd36e6 + eb5a978
commit 6c81e74
Show file tree

Hide file tree

Showing 34 changed files with 210 additions and 32 deletions.
diff --git a/jest-preset.front.js b/jest-preset.front.js
@@ -28,7 +28,7 @@ module.exports = {
   setupFilesAfterEnv: ['@strapi/admin-test-utils/after-env'],
   testEnvironment: 'jsdom',
   transform: {
-    '^.+\\.js$': [
+    '^.+\\.(j|t)s(x)?$': [
       '@swc/jest',
       {
         env: {

diff --git a/packages/admin-test-utils/.eslintrc.js b/packages/admin-test-utils/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/cli/create-strapi-app/.eslintrc.js b/packages/cli/create-strapi-app/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/cli/create-strapi-starter/.eslintrc.js b/packages/cli/create-strapi-starter/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/core/data-transfer/.eslintrc.js b/packages/core/data-transfer/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/core/permissions/.eslintrc.js b/packages/core/permissions/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/core/utils/.eslintrc.js b/packages/core/utils/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/generators/app/.eslintrc.js b/packages/generators/app/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/generators/generators/.eslintrc.js b/packages/generators/generators/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/plugins/color-picker/.editorconfig b/packages/plugins/color-picker/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{package.json,*.yml}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/packages/plugins/color-picker/.eslintignore b/packages/plugins/color-picker/.eslintignore
@@ -1,2 +1,3 @@
 node_modules/
 .eslintrc.js
+dist/
diff --git a/packages/plugins/color-picker/.eslintrc.js b/packages/plugins/color-picker/.eslintrc.js
@@ -7,7 +7,7 @@ module.exports = {
     },
     {
       files: ['**/*'],
-      excludedFiles: ['admin/**/*'],
+      excludedFiles: ['admin/**/*', 'server/**/*'],
       extends: ['custom/back'],
     },
   ],

diff --git a/packages/plugins/color-picker/.npmignore b/packages/plugins/color-picker/.npmignore
@@ -0,0 +1,98 @@
+############################
+# OS X
+############################
+
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+.Spotlight-V100
+.Trashes
+._*
+
+############################
+# Linux
+############################
+
+*~
+
+############################
+# Windows
+############################
+
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
+*.cab
+*.msi
+*.msm
+*.msp
+
+############################
+# Packages
+############################
+
+*.7z
+*.csv
+*.dat
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.seed
+*.so
+*.swo
+*.swp
+*.swn
+*.swm
+*.out
+*.pid
+
+############################
+# Logs and databases
+############################
+
+.tmp
+*.log
+*.sql
+*.sqlite
+
+############################
+# Misc.
+############################
+
+*#
+.editorconfig
+.idea
+nbproject
+
+############################
+# Node.js
+############################
+
+lib-cov
+lcov.info
+pids
+logs
+results
+build
+node_modules
+.node_history
+
+############################
+# Tests
+############################
+
+test
+tests
+__tests__
+jest.config.js
diff --git a/packages/plugins/color-picker/package.json b/packages/plugins/color-picker/package.json
@@ -30,7 +30,18 @@
     "react-router-dom": "5.3.4",
     "styled-components": "5.3.3"
   },
+  "files": [
+    "./dist",
+    "./admin",
+    "strapi-admin.js",
+    "strapi-server.js"
+  ],
   "scripts": {
+    "build": "run -T tsc -p server/tsconfig.json --outDir ./dist/server",
+    "build:ts": "run build",
+    "watch": "run -T tsc -w --preserveWatchOutput",
+    "clean": "run -T rimraf ./dist",
+    "prepublishOnly": "yarn clean && yarn build",
     "test:front": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js",
     "test:front:watch": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
     "test:front:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js",

diff --git a/packages/plugins/color-picker/server/.eslintrc.js b/packages/plugins/color-picker/server/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  root: true,
+  extends: ['custom/back/typescript'],
+  parserOptions: {
+    project: ['./server/tsconfig.eslint.json'],
+  },
+};
diff --git a/packages/plugins/color-picker/server/index.js b/packages/plugins/color-picker/server/index.js
diff --git a/packages/plugins/color-picker/server/src/index.ts b/packages/plugins/color-picker/server/src/index.ts
@@ -0,0 +1,5 @@
+import { register } from './register';
+
+export default {
+  register,
+};
diff --git a/...s/plugins/color-picker/server/register.js → ...ugins/color-picker/server/src/register.ts b/...s/plugins/color-picker/server/register.js → ...ugins/color-picker/server/src/register.ts
@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports = ({ strapi }) => {
+export const register = ({ strapi }: any) => {
   strapi.customFields.register({
     name: 'color',
     plugin: 'color-picker',

diff --git a/packages/plugins/color-picker/server/tsconfig.eslint.json b/packages/plugins/color-picker/server/tsconfig.eslint.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "include": ["src"],
+  "exclude": ["node_modules"]
+}
diff --git a/packages/plugins/color-picker/server/tsconfig.json b/packages/plugins/color-picker/server/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "extends": "tsconfig/base.json",
+  "include": ["src"],
+  "exclude": ["node_modules"]
+}
diff --git a/packages/plugins/color-picker/strapi-server.js b/packages/plugins/color-picker/strapi-server.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./server');
+module.exports = require('./dist/server');
diff --git a/packages/providers/audit-logs-local/.eslintrc.js b/packages/providers/audit-logs-local/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/providers/email-amazon-ses/.eslintrc.js b/packages/providers/email-amazon-ses/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/providers/email-mailgun/.eslintrc.js b/packages/providers/email-mailgun/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/providers/email-nodemailer/.eslintrc.js b/packages/providers/email-nodemailer/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/providers/email-sendgrid/.eslintrc.js b/packages/providers/email-sendgrid/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/providers/email-sendmail/.eslintrc.js b/packages/providers/email-sendmail/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/providers/upload-aws-s3/.eslintrc.js b/packages/providers/upload-aws-s3/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/providers/upload-cloudinary/.eslintrc.js b/packages/providers/upload-cloudinary/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/providers/upload-local/.eslintrc.js b/packages/providers/upload-local/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/.../utils/eslint-config-custom/typescript.js → ...s/eslint-config-custom/back/typescript.js b/.../utils/eslint-config-custom/typescript.js → ...s/eslint-config-custom/back/typescript.js
@@ -14,7 +14,7 @@ module.exports = {
     strapi: false,
   },
   rules: {
-    ...require('./back').rules,
+    ...require('../back').rules,
     'node/no-unsupported-features/es-syntax': 'off',
     'node/no-missing-import': 'off',
     // TODO: The following rules from @strapi/eslint-config/typescript are disabled because they're causing problems we need to solve or fix

diff --git a/packages/utils/eslint-config-custom/front/typescript.js b/packages/utils/eslint-config-custom/front/typescript.js
@@ -0,0 +1,26 @@
+const path = require('path');
+
+module.exports = {
+  root: true,
+  // TODO: create a front typescript config in eslint-config and use it here
+  extends: [
+    'airbnb-typescript/base',
+    '../front',
+    'plugin:@typescript-eslint/recommended',
+    /*'plugin:@typescript-eslint/recommended-requiring-type-checking'*/
+  ],
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint'],
+  parserOptions: {
+    project: ['./tsconfig.eslint.json'],
+  },
+  rules: {
+    'react/jsx-filename-extension': [
+      1,
+      {
+        extensions: ['tsx'],
+      },
+    ],
+    'import/extensions': 'off',
+  },
+};
diff --git a/packages/utils/logger/.eslintrc.js b/packages/utils/logger/.eslintrc.js
@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: ['custom/typescript'],
+  extends: ['custom/back/typescript'],
 };
diff --git a/packages/utils/tsconfig/front.json b/packages/utils/tsconfig/front.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "http://json.schemastore.org/tsconfig",
+  "extends": "./base.json",
+  "compilerOptions": {
+    "module": "ESNext",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "jsx": "react-jsx",
+    "noEmit": true
+  }
+}