1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2026-01-26 04:43:42 +00:00

Compare commits

...

7 Commits

Author SHA1 Message Date
jeremy@jermolene.com
19c052d138 Make prettierignore consistent with eslintignore
@pmario do you happen to know if there's a way to avoid the duplication here? Can we make prettier use the ignore list from eslint?
2023-04-05 17:51:43 +01:00
jeremy@jermolene.com
169a36a5cb Ensure sjcl.js isn't prettified 2023-04-05 17:46:49 +01:00
jeremy@jermolene.com
d203239f6f Initial Commit
This commit installs and configures Prettier, and adds it to our test suite. We do not yet apply Prettier
2023-04-05 17:36:19 +01:00
jeremy@jermolene.com
2a19c60e20 Merge branch 'tiddlywiki-com' 2023-04-02 14:00:19 +01:00
jeremy@jermolene.com
e0ff54a04e Preparation for v5.2.8 2023-03-26 12:56:40 +01:00
jeremy@jermolene.com
042f3c59ad Merge branch 'tiddlywiki-com' 2023-03-26 12:54:10 +01:00
jeremy@jermolene.com
07960f1527 Update relesase banner for v5.2.8 2023-03-26 09:28:26 +01:00
10 changed files with 1911 additions and 6 deletions

View File

@@ -6,3 +6,6 @@
/core/modules/utils/diff-match-patch/diff_match_patch_uncompressed.js
/core/modules/utils/dom/csscolorparser.js
/plugins/tiddlywiki/*/files/
/tmp/
/output/

10
.prettierignore Normal file
View File

@@ -0,0 +1,10 @@
# Ignore "third party" code whose style we will not change.
/boot/sjcl.js
/core/modules/utils/base64-utf8/base64-utf8.module.js
/core/modules/utils/base64-utf8/base64-utf8.module.min.js
/core/modules/utils/diff-match-patch/diff_match_patch.js
/core/modules/utils/diff-match-patch/diff_match_patch_uncompressed.js
/core/modules/utils/dom/csscolorparser.js
/plugins/tiddlywiki/*/files/
/tmp/
/output/

1
.prettierrc.json Normal file
View File

@@ -0,0 +1 @@
{}

View File

@@ -5,7 +5,7 @@
# Default to the current version number for building the plugin library
if [ -z "$TW5_BUILD_VERSION" ]; then
TW5_BUILD_VERSION=v5.2.7
TW5_BUILD_VERSION=v5.2.8
fi
echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"

View File

@@ -2,6 +2,10 @@
# test TiddlyWiki5 for tiddlywiki.com
# Let Prettier check formatting
npm run prettier-check || exit 1
# Run the test edition to run the node.js tests and to generate test.html for tests in the browser
node ./tiddlywiki.js \

View File

@@ -1,6 +1,6 @@
title: $:/config/OfficialPluginLibrary
tags: $:/tags/PluginLibrary
url: https://tiddlywiki.com/library/v5.2.7/index.html
url: https://tiddlywiki.com/library/v5.2.8/index.html
caption: {{$:/language/OfficialPluginLibrary}}
{{$:/language/OfficialPluginLibrary/Hint}}

View File

@@ -1,6 +1,6 @@
title: $:/config/OfficialPluginLibrary
tags: $:/tags/PluginLibrary
url: https://tiddlywiki.com/prerelease/library/v5.2.7/index.html
url: https://tiddlywiki.com/prerelease/library/v5.2.8/index.html
caption: {{$:/language/OfficialPluginLibrary}} (Prerelease)
The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 80 KiB

1882
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,7 @@
{
"name": "tiddlywiki",
"preferGlobal": "true",
"version": "5.2.7",
"version": "5.2.8-prerelease",
"author": "Jeremy Ruston <jeremy@jermolene.com>",
"description": "a non-linear personal web notebook",
"contributors": [
@@ -24,7 +24,8 @@
"wiki"
],
"devDependencies": {
"eslint": "^7.32.0"
"eslint": "^8.37.0",
"prettier": "^2.8.7"
},
"bundleDependencies": [],
"license": "BSD",
@@ -32,6 +33,10 @@
"node": ">=0.8.2"
},
"scripts": {
"lint": "eslint ."
"lint": "eslint .",
"prettier-check": "npx prettier --check .",
"prettier-write": "npx prettier --write ."
},
"dependencies": {
}
}