chore: revert type module (#3172)

tolgee · Mar 9, 2023 · d5ceeb6 · d5ceeb6
1 parent 6e93df0
commit d5ceeb6
Show file tree

Hide file tree

Showing 19 changed files with 111 additions and 48 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -4,8 +4,8 @@
   "description": "Library providing ability to translate messages directly in context of developed application.",
   "main": "./dist/tolgee.cjs.js",
   "module": "./dist/tolgee.esm.js",
+  "svelte": "./dist/tolgee.esm.mjs",
   "types": "./lib/index.d.ts",
-  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/tolgee/tolgee-js"
@@ -23,7 +23,7 @@
   "exports": {
     ".": {
       "require": "./dist/tolgee.cjs.js",
-      "import": "./dist/tolgee.esm.js"
+      "import": "./dist/tolgee.esm.mjs"
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
@@ -24,6 +24,17 @@ export default {
       format: 'esm',
       sourcemap: true,
     },
+    {
+      file: 'dist/tolgee.esm.min.js',
+      format: 'esm',
+      plugins: [terser()],
+      sourcemap: true,
+    },
+    {
+      file: 'dist/tolgee.esm.mjs',
+      format: 'esm',
+      sourcemap: true,
+    },
     {
       file: 'dist/tolgee.esm.min.mjs',
       format: 'esm',

diff --git a/packages/format-icu/package.json b/packages/format-icu/package.json
@@ -4,8 +4,8 @@
   "description": "Tolgee format-icu plugin.",
   "main": "./dist/tolgee-format-icu.cjs.js",
   "module": "./dist/tolgee-format-icu.esm.js",
+  "svelte": "./dist/tolgee-format-icu.esm.mjs",
   "types": "./lib/index.d.ts",
-  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/tolgee/tolgee-js"
@@ -27,7 +27,7 @@
   "exports": {
     ".": {
       "require": "./dist/tolgee-format-icu.cjs.js",
-      "import": "./dist/tolgee-format-icu.esm.js"
+      "import": "./dist/tolgee-format-icu.esm.mjs"
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/format-icu/rollup.config.js b/packages/format-icu/rollup.config.js
@@ -24,6 +24,17 @@ export default {
       format: 'esm',
       sourcemap: true,
     },
+    {
+      file: 'dist/tolgee-format-icu.esm.mjs',
+      format: 'esm',
+      sourcemap: true,
+    },
+    {
+      file: 'dist/tolgee-format-icu.esm.min.js',
+      format: 'esm',
+      plugins: [terser()],
+      sourcemap: true,
+    },
     {
       file: 'dist/tolgee-format-icu.esm.min.mjs',
       format: 'esm',

diff --git a/packages/i18next/.gitignore b/packages/i18next/.gitignore
@@ -2,6 +2,7 @@
 node_modules
 /dist
 /lib
+/coverage
 
 
 # local env files

diff --git a/packages/i18next/jest.config.js → packages/i18next/jest.config.mjs b/packages/i18next/jest.config.js → packages/i18next/jest.config.mjs
diff --git a/packages/i18next/package.json b/packages/i18next/package.json
@@ -4,8 +4,8 @@
   "description": "Tolgee i18n integration.",
   "main": "./dist/tolgee-i18next.cjs.js",
   "module": "./dist/tolgee-i18next.esm.js",
+  "svelte": "./dist/tolgee-i18next.esm.mjs",
   "types": "./lib/index.d.ts",
-  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/tolgee/tolgee-js"
@@ -27,7 +27,7 @@
   "scripts": {
     "build": "rollup -c rollup.config.js && tsc --project tsconfig.prod.json",
     "clean": "rm -rf build build-e2e dist dist-e2e lib",
-    "test": "jest --config ./jest.config.js",
+    "test": "jest --collect-coverage",
     "develop": "concurrently \"rollup -c rollup.config.js -w\" \"tsc --watch --preserveWatchOutput --project tsconfig.prod.json\" ",
     "schema": "openapi-typescript http://localhost:8080/v3/api-docs/All%20Internal%20-%20for%20Tolgee%20Web%20application --output ./src/types/apiSchema.generated.ts",
     "typedoc": "typedoc --entryPointStrategy expand --out docs src/index.ts src/Tolgee.ts src/types.ts src/services/EventEmitter.ts  src/services/Subscription.ts"
@@ -68,7 +68,7 @@
   "exports": {
     ".": {
       "require": "./dist/tolgee-i18next.cjs.js",
-      "import": "./dist/tolgee-i18next.esm.js"
+      "import": "./dist/tolgee-i18next.esm.mjs"
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/i18next/rollup.config.js b/packages/i18next/rollup.config.js
@@ -22,6 +22,17 @@ export default {
       format: 'esm',
       sourcemap: true,
     },
+    {
+      file: 'dist/tolgee-i18next.esm.min.js',
+      format: 'esm',
+      plugins: [terser()],
+      sourcemap: true,
+    },
+    {
+      file: 'dist/tolgee-i18next.esm.mjs',
+      format: 'esm',
+      sourcemap: true,
+    },
     {
       file: 'dist/tolgee-i18next.esm.min.mjs',
       format: 'esm',

diff --git a/packages/react/jest.config.js → packages/react/jest.config.mjs b/packages/react/jest.config.js → packages/react/jest.config.mjs
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -5,7 +5,6 @@
   "main": "./dist/tolgee-react.cjs.js",
   "module": "./dist/tolgee-react.esm.js",
   "types": "lib/index.d.ts",
-  "type": "module",
   "repository": "https://github.com/tolgee/tolgee-js",
   "homepage": "https://tolgee.io",
   "keywords": [
@@ -73,7 +72,7 @@
   "exports": {
     ".": {
       "require": "./dist/tolgee-react.cjs.js",
-      "import": "./dist/tolgee-react.esm.js"
+      "import": "./dist/tolgee-react.esm.mjs"
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/react/rollup.config.js b/packages/react/rollup.config.js
@@ -44,6 +44,19 @@ export default {
       format: 'esm',
       sourcemap: true,
     },
+    {
+      name: '@tolgee/react',
+      file: 'dist/tolgee-react.esm.min.js',
+      format: 'esm',
+      sourcemap: true,
+      plugins: [terser()],
+    },
+    {
+      name: '@tolgee/react',
+      file: 'dist/tolgee-react.esm.mjs',
+      format: 'esm',
+      sourcemap: true,
+    },
     {
       name: '@tolgee/react',
       file: 'dist/tolgee-react.esm.min.mjs',

diff --git a/packages/vue/jest.config.js → packages/vue/jest.config.mjs b/packages/vue/jest.config.js → packages/vue/jest.config.mjs
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -5,7 +5,6 @@
   "module": "dist/tolgee-vue.esm.js",
   "main": "dist/tolgee-vue.cjs.js",
   "types": "lib/index.d.ts",
-  "type": "module",
   "repository": "https://github.com/tolgee/tolgee-js",
   "homepage": "https://tolgee.io",
   "keywords": [
@@ -22,10 +21,10 @@
     "dist": "dist"
   },
   "scripts": {
-    "build": "rollup -c rollup.config.js && tsc --project tsconfig.prod.json",
+    "build": "rollup -c rollup.config.mjs && tsc --project tsconfig.prod.json",
     "clean": "rm -rf build build-e2e dist dist-e2e lib",
     "test": "jest --collect-coverage",
-    "develop": "concurrently \"rollup -c rollup.config.js -w\" \"tsc --watch --preserveWatchOutput --project tsconfig.prod.json\" "
+    "develop": "concurrently \"rollup -c rollup.config.mjs -w\" \"tsc --watch --preserveWatchOutput --project tsconfig.prod.json\" "
   },
   "author": "JanCizmar",
   "license": "MIT",
@@ -55,7 +54,7 @@
     "concurrently": "7.2.2",
     "jest": "^27.3.1",
     "jest-fetch-mock": "^3.0.3",
-    "rollup": "3.15.0",
+    "rollup": "3.18.0",
     "rollup-plugin-bundle-size": "^1.0.3",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-terser": "7.0.2",
@@ -67,7 +66,7 @@
   "exports": {
     ".": {
       "require": "./dist/tolgee-vue.cjs.js",
-      "import": "./dist/tolgee-vue.esm.js"
+      "import": "./dist/tolgee-vue.esm.mjs"
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/vue/rollup.config.js → packages/vue/rollup.config.mjs b/packages/vue/rollup.config.js → packages/vue/rollup.config.mjs
@@ -24,6 +24,19 @@ export default {
       format: 'esm',
       sourcemap: true,
     },
+    {
+      name: '@tolgee/vue',
+      file: 'dist/tolgee-vue.esm.min.js',
+      format: 'esm',
+      sourcemap: true,
+      plugins: [terser()],
+    },
+    {
+      name: '@tolgee/vue',
+      file: 'dist/tolgee-vue.esm.mjs',
+      format: 'esm',
+      sourcemap: true,
+    },
     {
       name: '@tolgee/vue',
       file: 'dist/tolgee-vue.esm.min.mjs',

diff --git a/packages/web/jest.config.js → packages/web/jest.config.mjs b/packages/web/jest.config.js → packages/web/jest.config.mjs
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -5,23 +5,19 @@
   "declaration": true,
   "main": "./index.js",
   "types": "./types/index.d.ts",
-  "type": "module",
   "exports": {
     ".": {
       "production": {
         "require": "./dist/tolgee-web.production.cjs.js",
-        "import": "./dist/tolgee-web.production.esm.js",
-        "svelte": "./dist/tolgee-web.production.esm.js"
+        "import": "./dist/tolgee-web.production.esm.mjs"
       },
       "require": "./index.js",
-      "import": "./dist/tolgee-web.development.esm.js",
-      "svelte": "./dist/tolgee-web.development.esm.js",
+      "import": "./dist/tolgee-web.development.esm.mjs",
       "types": "./types/index.d.ts"
     },
     "./tools": {
       "require": "./dist/tolgee-in-context-tools.cjs.js",
-      "import": "./dist/tolgee-in-context-tools.esm.js",
-      "svelte": "./dist/tolgee-in-context-tools.esm.js",
+      "import": "./dist/tolgee-in-context-tools.esm.mjs",
       "types": "./types/index.d.ts"
     },
     "./package.json": "./package.json"
@@ -33,7 +29,7 @@
   "scripts": {
     "build": "rollup -c rollup.config.js && tsc --project tsconfig.prod.json",
     "clean": "rm -rf build build-e2e dist dist-e2e lib",
-    "test": "jest --config ./jest.config.js --collect-coverage",
+    "test": "jest --collect-coverage",
     "develop": "concurrently \"rollup -c rollup.dev.js -w\" \"tsc --watch --preserveWatchOutput --project tsconfig.prod.json\" ",
     "schema": "openapi-typescript http://localhost:8202/v3/api-docs/Accessible%20with%20API%20key --output ./src/ui/client/apiSchema.generated.ts"
   },

diff --git a/packages/web/tools/package.json b/packages/web/tools/package.json
@@ -1,6 +1,15 @@
 {
   "internal": true,
   "main": "../dist/tolgee-in-context-tools.cjs.js",
-  "module": "../dist/tolgee-in-context-tools.cjs.js",
-  "types": "../types/tools.d.ts"
+  "module": "../dist/tolgee-in-context-tools.esm.js",
+  "svelte": "../dist/tolgee-in-context-tools.esm.mjs",
+  "types": "../types/tools.d.ts",
+  "exports": {
+    ".": {
+      "require": "../dist/tolgee-in-context-tools.cjs.js",
+      "import": "../dist/tolgee-in-context-tools.esm.mjs",
+      "types": "../types/index.d.ts"
+    },
+    "./package.json": "./package.json"
+  }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     node_modules
     /dist
     /lib
+    /coverage
     # local env files
@@ Expand Down @@