Simplify and update package.json (#835)

Demivan · web-flow · commit ff92080bdc48 · 2023-09-06T18:47:20.000+03:00
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,16 @@
+{
+  "extends": [
+    "@antfu"
+  ],
+  "ignorePatterns": [
+    "node_modules/",
+    "dist/",
+    "coverage/",
+    "pnpm-lock.yaml",
+    "*.js"
+  ],
+  "rules": {
+    "vue/component-definition-name-casing": ["error", "kebab-case"],
+    "n/prefer-global/process": 0
+  }
+}
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "fluent-vue",
+  "type": "module",
   "version": "3.4.0",
   "description": "Internationalization plugin for Vue.js. Project Fluent bindings for Vue.js",
   "author": "Ivan Demchuk <ivan.demchuk@gmail.com>",
@@ -28,30 +29,21 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "types": "./index.d.ts",
-      "production": {
-        "import": "./dist/prod/index.mjs",
-        "require": "./dist/prod/index.cjs"
-      },
-      "import": "./dist/index.mjs",
+      "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     }
   },
-  "main": "dist/index.cjs",
-  "module": "dist/index.mjs",
-  "unpkg": "dist/prod/index.global.js",
-  "jsdelivr": "dist/prod/index.global.js",
-  "types": "index.d.ts",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "unpkg": "dist/index.global.js",
+  "jsdelivr": "dist/index.global.js",
+  "types": "dist/index.d.ts",
   "files": [
-    "index.d.ts",
     "dist",
     "README.md"
   ],
-  "engines": {
-    "node": ">=12.0.0"
-  },
   "scripts": {
-    "build": "rimraf dist && tsup",
+    "build": "tsup",
     "lint": "eslint .",
     "ls-lint": "ls-lint",
     "typecheck": "tsc --noEmit -p tsconfig.json",
diff --git a/src/index.ts b/src/index.ts
@@ -1,3 +1,4 @@
+import './types/volar'
 import type { FluentBundle, FluentVariable } from '@fluent/bundle'
 import { isVue3, shallowRef } from 'vue-demi'
 import type { FluentVueOptions } from './types'
diff --git a/src/types/volar.ts b/src/types/volar.ts
@@ -1,44 +1,45 @@
-import { PropType, DefineComponent, FunctionDirective } from 'vue-demi'
-import { FluentVariable } from '@fluent/bundle'
+import type { DefineComponent, FunctionDirective, PropType } from 'vue-demi'
+import type { FluentVariable } from '@fluent/bundle'
 
 type ComponentType = DefineComponent<{
   /**
    * The key of the translation.
    */
   path: {
-    type: StringConstructor,
-    required: true,
-  },
+    type: StringConstructor
+    required: true
+  }
   /**
    * Arguments to pass to the translation.
    */
   args: {
-    type: PropType<Record<string, FluentVariable>>,
-    default: () => Record<string, FluentVariable>,
-  },
+    type: PropType<Record<string, FluentVariable>>
+    default: () => Record<string, FluentVariable>
+  }
   /**
    * The tag to use as a root element.
    */
   tag: {
-    type: StringConstructor,
-    default: 'span',
-  },
+    type: StringConstructor
+    default: 'span'
+  }
   /**
    * Whether to render translation as html.
    */
   html: {
-    type: BooleanConstructor,
-    default: false,
-  },
+    type: BooleanConstructor
+    default: false
+  }
   /**
    * Whether to render translation without a root element.
    */
   noTag: {
-    type: BooleanConstructor,
-    default: false,
+    type: BooleanConstructor
+    default: false
   }
 }>
 
+// eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
 // @ts-ignore: works on Vue 2, fails in Vue 3
 declare module 'vue/types/vue' {
   export interface Vue {
@@ -47,6 +48,7 @@ declare module 'vue/types/vue' {
   }
 }
 
+// eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
 // @ts-ignore: works on Vue 3, fails in Vue 2
 declare module '@vue/runtime-core' {
   export interface ComponentCustomProperties {
@@ -59,5 +61,3 @@ declare module '@vue/runtime-core' {
     i18n: ComponentType
   }
 }
-
-export * from './dist'
diff --git a/src/util/warn.ts b/src/util/warn.ts
@@ -4,6 +4,5 @@ export function assert(condition: boolean, message: string): asserts condition {
 }
 
 export function warn(message: string, ...args: unknown[]): void {
-  if (process.env.NODE_ENV !== 'production')
-    console.warn(`[fluent-vue] ${message}`, ...args)
+  console.warn(`[fluent-vue] ${message}`, ...args)
 }
diff --git a/tsup.config.ts b/tsup.config.ts
@@ -1,20 +1,8 @@
 import { defineConfig } from 'tsup'
 import GlobalsPlugin from 'esbuild-plugin-globals'
 
-const common = defineConfig({
+export default defineConfig({
   target: 'node12',
-  outExtension: ({ format }) => {
-    if (format === 'iife')
-      return { js: '.global.js' }
-
-    if (format === 'cjs')
-      return { js: '.cjs' }
-
-    if (format === 'esm')
-      return { js: '.mjs' }
-
-    return { js: '.js' }
-  },
   globalName: 'FluentVue',
   splitting: true,
   esbuildPlugins: [
@@ -24,45 +12,8 @@ const common = defineConfig({
     }),
   ],
   external: ['vue-demi', '@fluent/bundle'],
-})
-
-const dev = defineConfig({
-  outDir: 'dist/',
-  env: {
-    NODE_ENV: 'development',
-  },
-})
-
-const prod = defineConfig({
-  outDir: 'dist/prod',
-  env: {
-    NODE_ENV: 'production',
-  },
-  minify: true,
-})
-
-export default defineConfig([{
-  ...common,
   entry: ['src/index.ts', 'src/composition.ts'],
-  format: ['esm', 'cjs'],
+  format: ['esm', 'cjs', 'iife'],
   dts: true,
-  ...dev,
-},
-{
-  ...common,
-  entry: ['src/index.ts', 'src/composition.ts'],
-  format: ['esm', 'cjs'],
-  ...prod,
-},
-{
-  ...common,
-  entry: ['src/index.ts'],
-  format: 'iife',
-  ...dev,
-},
-{
-  ...common,
-  entry: ['src/index.ts'],
-  format: 'iife',
-  ...prod,
-}])
+  clean: true,
+})

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import './types/volar'`
`1`	`2`	`import type { FluentBundle, FluentVariable } from '@fluent/bundle'`
`2`	`3`	`import { isVue3, shallowRef } from 'vue-demi'`
`3`	`4`	`import type { FluentVueOptions } from './types'`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,5 @@ export function assert(condition: boolean, message: string): asserts condition {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`export function warn(message: string, ...args: unknown[]): void {`
`7`		`- if (process.env.NODE_ENV !== 'production')`
`8`		- console.warn(`[fluent-vue] ${message}`, ...args)
	`7`	+ console.warn(`[fluent-vue] ${message}`, ...args)
`9`	`8`	`}`