Skip to content

Commit 6eb1b3b

Browse files
committed
feat(deploy): fixed the editions build flow
1 parent be8cd07 commit 6eb1b3b

File tree

9 files changed

+18
-15
lines changed

9 files changed

+18
-15
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ debug.log
77
plugins/noteself/
88
$__StoryList.tid
99
wiki-dev/tiddlers/$__DefaultTiddlers.tid
10+
dist/developer
11+
dist/edge

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ before_script:
1313
- export TIDDLYWIKI_PLUGIN_PATH="$(pwd)/pouchdb/src/plugins:$(pwd)/tpouch/dist:$(pwd)/plugins" # Plugins paths with all deps globally available
1414
- "(cd tpouch && npm i && gulp travis --production)"
1515
script:
16-
- npm run buid-plugin # builds NoteSelf core plugins
16+
- npm run build-plugin # builds NoteSelf core plugins
1717
- tiddlywiki ./wiki --verbose --build index --build OnlineDemo --build favicon --build library
1818
- tiddlywiki ./editions/developer --verbose --build index # build the developer edition
1919
- tiddlywiki ./editions/edge --verbose --build index # build the edge edition (includes not well tested stuff)

editions/developer/tiddlywiki.info

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"plugins": [
33
"danielo515/pouchdb",
44
"danielo515/tiddlypouch",
5-
"tiddlywiki/highlight",
5+
"tiddlywiki/highlight",
66
"tiddlywiki/codemirror",
7-
"noteself/core"
7+
"tiddlywiki/googleanalytics",
8+
"noteself/online"
89
],
910
"themes": [
1011
"tiddlywiki/vanilla",
@@ -13,13 +14,10 @@
1314
"languages": [
1415
"en-US"
1516
],
16-
"config": {
17-
"default-tiddler-location": "../src/core/tiddlers"
18-
},
1917
"build": {
2018
"index": [
2119
"--rendertiddler",
22-
"$:/NoteSelf/save/online",
20+
"$:/core/save/all",
2321
"../../../dist/developer/index.html",
2422
"text/plain"
2523
]

editions/edge/tiddlywiki.info

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
"danielo515/pouchdb",
44
"danielo515/tiddlypouch",
55
"tiddlywiki/highlight",
6+
"tiddlywiki/googleanalytics",
7+
"noteself/online",
68
"noteself/core"
79
],
810
"themes": [
@@ -12,9 +14,9 @@
1214
"languages": [
1315
"en-US"
1416
],
15-
"config": {
16-
"default-tiddler-location": "../src/core/tiddlers"
17-
},
17+
"includeWikis": [
18+
{"path": "../../wiki", "read-only": true}
19+
],
1820
"build": {
1921
"index": [
2022
"--rendertiddler",

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"scripts": {
77
"add-module": "node .bin/new-file.js",
88
"brocco": "npm run clean && broccoli build",
9-
"buid-plugin": "npm run brocco -- ./plugins/noteself",
9+
"build-plugin": "npm run brocco -- ./plugins/noteself",
1010
"tw": "node -r dotenv/config ./node_modules/tiddlywiki/tiddlywiki.js",
1111
"tw-dev": "nodemon node_modules/tiddlywiki/tiddlywiki.js",
12-
"start": "npm run buid-plugin && npm run tw-dev -- ./wiki-dev --verbose --server 8087 $:/core/save/all text/plain text/html '' '' 0.0.0.0",
12+
"start": "npm run build-plugin && npm run tw-dev -- ./wiki-dev --verbose --server 8087 $:/core/save/all text/plain text/html '' '' 0.0.0.0",
1313
"build": "npm run tw -- ./wiki --verbose --build index --build OnlineDemo",
1414
"clean": "rimraf ./plugins/noteself",
15-
"watch": "nodemon -r dotenv/config --exec 'npm run buid-plugin' --watch src",
15+
"watch": "nodemon -r dotenv/config --exec 'npm run build-plugin' --watch src",
1616
"postinstall": "mkdir plugins"
1717
},
1818
"repository": {
File renamed without changes.

wiki/tiddlywiki.info

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"plugins": [
33
"danielo515/pouchdb",
44
"danielo515/tiddlypouch",
5-
"tiddlywiki/pluginlibrary",
6-
"tiddlywiki/googleanalytics"
5+
"tiddlywiki/pluginlibrary",
6+
"tiddlywiki/googleanalytics",
7+
"noteself/online"
78
],
89
"themes": [
910
"tiddlywiki/vanilla",

0 commit comments

Comments
 (0)