Merge pull request #280 from Flagsmith/chore/combine-packages

chore: combine packages

Author: kyle-ssg

lib/.gitignore

@@ -1,3 +1,5 @@
 *.js
 *.ts
+*.mjs
+*.mjs.map
 *.tsx

lib/flagsmith-es/package-lock.json

@@ -0,0 +1,30 @@
+<img width="100%" src="https://github.com/Flagsmith/flagsmith/raw/main/static-files/hero.png"/>
+
+# Flagsmith Javascript Client
+
+[![npm version](https://badge.fury.io/js/flagsmith.svg)](https://badge.fury.io/js/flagsmith)
+[![](https://data.jsdelivr.com/v1/package/npm/flagsmith/badge)](https://www.jsdelivr.com/package/npm/flagsmith)
+
+The web and SSR SDK clients for [https://www.flagsmith.com/](https://www.flagsmith.com/). Flagsmith allows you to manage feature flags and remote config across multiple projects, environments and organisations.
+
+## Adding to your project
+
+For full documentation visit [https://docs.flagsmith.com/clients/javascript/](https://docs.flagsmith.com/clients/javascript/)
+
+## Contributing
+
+Please read [CONTRIBUTING.md](https://gist.github.com/kyle-ssg/c36a03aebe492e45cbd3eefb21cb0486) for details on our code of conduct, and the process for submitting pull requests to us.
+
+## Getting Help
+
+If you encounter a bug or feature request we would like to hear about it. Before you submit an issue please search existing issues in order to prevent duplicates. 
+
+## Get in touch
+
+If you have any questions about our projects you can email <a href="mailto:support@flagsmith.com">support@flagsmith.com</a>.
+
+## Useful links
+
+[Website](https://www.flagsmith.com/)
+
+[Documentation](https://docs.flagsmith.com/)

lib/flagsmith-es/package.json

@@ -1,8 +1,33 @@
 {
   "name": "flagsmith",
-  "version": "8.0.3",
+  "version": "9.0.0",
   "description": "Feature flagging to support continuous development",
   "main": "./index.js",
+  "module": "./index.mjs",
+  "browser": "./index.js",
+  "types": "./index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./index.js",
+      "browser": "./index.js"
+    },
+    "./isomorphic": {
+      "import": "./isomorphic.mjs",
+      "require": "./isomorphic.js",
+      "browser": "./isomorphic.js"
+    },
+    "./react": {
+      "import": "./react.mjs",
+      "require": "./react.js",
+      "browser": "./react.js"
+    },
+    "./next-middleware": {
+      "import": "./next-middleware.mjs",
+      "require": "./next-middleware.js",
+      "browser": "./next-middleware.js"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/Flagsmith/flagsmith-js-client"
@@ -11,11 +36,10 @@
     "feature flagger",
     "continuous deployment"
   ],
-  "author": "Flagsmith Ltd",
+  "author": "Flagsmith",
   "license": "BSD-3-Clause",
   "bugs": {
     "url": "https://github.com/Flagsmith/flagsmith-js-client/issues"
   },
-  "homepage": "https://flagsmith.com",
-  "types": "./index.d.ts"
+  "homepage": "https://flagsmith.com"
 }

lib/flagsmith-es/src/readme.md

@@ -0,0 +1,30 @@
+<img width="100%" src="https://github.com/Flagsmith/flagsmith/raw/main/static-files/hero.png"/>
+
+# Flagsmith React Native Client
+
+[![npm version](https://badge.fury.io/js/flagsmith.svg)](https://badge.fury.io/js/react-native-flagsmith)
+[![](https://data.jsdelivr.com/v1/package/npm/flagsmith/badge)](https://www.jsdelivr.com/package/npm/flagsmith)
+
+The React Native SDK client for [https://www.flagsmith.com/](https://www.flagsmith.com/). Flagsmith allows you to manage feature flags and remote config across multiple projects, environments and organisations.
+
+## Adding to your project
+
+For full documentation visit [https://docs.flagsmith.com/clients/javascript/#npm-for-react-native](https://docs.flagsmith.com/clients/javascript/#npm-for-react-native)
+
+## Contributing
+
+Please read [CONTRIBUTING.md](https://gist.github.com/kyle-ssg/c36a03aebe492e45cbd3eefb21cb0486) for details on our code of conduct, and the process for submitting pull requests to us.
+
+## Getting Help
+
+If you encounter a bug or feature request we would like to hear about it. Before you submit an issue please search existing issues in order to prevent duplicates. 
+
+## Get in touch
+
+If you have any questions about our projects you can email <a href="mailto:support@flagsmith.com">support@flagsmith.com</a>.
+
+## Useful links
+
+[Website](https://www.flagsmith.com/)
+
+[Documentation](https://docs.flagsmith.com/)

lib/flagsmith/README.md

@@ -1,18 +1,17 @@
 {
   "name": "react-native-flagsmith",
-  "version": "8.0.3",
+  "version": "9.0.0",
   "description": "Feature flagging to support continuous development",
   "main": "./index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/Flagsmith/flagsmith-js-client/"
   },
   "keywords": [
-    "react native",
     "feature flagger",
     "continuous deployment"
   ],
-  "author": "SSG",
+  "author": "Flagsmith",
   "license": "BSD-3-Clause",
   "bugs": {
     "url": "https://github.com/Flagsmith/flagsmith-js-client/issues"

lib/flagsmith/package.json

@@ -2,12 +2,6 @@ const path = require("path")
 const fs = require("fs")
 const fsExtra = require('fs-extra')
 
-const replaceInFileSync = (file, from, to) => {
-    const data = fs.readFileSync(file, 'utf8');
-    const newData = data.replace(new RegExp(from, 'g'), to);
-    fs.writeFileSync(file, newData, { encoding: "utf8" });
-}
-
 // Copy source files to lib/flagsmith/src
 fs.copyFileSync(path.join(__dirname,"index.ts"),path.join(__dirname,"lib/flagsmith/src/index.ts"))
 fs.copyFileSync(path.join(__dirname,"flagsmith-core.ts"),path.join(__dirname,"lib/flagsmith/src/flagsmith-core.ts"))
@@ -17,23 +11,13 @@ fs.copyFileSync(path.join(__dirname,"react.tsx"),path.join(__dirname,"lib/flagsm
 fs.copyFileSync(path.join(__dirname,"react.tsx"),path.join(__dirname,"lib/react-native-flagsmith/src/react.tsx"))
 fs.copyFileSync(path.join(__dirname,"react.d.ts"),path.join(__dirname,"lib/react-native-flagsmith/react.d.ts"))
 fs.copyFileSync(path.join(__dirname,"react.d.ts"),path.join(__dirname,"lib/flagsmith/react.d.ts"))
-fs.copyFileSync(path.join(__dirname,"react.d.ts"),path.join(__dirname,"lib/flagsmith-es/react.d.ts"))
 fs.copyFileSync(path.join(__dirname,"index.d.ts"),path.join(__dirname,"lib/react-native-flagsmith/index.d.ts"))
 fs.copyFileSync(path.join(__dirname,"index.d.ts"),path.join(__dirname,"lib/flagsmith/index.d.ts"))
-fs.copyFileSync(path.join(__dirname,"index.d.ts"),path.join(__dirname,"lib/flagsmith-es/index.d.ts"))
 
 // Copy source files to lib/react-native-flagsmith/src
 fs.copyFileSync(path.join(__dirname,"index.react-native.ts"),path.join(__dirname,"lib/react-native-flagsmith/src/index.react-native.ts"))
 fs.copyFileSync(path.join(__dirname,"flagsmith-core.ts"),path.join(__dirname,"lib/react-native-flagsmith/src/flagsmith-core.ts"))
 
-// fix flagsmith es sourcemap
-fs.copyFileSync(path.join(__dirname,"index-es.ts"),path.join(__dirname,"lib/flagsmith-es/src/index-es.ts"))
-fs.copyFileSync(path.join(__dirname,"flagsmith-core.ts"),path.join(__dirname,"lib/flagsmith-es/src/flagsmith-core.ts"))
-fs.copyFileSync(path.join(__dirname,"isomorphic-es.ts"),path.join(__dirname,"lib/flagsmith-es/src/isomorphic-es.ts"))
-
-
-
-
 const files= fs.readdirSync(path.join(__dirname, "lib/flagsmith"));
 files.forEach((fileName)=>{
     console.log(fileName)
@@ -42,77 +26,23 @@ files.forEach((fileName)=>{
     }
 })
 
-// fix paths in flagsmith/index.js sourcemaps
-replaceInFileSync(path.join(__dirname, "lib/flagsmith/index.js.map"),"../../../flagsmith-core.ts","./src/flagsmith-core.ts"  )
-replaceInFileSync(path.join(__dirname, "lib/flagsmith/index.js.map"),"../../../index.ts","./src/index.ts"  )
-replaceInFileSync(path.join(__dirname, "lib/flagsmith/index.js.map"),"../../../utils","./src/utils"  )
-replaceInFileSync(path.join(__dirname, "lib/flagsmith-es/index.js.map"),"../../../utils","./src/utils"  )
-replaceInFileSync(path.join(__dirname, "lib/react-native-flagsmith/index.js.map"),"../../../utils","./src/utils"  )
-replaceInFileSync(path.join(__dirname, "lib/flagsmith/react.js.map"),"../../../utils","./src/utils"  )
-replaceInFileSync(path.join(__dirname, "lib/flagsmith-es/react.js.map"),"../../../utils","./src/utils"  )
-replaceInFileSync(path.join(__dirname, "lib/react-native-flagsmith/react.js.map"),"../../../utils","./src/utils"  )
-
-// fix paths in flagsmith-es/index.js sourcemaps
-replaceInFileSync(path.join(__dirname, "lib/flagsmith-es/index.js.map"),"../../../flagsmith-core.ts","./src/flagsmith-core.ts"  )
-replaceInFileSync(path.join(__dirname, "lib/flagsmith-es/index.js.map"),"../../../index-es.ts","./src/index-es.ts"  )
-
-// fix paths in flagsmith/next-middleware.js sourcemaps
-replaceInFileSync(path.join(__dirname, "lib/flagsmith/next-middleware.js.map"),"../../../flagsmith-core.ts","./src/flagsmith-core.ts"  )
-replaceInFileSync(path.join(__dirname, "lib/flagsmith/next-middleware.js.map"),"../../../next-middleware.ts","./src/next-middleware.ts"  )
-
-// fix paths in flagsmith-es/next-middleware.js sourcemaps
-replaceInFileSync(path.join(__dirname, "lib/flagsmith-es/next-middleware.js.map"),"../../../flagsmith-core.ts","./src/flagsmith-core.ts"  )
-replaceInFileSync(path.join(__dirname, "lib/flagsmith-es/next-middleware.js.map"),"../../../next-middleware.ts","./src/next-middleware.ts"  )
-
-// fix paths in flagsmith/isomorphic.js sourcemaps
-replaceInFileSync(path.join(__dirname, "lib/flagsmith/isomorphic.js.map"),"../../../flagsmith-core.ts","./src/flagsmith-core.ts"  )
-replaceInFileSync(path.join(__dirname, "lib/flagsmith/isomorphic.js.map"),"../../../isomorphic.ts","./src/isomorphic.ts"  )
-
-// fix paths in flagsmith-es/isomorphic.js sourcemaps
-replaceInFileSync(path.join(__dirname, "lib/flagsmith-es/isomorphic.js.map"),"../../../flagsmith-core.ts","./src/flagsmith-core.ts"  )
-replaceInFileSync(path.join(__dirname, "lib/flagsmith-es/isomorphic.js.map"),"../../../isomorphic-es.ts","./src/isomorphic-es.ts"  )
-
-// fix paths in react-native-flagsmith/index.js sourcemaps
-replaceInFileSync(path.join(__dirname, "lib/react-native-flagsmith/index.js.map"),"../../../flagsmith-core.ts","./src/flagsmith-core.ts"  )
-replaceInFileSync(path.join(__dirname, "lib/react-native-flagsmith/index.js.map"),"../../index.react-native.ts","./src/index.react-native.ts"  )
-
-
-// fix paths in flagsmith/react.js sourcemaps
-replaceInFileSync(path.join(__dirname, "lib/flagsmith/react.js.map"),"../../../react.tsx","./src/react.tsx"  )
-replaceInFileSync(path.join(__dirname, "lib/react-native-flagsmith/react.js.map"),"../../../react.tsx","./src/react.tsx"  )
-
-// fix paths in flagsmith-es/react.js sourcemaps
-replaceInFileSync(path.join(__dirname, "lib/flagsmith-es/react.js.map"),"../../../react.tsx","./src/react.tsx"  )
-
-
 // copy types.d
 fs.copyFileSync(path.join(__dirname,"types.d.ts"),path.join(__dirname,"lib/flagsmith/src/types.d.ts"))
-fs.copyFileSync(path.join(__dirname,"types.d.ts"),path.join(__dirname,"lib/flagsmith-es/src/types.d.ts"))
 fs.copyFileSync(path.join(__dirname,"types.d.ts"),path.join(__dirname,"lib/react-native-flagsmith/src/types.d.ts"))
 
 fs.copyFileSync(path.join(__dirname,"types.d.ts"),path.join(__dirname,"lib/flagsmith/types.d.ts"))
-fs.copyFileSync(path.join(__dirname,"types.d.ts"),path.join(__dirname,"lib/flagsmith-es/types.d.ts"))
 fs.copyFileSync(path.join(__dirname,"types.d.ts"),path.join(__dirname,"lib/react-native-flagsmith/types.d.ts"))
 
-
-//Rollup can't ignore lib d.ts files
-try {
-    fs.rmdirSync(path.join(__dirname,"lib/flagsmith-es/lib"), {recursive:true})
-} catch (e){}
 try {
     fs.rmdirSync(path.join(__dirname,"lib/flagsmith/lib"), {recursive:true})
 } catch (e){}
 try {
     fs.rmdirSync(path.join(__dirname,"lib/react-native-flagsmith/lib"), {recursive:true})
 } catch (e){}
 
-
 try {
     fs.rmdirSync(path.join(__dirname,"lib/flagsmith/test"), {recursive:true})
 } catch (e){}
-try {
-    fs.rmdirSync(path.join(__dirname,"lib/flagsmith-es/test"), {recursive:true})
-} catch (e){}
 try {
     fs.rmdirSync(path.join(__dirname,"lib/react-native-flagsmith/test"), {recursive:true})
 } catch (e){}
@@ -143,5 +73,4 @@ function syncFolders(src, dest) {
 }
 
 syncFolders(path.join(__dirname,'utils'),path.join(__dirname,'lib/flagsmith/src/utils'))
-syncFolders(path.join(__dirname,'utils'),path.join(__dirname,'lib/flagsmith-es/src/utils'))
 syncFolders(path.join(__dirname,'utils'),path.join(__dirname,'lib/react-native-flagsmith/src/utils'))

lib/react-native-flagsmith/README.md

@@ -6,8 +6,8 @@
     "typecheck": "tsc",
     "build": "npm run generatetypes && npm run bundle && npm run typecheck",
     "bundle": "rollup -c && node ./move-react.js",
-    "deploy": "npm run build && npm test && cd ./lib/flagsmith/ && npm publish && cd ../../lib/react-native-flagsmith && npm publish && cd ../../lib/flagsmith-es && npm publish",
-    "deploy:beta": "npm run build && npm test && cd ./lib/flagsmith/ && npm publish --tag beta && cd ../../lib/react-native-flagsmith && npm publish --tag beta && cd ../../lib/flagsmith-es && npm publish --tag beta",
+    "deploy": "npm run build && npm test && cd ./lib/flagsmith/ && npm publish && cd ../../lib/react-native-flagsmith && npm publish",
+    "deploy:beta": "npm run build && npm test && cd ./lib/flagsmith/ && npm publish --tag beta && cd ../../lib/react-native-flagsmith && npm publish --tag beta",
     "dev": "nodemon",
     "generatetypes": "curl https://raw.githubusercontent.com/Flagsmith/flagsmith/refs/heads/main/sdk/evaluation-context.json -o evaluation-context.json && npx quicktype -o evaluation-context.ts --src-lang schema --just-types --no-prefer-types --nice-property-names evaluation-context.json && rm evaluation-context.json",
     "postinstall": "patch-package",