lincd-cli 0.2.22 → 0.2.24
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.
|
@@ -18,12 +18,13 @@ const Page1 = lazy(() => import('./pages/Page1' /* webpackPrefetch: true */));
|
|
|
18
18
|
declare var window;
|
|
19
19
|
export default function App({
|
|
20
20
|
assets = typeof window !== 'undefined' ? window['assetManifest'] : {},
|
|
21
|
-
//on the frontend data will not be set yet, but it will be present in the initial HTML as a script tag with JSON-LD inside, with the ID:
|
|
21
|
+
//on the frontend data will not be set yet, but it will be present in the initial HTML as a script tag with JSON-LD inside, with the ID: request-ld
|
|
22
22
|
//so here we read that back to the data variable, so that the rendering (of that same <script> tag) will be identical as the backend
|
|
23
|
-
|
|
23
|
+
requestLD = typeof document !== 'undefined' ? document.getElementById('request-ld')?.innerText : null,
|
|
24
|
+
requestObject = typeof document !== 'undefined' ? document.getElementById('request-json')?.innerText : null,
|
|
24
25
|
}) {
|
|
25
26
|
return (
|
|
26
|
-
<Html assets={assets}
|
|
27
|
+
<Html assets={assets} requestObject={requestObject} requestLD={requestLD} title="${name} - LINCD App">
|
|
27
28
|
<Suspense fallback={<Spinner />}>
|
|
28
29
|
<ErrorBoundary FallbackComponent={Error}>
|
|
29
30
|
<Content />
|
|
@@ -90,20 +91,25 @@ function Header() {
|
|
|
90
91
|
);
|
|
91
92
|
}
|
|
92
93
|
|
|
93
|
-
function Html({assets,
|
|
94
|
+
function Html({assets,requestObject,requestLD,children,title}) {
|
|
94
95
|
return (
|
|
95
96
|
<html lang="en">
|
|
96
97
|
{globalThis.document?.head ? (
|
|
97
98
|
<head dangerouslySetInnerHTML={{__html: document.head.innerHTML}} />
|
|
98
99
|
) : (
|
|
99
100
|
<head>
|
|
101
|
+
<title>{title}</title>
|
|
102
|
+
|
|
100
103
|
<meta charSet="utf-8" />
|
|
101
104
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
105
|
+
|
|
102
106
|
<link rel="shortcut icon" href="/static/favicon.ico" />
|
|
103
107
|
<link rel="stylesheet" href={assets['main.css']} />
|
|
108
|
+
|
|
104
109
|
{assets['tailwind-cdn'] && <script src={assets['tailwind-cdn']}></script>}
|
|
105
|
-
<
|
|
106
|
-
<script id='
|
|
110
|
+
<script id='request-ld' type='application/ld+json' dangerouslySetInnerHTML={{__html: requestLD}} />
|
|
111
|
+
<script id='request-json' type='application/json' dangerouslySetInnerHTML={{__html: requestObject}} />
|
|
112
|
+
|
|
107
113
|
</head>
|
|
108
114
|
)}
|
|
109
115
|
<body>
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import {initFrontend} from 'lincd-server/lib/utils/Frontend';
|
|
2
|
+
|
|
1
3
|
window['$RefreshReg$'] = () => {};
|
|
2
4
|
window['$RefreshSig$'] = () => () => {};
|
|
3
5
|
|
|
@@ -12,11 +14,14 @@ import {BackendFileStore} from 'lincd-server/lib/shapes/BackendFileStore';
|
|
|
12
14
|
export const store = new BackendFileStore('main');
|
|
13
15
|
Storage.setDefaultStore(store);
|
|
14
16
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
17
|
+
|
|
18
|
+
initFrontend().then(() => {
|
|
19
|
+
hydrateRoot(
|
|
20
|
+
document,
|
|
21
|
+
<React.StrictMode>
|
|
22
|
+
<BrowserRouter>
|
|
23
|
+
<App assets={window['assetManifest']} />
|
|
24
|
+
</BrowserRouter>
|
|
25
|
+
</React.StrictMode>,
|
|
26
|
+
);
|
|
27
|
+
});
|
package/lib/cli-methods.js
CHANGED
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
26
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
27
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -81,9 +104,7 @@ var fs_extra_1 = __importDefault(require("fs-extra"));
|
|
|
81
104
|
var utils_1 = require("./utils");
|
|
82
105
|
var chalk_1 = __importDefault(require("chalk"));
|
|
83
106
|
var child_process_1 = require("child_process");
|
|
84
|
-
var package_metadata_js_1 = require("lincd-modules/lib/scripts/package-metadata.js");
|
|
85
107
|
var models_1 = require("lincd/lib/models");
|
|
86
|
-
var Module_1 = require("lincd-modules/lib/shapes/Module");
|
|
87
108
|
var env_cmd_1 = require("env-cmd");
|
|
88
109
|
var JSONLDWriter_1 = require("lincd-jsonld/lib/utils/JSONLDWriter");
|
|
89
110
|
var NameSpace_1 = require("lincd/lib/utils/NameSpace");
|
|
@@ -362,8 +383,9 @@ function buildAll(target, target2, target3) {
|
|
|
362
383
|
}
|
|
363
384
|
debugInfo('Now building: ' + chalk_1["default"].blue(packageGroup.map(function (i) { return i.packageName; })));
|
|
364
385
|
return function (pkg) { return __awaiter(_this, void 0, void 0, function () {
|
|
365
|
-
var command;
|
|
386
|
+
var command, skipping;
|
|
366
387
|
return __generator(this, function (_a) {
|
|
388
|
+
skipping = false;
|
|
367
389
|
//if we're skipping builds until a certain package
|
|
368
390
|
if (!building) {
|
|
369
391
|
//if the package name matches the package we're supposed to start from then start building packages
|
|
@@ -374,6 +396,7 @@ function buildAll(target, target2, target3) {
|
|
|
374
396
|
else {
|
|
375
397
|
log(chalk_1["default"].blue('skipping ' + pkg.packageName));
|
|
376
398
|
command = Promise.resolve(true);
|
|
399
|
+
skipping = true;
|
|
377
400
|
}
|
|
378
401
|
}
|
|
379
402
|
//unless told otherwise, build the package
|
|
@@ -403,7 +426,9 @@ function buildAll(target, target2, target3) {
|
|
|
403
426
|
}
|
|
404
427
|
})
|
|
405
428
|
.then(function (res) {
|
|
406
|
-
|
|
429
|
+
if (!skipping) {
|
|
430
|
+
log(chalk_1["default"].green('Built ' + pkg.packageName));
|
|
431
|
+
}
|
|
407
432
|
done.add(pkg);
|
|
408
433
|
packagesLeft--;
|
|
409
434
|
// log(chalk.magenta(packagesLeft + ' packages left'));
|
|
@@ -959,7 +984,7 @@ var register = function (registryURL) {
|
|
|
959
984
|
};
|
|
960
985
|
exports.register = register;
|
|
961
986
|
var buildMetadata = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
962
|
-
var app, envVars, updatedPaths, localPackagePaths, metadataFolder, _loop_1, localPackagePaths_1, localPackagePaths_1_1, _a, packageCodeName, packagePath, lincdPackagePath, isAppPackage,
|
|
987
|
+
var app, envVars, updatedPaths, localPackagePaths, metadataFolder, _loop_1, localPackagePaths_1, localPackagePaths_1_1, _a, packageCodeName, packagePath, lincdPackagePath, isAppPackage, packageMetaData, metadataFile;
|
|
963
988
|
var e_1, _b;
|
|
964
989
|
return __generator(this, function (_c) {
|
|
965
990
|
switch (_c.label) {
|
|
@@ -986,13 +1011,12 @@ var buildMetadata = function () { return __awaiter(void 0, void 0, void 0, funct
|
|
|
986
1011
|
case 2:
|
|
987
1012
|
_c.sent(); //{recursive:true} but not needed with fs-extra
|
|
988
1013
|
_loop_1 = function (packageCodeName, packagePath, lincdPackagePath, isAppPackage) {
|
|
989
|
-
var errors;
|
|
990
|
-
return
|
|
991
|
-
|
|
992
|
-
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
var pkg, lincdApp, packageMetaData_1, metadataFile_1;
|
|
1014
|
+
var errors = false;
|
|
1015
|
+
Promise.resolve().then(function () { return __importStar(require('lincd-modules/lib/scripts/package-metadata.js')); }).then(function (script) { return __awaiter(void 0, void 0, void 0, function () {
|
|
1016
|
+
return __generator(this, function (_a) {
|
|
1017
|
+
switch (_a.label) {
|
|
1018
|
+
case 0: return [4 /*yield*/, script.getPackageMetadata(packagePath, lincdPackagePath).then(function (response) { return __awaiter(void 0, void 0, void 0, function () {
|
|
1019
|
+
var pkgNode, lincdApp, packageMetaData_1, metadataFile_1;
|
|
996
1020
|
return __generator(this, function (_a) {
|
|
997
1021
|
switch (_a.label) {
|
|
998
1022
|
case 0:
|
|
@@ -1003,16 +1027,16 @@ var buildMetadata = function () { return __awaiter(void 0, void 0, void 0, funct
|
|
|
1003
1027
|
errors = true;
|
|
1004
1028
|
return [3 /*break*/, 3];
|
|
1005
1029
|
case 1:
|
|
1006
|
-
|
|
1030
|
+
pkgNode = models_1.NamedNode.getOrCreate(response.packageUri);
|
|
1007
1031
|
lincdApp = (0, NameSpace_1.createNameSpace)('http://lincd.org/ont/lincd-app/');
|
|
1008
1032
|
Prefix_1.Prefix.add('lincdApp', 'http://lincd.org/ont/lincd-app/');
|
|
1009
1033
|
if (isAppPackage) {
|
|
1010
1034
|
//Note: this needs to match with LincdWebApp.ownPackage accessor;
|
|
1011
|
-
app.overwrite(lincdApp('ownPackage'),
|
|
1035
|
+
app.overwrite(lincdApp('ownPackage'), pkgNode);
|
|
1012
1036
|
}
|
|
1013
1037
|
else {
|
|
1014
1038
|
//Note: this needs to match with LincdWebApp.packages accessor;
|
|
1015
|
-
app.set(lincdApp('maintainsPackage'),
|
|
1039
|
+
app.set(lincdApp('maintainsPackage'), pkgNode);
|
|
1016
1040
|
}
|
|
1017
1041
|
packageMetaData_1 = JSON.stringify(response.result, null, 2);
|
|
1018
1042
|
metadataFile_1 = path_1["default"].join(metadataFolder, packageCodeName + '.json');
|
|
@@ -1026,46 +1050,34 @@ var buildMetadata = function () { return __awaiter(void 0, void 0, void 0, funct
|
|
|
1026
1050
|
}
|
|
1027
1051
|
});
|
|
1028
1052
|
}); })];
|
|
1029
|
-
|
|
1030
|
-
|
|
1031
|
-
|
|
1032
|
-
|
|
1033
|
-
|
|
1053
|
+
case 1:
|
|
1054
|
+
_a.sent();
|
|
1055
|
+
return [2 /*return*/];
|
|
1056
|
+
}
|
|
1057
|
+
});
|
|
1058
|
+
}); });
|
|
1034
1059
|
};
|
|
1035
|
-
_c.label = 3;
|
|
1036
|
-
case 3:
|
|
1037
|
-
_c.trys.push([3, 8, 9, 10]);
|
|
1038
|
-
localPackagePaths_1 = __values(localPackagePaths), localPackagePaths_1_1 = localPackagePaths_1.next();
|
|
1039
|
-
_c.label = 4;
|
|
1040
|
-
case 4:
|
|
1041
|
-
if (!!localPackagePaths_1_1.done) return [3 /*break*/, 7];
|
|
1042
|
-
_a = __read(localPackagePaths_1_1.value, 4), packageCodeName = _a[0], packagePath = _a[1], lincdPackagePath = _a[2], isAppPackage = _a[3];
|
|
1043
|
-
return [5 /*yield**/, _loop_1(packageCodeName, packagePath, lincdPackagePath, isAppPackage)];
|
|
1044
|
-
case 5:
|
|
1045
|
-
_c.sent();
|
|
1046
|
-
_c.label = 6;
|
|
1047
|
-
case 6:
|
|
1048
|
-
localPackagePaths_1_1 = localPackagePaths_1.next();
|
|
1049
|
-
return [3 /*break*/, 4];
|
|
1050
|
-
case 7: return [3 /*break*/, 10];
|
|
1051
|
-
case 8:
|
|
1052
|
-
e_1_1 = _c.sent();
|
|
1053
|
-
e_1 = { error: e_1_1 };
|
|
1054
|
-
return [3 /*break*/, 10];
|
|
1055
|
-
case 9:
|
|
1056
1060
|
try {
|
|
1057
|
-
|
|
1061
|
+
for (localPackagePaths_1 = __values(localPackagePaths), localPackagePaths_1_1 = localPackagePaths_1.next(); !localPackagePaths_1_1.done; localPackagePaths_1_1 = localPackagePaths_1.next()) {
|
|
1062
|
+
_a = __read(localPackagePaths_1_1.value, 4), packageCodeName = _a[0], packagePath = _a[1], lincdPackagePath = _a[2], isAppPackage = _a[3];
|
|
1063
|
+
_loop_1(packageCodeName, packagePath, lincdPackagePath, isAppPackage);
|
|
1064
|
+
}
|
|
1058
1065
|
}
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
|
|
1062
|
-
|
|
1066
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
1067
|
+
finally {
|
|
1068
|
+
try {
|
|
1069
|
+
if (localPackagePaths_1_1 && !localPackagePaths_1_1.done && (_b = localPackagePaths_1["return"])) _b.call(localPackagePaths_1);
|
|
1070
|
+
}
|
|
1071
|
+
finally { if (e_1) throw e_1.error; }
|
|
1072
|
+
}
|
|
1073
|
+
return [4 /*yield*/, JSONLDWriter_1.JSONLDWriter.stringify(app, process.env.NODE_ENV === 'development')];
|
|
1074
|
+
case 3:
|
|
1063
1075
|
packageMetaData = _c.sent();
|
|
1064
1076
|
metadataFile = path_1["default"].join(metadataFolder, '_app.json');
|
|
1065
1077
|
return [4 /*yield*/, fs_extra_1["default"].writeFile(metadataFile, packageMetaData).then(function () {
|
|
1066
1078
|
updatedPaths.push(metadataFile);
|
|
1067
1079
|
})];
|
|
1068
|
-
case
|
|
1080
|
+
case 4:
|
|
1069
1081
|
_c.sent();
|
|
1070
1082
|
return [2 /*return*/, updatedPaths];
|
|
1071
1083
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "lincd-cli",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.24",
|
|
4
4
|
"description": "Command line tools for the lincd.js library",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"license-info-webpack-plugin": "^3.0.0",
|
|
61
61
|
"lincd": "^0.5",
|
|
62
62
|
"lincd-app": "^0.1",
|
|
63
|
-
"lincd-jsonld": "^0.1",
|
|
63
|
+
"lincd-jsonld": "^0.1.13",
|
|
64
64
|
"lincd-modules": "^0.1",
|
|
65
65
|
"load-grunt-tasks": "^5.1.0",
|
|
66
66
|
"mini-css-extract-plugin": "^2.7.5",
|