Skip to content

Commit e483297

Browse files
jonschoningjonschoning
committed
esm splitting
1 parent 3f24578 commit e483297

27 files changed

+166
-176
lines changed

‎espial.cabal

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
cabal-version: 1.12
1+
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.35.1.
3+
-- This file has been generated from package.yaml by hpack version 0.36.0.
44
--
55
-- see: https://github.com/sol/hpack
66

@@ -48,23 +48,43 @@ extra-source-files:
4848
static/css/tachyons.min.css
4949
static/css/tachyons.min.css.gz
5050
static/images/bluepin.gif
51-
static/js/app.min.js
52-
static/js/app.min.js.gz
53-
static/js/app.min.js.map
54-
static/js/app.min.js.map.gz
5551
static/js/js.cookie-2.2.0.min.js
5652
static/js/js.cookie-2.2.0.min.js.gz
53+
static/js/dist/chunk-C2VZJJ3O.js
54+
static/js/dist/chunk-C2VZJJ3O.js.gz
55+
static/js/dist/chunk-C2VZJJ3O.js.map
56+
static/js/dist/chunk-C2VZJJ3O.js.map.gz
57+
static/js/dist/chunk-HXAV7WCB.js
58+
static/js/dist/chunk-HXAV7WCB.js.gz
59+
static/js/dist/chunk-HXAV7WCB.js.map
60+
static/js/dist/chunk-HXAV7WCB.js.map.gz
61+
static/js/dist/chunk-YZW7HJVL.js
62+
static/js/dist/chunk-YZW7HJVL.js.gz
63+
static/js/dist/chunk-YZW7HJVL.js.map
64+
static/js/dist/chunk-YZW7HJVL.js.map.gz
65+
static/js/dist/AccountSettings/index.js
66+
static/js/dist/AccountSettings/index.js.gz
67+
static/js/dist/AccountSettings/index.js.map
68+
static/js/dist/Add/index.js
69+
static/js/dist/Add/index.js.gz
70+
static/js/dist/Add/index.js.map
71+
static/js/dist/Bookmarks/index.js
72+
static/js/dist/Bookmarks/index.js.gz
73+
static/js/dist/Bookmarks/index.js.map
74+
static/js/dist/Logout/index.js
75+
static/js/dist/Logout/index.js.gz
76+
static/js/dist/Logout/index.js.map
77+
static/js/dist/Note/index.js
78+
static/js/dist/Note/index.js.gz
79+
static/js/dist/Note/index.js.map
5780
purs/Makefile
5881
purs/spago.lock
5982
purs/spago.yaml
60-
purs/src/App.purs
61-
purs/src/Globals.js
62-
purs/src/Globals.purs
63-
purs/src/Main.purs
64-
purs/src/Marked.js
65-
purs/src/Marked.purs
66-
purs/src/Model.purs
67-
purs/src/Util.purs
83+
purs/src/AccountSettings.purs
84+
purs/src/Add.purs
85+
purs/src/Bookmarks.purs
86+
purs/src/Logout.purs
87+
purs/src/Note.purs
6888
purs/src/Component/AccountSettings.purs
6989
purs/src/Component/Add.purs
7090
purs/src/Component/BList.purs

‎package.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ extra-source-files:
3333
- static/css/**
3434
- static/images/**
3535
- static/js/**
36+
- static/js/dist/**
37+
- static/js/dist/**/**
3638
- purs/Makefile
3739
- purs/spago.lock
3840
- purs/spago.yaml

‎purs/Makefile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,8 @@ build:
99
@npm run spago build
1010

1111
bundle: build
12-
@npm run esbuild-bundle
13-
@npm run esbuild-bundle-min
14-
@rm -f dist/*.gz
15-
@gzip -k dist/app.min.js.map
16-
@gzip -k dist/app.min.js
17-
@find dist -type f -printf "%kK\\t%h/%f\\n" | sort -k 2
18-
@cp dist/app.min.js ../static/js/app.min.js
19-
@cp dist/app.min.js.gz ../static/js/app.min.js.gz
20-
@cp dist/app.min.js.map ../static/js/app.min.js.map
21-
@cp dist/app.min.js.map.gz ../static/js/app.min.js.map.gz
12+
npm run esbuild-bundle-min
13+
cp -R dist ../static/js/
2214

2315
docs:
2416
@rm -Rf generated-docs

‎purs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"purs": "purs",
77
"make-install": "make install",
88
"make-watch": "inotifywait -m -r -q -e close_write --format '%T %w%f' --timefmt '%T' src | while read FILE; do echo $FILE; make; done",
9-
"esbuild-bundle": "esbuild ./output/Main/index.js --bundle --format=esm --target=chrome61,firefox60,edge18 --outfile=dist/app.js",
10-
"esbuild-bundle-min": "esbuild ./output/Main/index.js --bundle --format=esm --target=chrome61,firefox60,edge18 --minify --sourcemap --outfile=dist/app.min.js"
9+
"esbuild-bundle": "esbuild ./output/Note/index.js ./output/Add/index.js ./output/Logout/index.js ./output/Bookmarks/index.js ./output/AccountSettings/index.js --bundle --format=esm --target=chrome61,firefox60,edge18 --outdir=dist --splitting",
10+
"esbuild-bundle-min": "esbuild ./output/Note/index.js ./output/Add/index.js ./output/Logout/index.js ./output/Bookmarks/index.js ./output/AccountSettings/index.js --bundle --format=esm --target=chrome61,firefox60,edge18 --outdir=dist --splitting --minify --sourcemap"
1111
},
1212
"devDependencies": {
1313
"esbuild": "^0.19.11",

‎purs/src/AccountSettings.purs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
module AccountSettings where
2+
3+
import Prelude
4+
5+
import Component.AccountSettings (usetting)
6+
import Data.Foldable (traverse_)
7+
import Effect (Effect)
8+
import Halogen.Aff as HA
9+
import Halogen.VDom.Driver (runUI)
10+
import Model (AccountSettings)
11+
import Web.DOM.ParentNode (QuerySelector(..))
12+
import ViewRendered (viewRendered)
13+
14+
15+
renderAccountSettings :: String -> AccountSettings -> Effect Unit
16+
renderAccountSettings renderElSelector accountSettings = do
17+
HA.runHalogenAff do
18+
HA.selectElement (QuerySelector renderElSelector) >>= traverse_ \el -> do
19+
void $ runUI (usetting accountSettings) unit el
20+
viewRendered

‎purs/src/Add.purs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
module Add where
2+
3+
import Prelude
4+
5+
import Component.Add (addbmark)
6+
import Data.Foldable (traverse_)
7+
import Effect (Effect)
8+
import Halogen.Aff as HA
9+
import Halogen.VDom.Driver (runUI)
10+
import Model (Bookmark)
11+
import Web.DOM.ParentNode (QuerySelector(..))
12+
import ViewRendered (viewRendered)
13+
14+
renderAddForm :: String -> Bookmark -> Effect Unit
15+
renderAddForm renderElSelector bmark = do
16+
HA.runHalogenAff do
17+
HA.selectElement (QuerySelector renderElSelector) >>= traverse_ \el -> do
18+
void $ runUI (addbmark bmark) unit el
19+
viewRendered

‎purs/src/Bookmarks.purs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
module Bookmarks where
2+
3+
import Prelude
4+
5+
import Component.TagCloud (tagcloudcomponent)
6+
import Component.BList (blist)
7+
import Data.Foldable (traverse_)
8+
import Effect (Effect)
9+
import Halogen.Aff as HA
10+
import Halogen.VDom.Driver (runUI)
11+
import Model (Bookmark, TagCloudMode, tagCloudModeToF)
12+
import Web.DOM.ParentNode (QuerySelector(..))
13+
import ViewRendered (viewRendered)
14+
15+
16+
renderBookmarks :: String -> Array Bookmark -> Effect Unit
17+
renderBookmarks renderElSelector bmarks = do
18+
HA.runHalogenAff do
19+
HA.selectElement (QuerySelector renderElSelector) >>= traverse_ \el -> do
20+
void $ runUI (blist bmarks) unit el
21+
viewRendered
22+
23+
renderTagCloud :: String -> TagCloudMode -> Effect Unit
24+
renderTagCloud renderElSelector tagCloudMode = do
25+
HA.runHalogenAff do
26+
HA.selectElement (QuerySelector renderElSelector) >>= traverse_ \el -> do
27+
void $ runUI (tagcloudcomponent (tagCloudModeToF tagCloudMode)) unit el

‎purs/src/App.purs renamed to ‎purs/src/Core/App.purs

File renamed without changes.

‎purs/src/Globals.js renamed to ‎purs/src/Core/Globals.js

File renamed without changes.

‎purs/src/Globals.purs renamed to ‎purs/src/Core/Globals.purs

File renamed without changes.

0 commit comments

Comments
 (0)