@amagaki/amagaki 1.9.1 → 1.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +33 -0
- package/dist/src/commands/serve.js +3 -3
- package/dist/src/commands/serve.js.map +1 -1
- package/dist/src/document.d.ts +1 -1
- package/dist/src/document.js +11 -6
- package/dist/src/document.js.map +1 -1
- package/dist/src/server.d.ts +3 -1
- package/dist/src/server.js +25 -4
- package/dist/src/server.js.map +1 -1
- package/dist/src/utils.js.map +1 -1
- package/package.json +6 -4
- package/LICENSE.md +0 -21
- package/README.md +0 -66
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,38 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [1.11.0](https://www.github.com/blinkk/amagaki/compare/amagaki-v1.10.2...amagaki-v1.11.0) (2022-02-19)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* add compression to dev server ([89d19c3](https://www.github.com/blinkk/amagaki/commit/89d19c3b1c22cde7595f0c1206b80422a1833b24)), closes [#143](https://www.github.com/blinkk/amagaki/issues/143)
|
|
9
|
+
|
|
10
|
+
### [1.10.2](https://www.github.com/blinkk/amagaki/compare/amagaki-v1.10.1...amagaki-v1.10.2) (2022-02-19)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Miscellaneous Chores
|
|
14
|
+
|
|
15
|
+
* release 10.10.2 ([dc74277](https://www.github.com/blinkk/amagaki/commit/dc74277c70ae364abd7aebc0e0de5cb0807f2e83))
|
|
16
|
+
|
|
17
|
+
### [1.10.1](https://www.github.com/blinkk/amagaki/compare/v1.10.0...v1.10.1) (2022-02-10)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* support document-level defaultLocale ([f5cfdc1](https://www.github.com/blinkk/amagaki/commit/f5cfdc1487cae1db763a0636be422231e41b30a0))
|
|
23
|
+
|
|
24
|
+
## [1.10.0](https://www.github.com/blinkk/amagaki/compare/v1.9.1...v1.10.0) (2022-01-31)
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
### Features
|
|
28
|
+
|
|
29
|
+
* automatically find open port when using dev server [#136](https://www.github.com/blinkk/amagaki/issues/136) ([7b368a2](https://www.github.com/blinkk/amagaki/commit/7b368a2c65ac689824439861b4b366d3662fa5ba))
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
### Bug Fixes
|
|
33
|
+
|
|
34
|
+
* update deepWalk dependency ([d89fdee](https://www.github.com/blinkk/amagaki/commit/d89fdeea1f6757e664ab7033da3137c62c12b269))
|
|
35
|
+
|
|
3
36
|
### [1.9.1](https://www.github.com/blinkk/amagaki/compare/v1.9.0...v1.9.1) (2022-01-21)
|
|
4
37
|
|
|
5
38
|
|
|
@@ -24,8 +24,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
25
|
exports.ServeCommand = void 0;
|
|
26
26
|
const fs = __importStar(require("fs"));
|
|
27
|
-
const pod_1 = require("../pod");
|
|
28
27
|
const server_1 = require("../server");
|
|
28
|
+
const pod_1 = require("../pod");
|
|
29
29
|
const chalk_1 = __importDefault(require("chalk"));
|
|
30
30
|
class ServeCommand {
|
|
31
31
|
constructor(globalOptions, options) {
|
|
@@ -50,9 +50,9 @@ class ServeCommand {
|
|
|
50
50
|
server.on(server_1.Server.Events.RELOAD, () => {
|
|
51
51
|
console.log(chalk_1.default.greenBright('Reloaded:'), `${pod.root}`);
|
|
52
52
|
});
|
|
53
|
-
server.once(server_1.Server.Events.LISTENING, () => {
|
|
53
|
+
server.once(server_1.Server.Events.LISTENING, (e) => {
|
|
54
54
|
console.log(chalk_1.default.green('🍊 Pod:'), `${pod.root}`);
|
|
55
|
-
console.log(chalk_1.default.green('Server:'), `${pod.env.scheme}://${pod.env.host}:${port}/`);
|
|
55
|
+
console.log(chalk_1.default.green('Server:'), `${pod.env.scheme}://${pod.env.host}:${e.server.port}/`);
|
|
56
56
|
console.log(chalk_1.default.green(' Ready. Press ctrl+c to quit.'));
|
|
57
57
|
});
|
|
58
58
|
await server.start();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/commands/serve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;
|
|
1
|
+
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/commands/serve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AAEzB,sCAAuD;AAGvD,gCAA2B;AAC3B,kDAA0B;AAS1B,MAAa,YAAY;IAIvB,YAAY,aAA4B,EAAE,OAAqB;QAC7D,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC;QAC3D,MAAM,GAAG,GAAG,IAAI,SAAG,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;YACzC,GAAG,EAAE,IAAI;YACT,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,SAAS;YACzC,IAAI,EAAE,GAAG,IAAI,EAAE;YACf,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE;YAC1B,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;SAC5C;QACD,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,GAAG,EAAE;YAC7B,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,eAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE;YACnC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,eAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAuB,EAAE,EAAE;YAC/D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YACnD,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,KAAK,CAAC,SAAS,CAAC,EACtB,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,GAAG,CACxD,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;CACF;AArCD,oCAqCC"}
|
package/dist/src/document.d.ts
CHANGED
|
@@ -110,7 +110,7 @@ export declare class Document {
|
|
|
110
110
|
* `$localization?defaultLocale` field within the document's fields, the
|
|
111
111
|
* collection's `_collection.yaml`, or the pod's `amagaki.ts`.
|
|
112
112
|
*/
|
|
113
|
-
get defaultLocale():
|
|
113
|
+
get defaultLocale(): any;
|
|
114
114
|
/**
|
|
115
115
|
* Resolves any async fields. This is commonly used in conjunction with async
|
|
116
116
|
* YAML types. For example, if a YAML type fetches data from an API or loads
|
package/dist/src/document.js
CHANGED
|
@@ -27,7 +27,7 @@ const fsPath = __importStar(require("path"));
|
|
|
27
27
|
const glob = __importStar(require("glob"));
|
|
28
28
|
const utils = __importStar(require("./utils"));
|
|
29
29
|
const locale_1 = require("./locale");
|
|
30
|
-
const deepWalk_1 = require("@blinkk/editor/dist/
|
|
30
|
+
const deepWalk_1 = require("@blinkk/editor.dev-ui/dist/utility/deepWalk");
|
|
31
31
|
const minimatch_1 = __importDefault(require("minimatch"));
|
|
32
32
|
/**
|
|
33
33
|
* Documents represent dynamically rendered pages. The document object controls
|
|
@@ -168,8 +168,8 @@ class Document {
|
|
|
168
168
|
* collection's `_collection.yaml`, or the pod's `amagaki.ts`.
|
|
169
169
|
*/
|
|
170
170
|
get defaultLocale() {
|
|
171
|
-
|
|
172
|
-
return this.pod.defaultLocale;
|
|
171
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
172
|
+
return ((_g = (_c = (_b = (_a = this.fields) === null || _a === void 0 ? void 0 : _a['$localization']) === null || _b === void 0 ? void 0 : _b['defaultLocale']) !== null && _c !== void 0 ? _c : (_f = (_e = (_d = this.collection) === null || _d === void 0 ? void 0 : _d.fields) === null || _e === void 0 ? void 0 : _e['$localization']) === null || _f === void 0 ? void 0 : _f['defaultLocale']) !== null && _g !== void 0 ? _g : this.pod.defaultLocale);
|
|
173
173
|
}
|
|
174
174
|
/**
|
|
175
175
|
* Resolves any async fields. This is commonly used in conjunction with async
|
|
@@ -277,9 +277,14 @@ class Document {
|
|
|
277
277
|
*/
|
|
278
278
|
get pathFormat() {
|
|
279
279
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
280
|
-
//
|
|
281
|
-
//
|
|
282
|
-
|
|
280
|
+
// NOTE: Documents currently always define their own path format. This
|
|
281
|
+
// requires a lookup of all documents in order to to determine the full list
|
|
282
|
+
// of routes. An alternate design could involve having a central router that
|
|
283
|
+
// maps paths to documents, which would not require documents to be loaded
|
|
284
|
+
// before serving.
|
|
285
|
+
// If this document's locale is the default locale, match the base `$path`,
|
|
286
|
+
// otherwise, refer to the path defined in the `$localization?path` key.
|
|
287
|
+
if (this.locale.id === this.defaultLocale.id) {
|
|
283
288
|
return (_b = (_a = this.fields) === null || _a === void 0 ? void 0 : _a['$path']) !== null && _b !== void 0 ? _b : (_d = (_c = this.collection) === null || _c === void 0 ? void 0 : _c.fields) === null || _d === void 0 ? void 0 : _d['$path'];
|
|
284
289
|
}
|
|
285
290
|
return ((_g = (_f = (_e = this.fields) === null || _e === void 0 ? void 0 : _e['$localization']) === null || _f === void 0 ? void 0 : _f['path']) !== null && _g !== void 0 ? _g : (_k = (_j = (_h = this.collection) === null || _h === void 0 ? void 0 : _h.fields) === null || _j === void 0 ? void 0 : _j['$localization']) === null || _k === void 0 ? void 0 : _k['path']);
|
package/dist/src/document.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.js","sourceRoot":"","sources":["../../src/document.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,2CAA6B;AAC7B,+CAAiC;AAEjC,qCAA2C;AAG3C,
|
|
1
|
+
{"version":3,"file":"document.js","sourceRoot":"","sources":["../../src/document.ts"],"names":[],"mappings":"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"}
|
package/dist/src/server.d.ts
CHANGED
|
@@ -9,11 +9,12 @@ interface ServerOptions {
|
|
|
9
9
|
}
|
|
10
10
|
export interface ServerListeningEvent {
|
|
11
11
|
app: http.Server;
|
|
12
|
+
server: Server;
|
|
12
13
|
}
|
|
13
14
|
export declare class Server extends events.EventEmitter {
|
|
14
15
|
private pod;
|
|
15
16
|
private httpServer?;
|
|
16
|
-
port:
|
|
17
|
+
port: number;
|
|
17
18
|
watcher?: chokidar.FSWatcher;
|
|
18
19
|
static AUTORELOAD_PATHS: string[];
|
|
19
20
|
static PLUGINS_PATH: string;
|
|
@@ -27,6 +28,7 @@ export declare class Server extends events.EventEmitter {
|
|
|
27
28
|
* Returns the `Express` server application.
|
|
28
29
|
*/
|
|
29
30
|
createApp(): Promise<express.Express>;
|
|
31
|
+
private onListen;
|
|
30
32
|
/**
|
|
31
33
|
* Starts the web server.
|
|
32
34
|
*/
|
package/dist/src/server.js
CHANGED
|
@@ -18,6 +18,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
18
18
|
__setModuleDefault(result, mod);
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
21
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
22
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
|
+
};
|
|
21
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
25
|
exports.Server = void 0;
|
|
23
26
|
const chokidar = __importStar(require("chokidar"));
|
|
@@ -26,11 +29,13 @@ const fsPath = __importStar(require("path"));
|
|
|
26
29
|
const nunjucks = __importStar(require("nunjucks"));
|
|
27
30
|
const pod_1 = require("./pod");
|
|
28
31
|
const express = require("express");
|
|
32
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
33
|
+
const compression_1 = __importDefault(require("compression"));
|
|
29
34
|
class Server extends events.EventEmitter {
|
|
30
35
|
constructor(pod, options) {
|
|
31
36
|
super();
|
|
32
37
|
this.pod = pod;
|
|
33
|
-
this.port = options.port;
|
|
38
|
+
this.port = parseInt(options.port);
|
|
34
39
|
}
|
|
35
40
|
/**
|
|
36
41
|
* Returns the `Express` server application.
|
|
@@ -39,6 +44,7 @@ class Server extends events.EventEmitter {
|
|
|
39
44
|
const app = express();
|
|
40
45
|
await this.pod.plugins.trigger('createServer', app);
|
|
41
46
|
app.disable('x-powered-by');
|
|
47
|
+
app.use(compression_1.default());
|
|
42
48
|
nunjucks.configure(fsPath.join(__dirname, './static/'), {
|
|
43
49
|
autoescape: true,
|
|
44
50
|
express: app,
|
|
@@ -82,14 +88,29 @@ class Server extends events.EventEmitter {
|
|
|
82
88
|
});
|
|
83
89
|
return app;
|
|
84
90
|
}
|
|
91
|
+
onListen() {
|
|
92
|
+
this.emit(Server.Events.LISTENING, {
|
|
93
|
+
app: this.httpServer,
|
|
94
|
+
server: this,
|
|
95
|
+
});
|
|
96
|
+
}
|
|
85
97
|
/**
|
|
86
98
|
* Starts the web server.
|
|
87
99
|
*/
|
|
88
100
|
async start() {
|
|
101
|
+
let retryCount = 0;
|
|
89
102
|
const app = await this.createApp();
|
|
90
|
-
this.httpServer = app.listen(this.port);
|
|
91
|
-
this.
|
|
92
|
-
|
|
103
|
+
this.httpServer = app.listen(this.port, () => this.onListen());
|
|
104
|
+
this.httpServer.on('error', (err) => {
|
|
105
|
+
if (this.pod.env.dev && retryCount < 10 && err.code === 'EADDRINUSE') {
|
|
106
|
+
console.warn(chalk_1.default.yellow(`Warning: Port ${this.port} is in use, trying ${this.port + 1} instead`));
|
|
107
|
+
this.port += 1;
|
|
108
|
+
retryCount += 1;
|
|
109
|
+
this.httpServer = app.listen(this.port, () => this.onListen());
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
throw err;
|
|
113
|
+
}
|
|
93
114
|
});
|
|
94
115
|
// Catch errors so they can be fixed without restarting the server. Errors
|
|
95
116
|
// are displayed interactively when rendering pages so they can be fixed
|
package/dist/src/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,6CAA+B;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@amagaki/amagaki",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.11.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"homepage": "https://amagaki.dev",
|
|
6
6
|
"repository": {
|
|
@@ -24,13 +24,13 @@
|
|
|
24
24
|
"clean": "gts clean",
|
|
25
25
|
"compile": "tsc",
|
|
26
26
|
"copy": "mkdir -p dist/src/static; cp src/static/* dist/src/static",
|
|
27
|
-
"dev:start": "npm run copy; npm run compile",
|
|
28
|
-
"start:example": "node ./dist/src/cli.js serve example",
|
|
29
27
|
"dev": "nodemon --watch src -e njk,ts --exec npm run dev:start",
|
|
28
|
+
"dev:start": "npm run copy; npm run compile",
|
|
30
29
|
"docs": "typedoc",
|
|
31
30
|
"docs:ci": "typedoc --out public/api",
|
|
32
31
|
"fix": "node ./node_modules/eslint/bin/eslint --fix src/**/*.ts",
|
|
33
32
|
"prepare": "rm -rf dist/; npm run dev:start;",
|
|
33
|
+
"start:example": "node ./dist/src/cli.js serve example",
|
|
34
34
|
"test": "ava",
|
|
35
35
|
"test:watch": "ava --watch"
|
|
36
36
|
},
|
|
@@ -72,7 +72,8 @@
|
|
|
72
72
|
"typescript": "^4.2.4"
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
|
-
"@blinkk/editor": "^
|
|
75
|
+
"@blinkk/editor.dev-ui": "^3.11.1",
|
|
76
|
+
"@types/compression": "^1.7.2",
|
|
76
77
|
"@types/express-serve-static-core": "^4.17.21",
|
|
77
78
|
"async": "^3.2.0",
|
|
78
79
|
"chalk": "2.4.2",
|
|
@@ -80,6 +81,7 @@
|
|
|
80
81
|
"cli-progress": "^3.9.0",
|
|
81
82
|
"cli-table": "^0.3.6",
|
|
82
83
|
"commander": "^7.2.0",
|
|
84
|
+
"compression": "^1.7.4",
|
|
83
85
|
"express": "^4.17.1",
|
|
84
86
|
"glob": "^7.1.6",
|
|
85
87
|
"js-yaml": "^4.1.0",
|
package/LICENSE.md
DELETED
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
The MIT License (MIT)
|
|
2
|
-
|
|
3
|
-
Copyright (c) Amagaki Team
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in
|
|
13
|
-
all copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
21
|
-
THE SOFTWARE.
|
package/README.md
DELETED
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
# Amagaki
|
|
2
|
-
|
|
3
|
-
[![NPM Version][npm-image]][npm-url]
|
|
4
|
-
[![GitHub Actions][github-image]][github-url]
|
|
5
|
-
[![codecov][codecov-image]][codecov-url]
|
|
6
|
-
[![TypeScript Style Guide][gts-image]][gts-url]
|
|
7
|
-
|
|
8
|
-
Amagaki is a marketing website generator. It's written in TypeScript and TS is a
|
|
9
|
-
first-class citizen. It's specifically built for hand-coding marketing and
|
|
10
|
-
informational websites. Flexible URLs, benchmarking, localization, a plugin
|
|
11
|
-
system, and multiple template engines are all built-in.
|
|
12
|
-
|
|
13
|
-
Amagaki takes concepts from [Grow.dev](https://github.com/grow/grow) and evolves
|
|
14
|
-
them to a TypeScript-first ecosystem.
|
|
15
|
-
|
|
16
|
-
## [🍊 Start here with the documentation](https://amagaki.dev)
|
|
17
|
-
|
|
18
|
-
## Key concepts
|
|
19
|
-
|
|
20
|
-
- TypeScript and Node
|
|
21
|
-
- Minimal core dependencies
|
|
22
|
-
- Inbuilt build metrics (memory usage, generated file size, routes, locales,
|
|
23
|
-
translations)
|
|
24
|
-
- Multiple template languages (Nunjucks as default)
|
|
25
|
-
- A static site generator (not a frontend framework)
|
|
26
|
-
- Renders pages at request time (unlike other static generators which watch and rebuild)
|
|
27
|
-
- Localization is an inbuilt feature
|
|
28
|
-
- Custom YAML types for extending the content layer
|
|
29
|
-
- Plugin system
|
|
30
|
-
- Benchmarking inbuilt
|
|
31
|
-
|
|
32
|
-
## Try it out
|
|
33
|
-
|
|
34
|
-
Amagaki is distributed as an npm package. When starting a new site from scratch,
|
|
35
|
-
we recommend using `create-amagaki` which uses the official
|
|
36
|
-
[`amagaki-starter`](https://github.com/blinkk/amagaki-starter).
|
|
37
|
-
|
|
38
|
-
```shell
|
|
39
|
-
# Create a new Amagaki project interactively
|
|
40
|
-
npx create-amagaki
|
|
41
|
-
|
|
42
|
-
# Start the dev server
|
|
43
|
-
npm run dev
|
|
44
|
-
|
|
45
|
-
# Build the site
|
|
46
|
-
npm run build
|
|
47
|
-
```
|
|
48
|
-
|
|
49
|
-
If you are integrating into an existing project, you can install Amagaki directly.
|
|
50
|
-
|
|
51
|
-
```shell
|
|
52
|
-
# Install Amagaki
|
|
53
|
-
npm install --save @amagaki/amagaki
|
|
54
|
-
```
|
|
55
|
-
## Benchmarks
|
|
56
|
-
|
|
57
|
-
You can view the [benchmark history](https://blinkk.github.io/amagaki/benchmark/) that shows the benchmark metrics when running `amagaki build` against the [amagaki-benchmark](https://github.com/blinkk/amagaki-benchmark) test repository.
|
|
58
|
-
|
|
59
|
-
[github-image]: https://github.com/blinkk/amagaki/workflows/Run%20tests/badge.svg
|
|
60
|
-
[github-url]: https://github.com/blinkk/amagaki/actions
|
|
61
|
-
[codecov-image]: https://codecov.io/gh/blinkk/amagaki/branch/main/graph/badge.svg
|
|
62
|
-
[codecov-url]: https://codecov.io/gh/blinkk/amagaki
|
|
63
|
-
[gts-image]: https://img.shields.io/badge/code%20style-google-blueviolet.svg
|
|
64
|
-
[gts-url]: https://github.com/google/gts
|
|
65
|
-
[npm-image]: https://img.shields.io/npm/v/@amagaki/amagaki.svg
|
|
66
|
-
[npm-url]: https://npmjs.org/package/@amagaki/amagaki
|