self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-02 12:47:41 +02:00
Code Issues Releases Activity

Chore: Joplin generator: Remove @joplin/lib dev dependency from generated projects (#10075)

Browse Source
This commit is contained in:
Henry Heino 2024-03-11 03:11:07 -07:00 committed by GitHub
parent b152732d7f
commit 238468ddaa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -677,6 +677,7 @@ packages/generator-joplin/generators/app/templates/api/noteListType.js
packages/generator-joplin/generators/app/templates/api/types.js packages/generator-joplin/generators/app/templates/api/types.js
packages/generator-joplin/generators/app/templates/api_index.js packages/generator-joplin/generators/app/templates/api_index.js
packages/generator-joplin/generators/app/templates/src/index.js packages/generator-joplin/generators/app/templates/src/index.js
packages/generator-joplin/tools/updateCategories.js
packages/htmlpack/src/index.js packages/htmlpack/src/index.js
packages/lib/ArrayUtils.js packages/lib/ArrayUtils.js
packages/lib/AsyncActionQueue.js packages/lib/AsyncActionQueue.js

1
.gitignore vendored
View File

@ -657,6 +657,7 @@ packages/generator-joplin/generators/app/templates/api/noteListType.js
packages/generator-joplin/generators/app/templates/api/types.js packages/generator-joplin/generators/app/templates/api/types.js
packages/generator-joplin/generators/app/templates/api_index.js packages/generator-joplin/generators/app/templates/api_index.js
packages/generator-joplin/generators/app/templates/src/index.js packages/generator-joplin/generators/app/templates/src/index.js
packages/generator-joplin/tools/updateCategories.js
packages/htmlpack/src/index.js packages/htmlpack/src/index.js
packages/lib/ArrayUtils.js packages/lib/ArrayUtils.js
packages/lib/AsyncActionQueue.js packages/lib/AsyncActionQueue.js

3
packages/generator-joplin/generators/app/templates/package_TEMPLATE.json
View File

@ -24,7 +24,6 @@
"ts-loader": "^9.3.1", "ts-loader": "^9.3.1",
"typescript": "^4.8.2", "typescript": "^4.8.2",
"webpack": "^5.74.0", "webpack": "^5.74.0",
"webpack-cli": "^4.10.0", "webpack-cli": "^4.10.0"
"@joplin/lib": "~2.9"
} }
} }

5
packages/generator-joplin/generators/app/templates/webpack.config.js
View File

@ -16,7 +16,10 @@ const CopyPlugin = require('copy-webpack-plugin');
const tar = require('tar'); const tar = require('tar');
const glob = require('glob'); const glob = require('glob');
const execSync = require('child_process').execSync; const execSync = require('child_process').execSync;
const allPossibleCategories = require('@joplin/lib/pluginCategories.json');
// AUTO-GENERATED by updateCategories
const allPossibleCategories = [{ 'name': 'appearance' }, { 'name': 'developer tools' }, { 'name': 'productivity' }, { 'name': 'themes' }, { 'name': 'integrations' }, { 'name': 'viewer' }, { 'name': 'search' }, { 'name': 'tags' }, { 'name': 'editor' }, { 'name': 'files' }, { 'name': 'personal knowledge management' }];
// AUTO-GENERATED by updateCategories
const rootDir = path.resolve(__dirname); const rootDir = path.resolve(__dirname);
const userConfigFilename = './plugin.config.json'; const userConfigFilename = './plugin.config.json';

8
packages/generator-joplin/package.json
View File

@ -9,7 +9,8 @@
}, },
"scripts": { "scripts": {
"test": "jest", "test": "jest",
"test-ci": "yarn test" "test-ci": "yarn test",
"updateCategories": "ts-node tools/updateCategories.ts"
}, },
"files": [ "files": [
"generators" "generators"
@ -29,7 +30,10 @@
"yosay": "2.0.2" "yosay": "2.0.2"
}, },
"devDependencies": { "devDependencies": {
"jest": "29.7.0" "@joplin/lib": "~3.0",
"@joplin/tools": "~3.0",
"jest": "29.7.0",
"ts-node": "10.9.2"
}, },
"repository": "https://github.com/laurent22/generator-joplin", "repository": "https://github.com/laurent22/generator-joplin",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",

20
packages/generator-joplin/tools/updateCategories.ts Normal file
View File

@ -0,0 +1,20 @@
import { dirname } from 'path';
import { insertContentIntoFile } from '@joplin/tools/tool-utils';
const allCategories = require('@joplin/lib/pluginCategories.json');
const updateCategories = async () => {
const buildScriptPath = `${dirname(__dirname)}/generators/app/templates/webpack.config.js`;
const possibleCategoriesJson = JSON.stringify(allCategories).replace(/["]/g, '\'');
const possibleCategoriesLine = `const allPossibleCategories = ${possibleCategoriesJson};`;
await insertContentIntoFile(
buildScriptPath,
'// AUTO-GENERATED by updateCategories\n',
'\n// AUTO-GENERATED by updateCategories',
possibleCategoriesLine,
);
};
void updateCategories();

2
packages/generator-joplin/updateTypes.sh
View File

@ -13,3 +13,5 @@ cp "$LIB_DIR/services/plugins/api/types.ts" "$SCRIPT_DIR/generators/app/template
cp "$LIB_DIR/services/plugins/api/noteListType.ts" "$SCRIPT_DIR/generators/app/templates/api/" cp "$LIB_DIR/services/plugins/api/noteListType.ts" "$SCRIPT_DIR/generators/app/templates/api/"
cp "$SCRIPT_DIR/generators/app/templates/api_index.ts" "$SCRIPT_DIR/generators/app/templates/api/index.ts" cp "$SCRIPT_DIR/generators/app/templates/api_index.ts" "$SCRIPT_DIR/generators/app/templates/api/index.ts"
rm -f "$SCRIPT_DIR/generators/app/templates/api/types.d.ts" rm -f "$SCRIPT_DIR/generators/app/templates/api/types.d.ts"
yarn updateCategories

3
yarn.lock
View File

@ -22406,9 +22406,12 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "generator-joplin@workspace:packages/generator-joplin" resolution: "generator-joplin@workspace:packages/generator-joplin"
dependencies: dependencies:
"@joplin/lib": ~3.0
"@joplin/tools": ~3.0
chalk: 2.4.2 chalk: 2.4.2
jest: 29.7.0 jest: 29.7.0
slugify: 1.6.6 slugify: 1.6.6
ts-node: 10.9.2
yeoman-generator: 5.10.0 yeoman-generator: 5.10.0
yosay: 2.0.2 yosay: 2.0.2
languageName: unknown languageName: unknown