Put client library hashes in a single package

KSF-Media · Oct 8, 2021 · 6b298e6 · 6b298e6
1 parent 9f56c4f
commit 6b298e6
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 20 deletions.
diff --git a/apps/mosaico/package.json b/apps/mosaico/package.json
@@ -4,11 +4,9 @@
   "description": "",
   "license": "MIT",
   "dependencies": {
-    "bottega": "https://github.com/KSF-Media/bottega-javascript-client.git#f58baa4ebf8a494347b212e3378b6168c5e2faff",
     "cheerio": "^1.0.0-rc.10",
     "parcel": "1.12.3",
     "parcel-bundler": "^1.12.3",
-    "persona": "https://github.com/KSF-Media/persona-javascript-client.git#d8876dc53c39e6c80cdff363a8230deb944c6e73",
     "react": ">=16.12",
     "react-date-picker": "^8.0.3",
     "react-dom": ">=16.12",

diff --git a/apps/mosaico/spago.dhall b/apps/mosaico/spago.dhall
@@ -5,6 +5,7 @@ You can edit this file as you like.
 { name = "mosaico"
 , dependencies =
   [ "aff"
+  , "affresco-apis"
   , "affresco-components"
   , "affresco-user"
   , "affresco-vetrina"

diff --git a/packages.dhall b/packages.dhall
@@ -65,6 +65,7 @@ let additions =
       , affresco-test = ./packages/test/spago.dhall as Location
       , affresco-user = ./packages/user/spago.dhall as Location
       , affresco-vetrina = ./packages/vetrina/spago.dhall as Location
+      , affresco-apis = ./packages/apis/spago.dhall as Location
       }
 
 in  upstream // additions
diff --git a/packages/apis/package.json b/packages/apis/package.json
@@ -0,0 +1,15 @@
+{
+  "version": "0.1.1",
+  "description": "KSF Media API client libraries",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "persona": "https://github.com/KSF-Media/persona-javascript-client.git#d8876dc53c39e6c80cdff363a8230deb944c6e73",
+
+    "bottega": "https://github.com/KSF-Media/bottega-javascript-client.git#f58baa4ebf8a494347b212e3378b6168c5e2faff"
+  },
+  "scripts": {
+    "build-npm": "spago bundle-module -m KSF.Dummy -t build.js && parcel build --no-source-maps -d build"
+  },
+  "files": []
+}
diff --git a/packages/apis/spago.dhall b/packages/apis/spago.dhall
@@ -0,0 +1,8 @@
+{ name =
+    "affresco-apis"
+, dependencies =
+    [ "prelude"
+    ]
+, packages =
+    ../../packages.dhall
+}
diff --git a/packages/apis/src/Dummy.purs b/packages/apis/src/Dummy.purs
@@ -0,0 +1,8 @@
+module KSF.Dummy where
+
+{-
+
+TODO: spago gives a warning about missing source files if there's
+nothing in this directory.
+
+-}
diff --git a/packages/components/spago.dhall b/packages/components/spago.dhall
@@ -2,6 +2,7 @@
     "affresco-components"
 , dependencies =
     [ "effect"
+    , "affresco-apis"
     , "console"
     , "avar"
     , "aff"

diff --git a/packages/user/package.json b/packages/user/package.json
@@ -5,9 +5,7 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "persona": "https://github.com/KSF-Media/persona-javascript-client.git#d8876dc53c39e6c80cdff363a8230deb944c6e73",
     "react": "^16.12",
-    "bottega": "https://github.com/KSF-Media/bottega-javascript-client.git#f58baa4ebf8a494347b212e3378b6168c5e2faff",
     "react-dom": "^16.12"
   },
   "scripts": {

diff --git a/packages/user/spago.dhall b/packages/user/spago.dhall
@@ -3,6 +3,7 @@
   [ "aff"
   , "aff-promise"
   , "affjax"
+  , "affresco-apis"
   , "affresco-components"
   , "argonaut-codecs"
   , "arrays"

diff --git a/packages/vetrina/package.json b/packages/vetrina/package.json
@@ -9,9 +9,7 @@
   },
   "dependencies": {
     "@sentry/browser": "^6.2.1",
-    "bottega": "https://github.com/KSF-Media/bottega-javascript-client.git#f58baa4ebf8a494347b212e3378b6168c5e2faff",
     "create-react-class": "^15.6.3",
-    "persona": "https://github.com/KSF-Media/persona-javascript-client.git#d8876dc53c39e6c80cdff363a8230deb944c6e73",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "uuid-validate": "^0.0.3"

diff --git a/packages/vetrina/spago.dhall b/packages/vetrina/spago.dhall
@@ -1,6 +1,7 @@
 { name = "vetrina"
 , dependencies =
   [ "aff"
+  , "affresco-apis"
   , "affresco-components"
   , "affresco-user"
   , "arrays"

diff --git a/yarn.lock b/yarn.lock
@@ -1226,8 +1226,6 @@
 "@ksf-media/user@file:packages/user":
   version "0.3.2"
   dependencies:
-    bottega "https://github.com/KSF-Media/bottega-javascript-client.git#f58baa4ebf8a494347b212e3378b6168c5e2faff"
-    persona "https://github.com/KSF-Media/persona-javascript-client.git#40058b09b6d969390daaad6e58918b04129b1c16"
     react "^16.12"
     react-dom "^16.12"
 
@@ -2921,12 +2919,6 @@ bootstrap@^4.3.1:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
   integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
 
-"bottega@https://github.com/KSF-Media/bottega-javascript-client.git#f58baa4ebf8a494347b212e3378b6168c5e2faff":
-  version "1.0.0"
-  resolved "https://github.com/KSF-Media/bottega-javascript-client.git#f58baa4ebf8a494347b212e3378b6168c5e2faff"
-  dependencies:
-    superagent "3.7.0"
-
 bowser@^1.7.3:
   version "1.9.4"
   resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.9.4.tgz#890c58a2813a9d3243704334fa81b96a5c150c9a"
@@ -7330,12 +7322,6 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-"persona@https://github.com/KSF-Media/persona-javascript-client.git#40058b09b6d969390daaad6e58918b04129b1c16":
-  version "1.3.0"
-  resolved "https://github.com/KSF-Media/persona-javascript-client.git#40058b09b6d969390daaad6e58918b04129b1c16"
-  dependencies:
-    superagent "3.7.0"
-
 "persona@https://github.com/KSF-Media/persona-javascript-client.git#72a5ee779d5a9052b3cd274db9d":
   version "1.3.0"
   resolved "https://github.com/KSF-Media/persona-javascript-client.git#72a5ee779d5a9052b3cd274db9d5358ddd27839b"