@_linked/cli 1.3.3 → 1.4.0

package/.github/workflows/ci.yml

@@ -38,6 +38,14 @@ jobs:
         if: steps.rpr.outputs.is_release_pr == 'false'
         run: npm run build
 
-      - name: Test
+      - name: Test (unit)
         if: steps.rpr.outputs.is_release_pr == 'false'
-        run: npm test --if-present
+        run: npm run test:unit --if-present
+
+      # e2e scaffolds a fresh app, installs deps from npm, starts a Fuseki
+      # testcontainer, and drives a browser flow. Requires Docker on the
+      # runner. Skipped until @_linked/* companion packages publish with
+      # matching versions; set RUN_E2E=1 to opt in once they do.
+      - name: Test (e2e)
+        if: steps.rpr.outputs.is_release_pr == 'false' && env.RUN_E2E == '1'
+        run: npm run test:e2e --if-present

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 1.4.0
+
+### Minor Changes
+
+- [#23](https://github.com/linked-cm/cli/pull/23) [`a00168d`](https://github.com/linked-cm/cli/commit/a00168d0e55a3f7f8164df1ea90e8fe52aefd5d4) Thanks [@flyon](https://github.com/flyon)! - Rename `LincdConfig` / `LincdWebpackConfig` / `LincdServerConfig` → `LinkedConfig` / `LinkedWebpackConfig` / `LinkedServerConfig`. Function `getLincdConfig` → `getLinkedConfig`. Legacy package.json flags `lincd: true` and `lincdApp: true` are no longer read — migrate to `linkedPackage: true` / `linkedApp: true`. Built loader registration is unaffected.
+
+  Plus: CLI command help text refresh (`LINCD app` → `Linked app`, etc.). Config file name `lincd.config.{js,json}` → `linked.config.{js,json}` (hard cut, no fallback) — was previously rolled out separately.
+
+- [#23](https://github.com/linked-cm/cli/pull/23) [`a00168d`](https://github.com/linked-cm/cli/commit/a00168d0e55a3f7f8164df1ea90e8fe52aefd5d4) Thanks [@flyon](https://github.com/flyon)! - Starter template: CN-branded CSS theme + `@_linked/react` integration in the example components.
+
+  **Brand defaults.** The `app-with-backend` template now ships with the CN palette (`--color-primary-*` mapped to a teal-blue ramp, `--color-secondary-*` to mint green) as a default-branded baseline. Apps override `@theme { --color-primary-500: ... }` to swap brand.
+
+  **Semantic-token shell.** `App.module.css`, `DefaultLayout.module.css`, `Header.module.css` rewritten using `@_linked/css` semantic tokens (`--bg-page`, `--bg-card`, `--color-primary-*`) instead of hardcoded hex. Module CSS files using `--spacing(N)` import `@_linked/css/package.css` per the documented pattern.
+
+  **Person CRUD demo uses `@_linked/react`.** `PersonOverview` is now built with `linkedSetComponent`, and `PersonPreview` with `linkedComponent` — replacing the previous `useEffect` + `useState` query patterns. The wrappers handle loading state via the framework's `.ld-loader` and inject `_refresh` so the form (sibling) and rows (children) can trigger re-fetch. Optimistic UI on inline edit via `_refresh({givenName, familyName})`.
+
+  **Pages polish.** `Home`, `Signin`, `Page1`, `PageNotFound` get card layouts using semantic tokens — consistent across routes.
+
+  **`@_linked/react` is now a direct dep** in the scaffolded app's `package.json` so the bindings can be imported. Companion changes ship in `@_linked/react` (loader / errorElement API, `_refresh` on set, factory overloads) and `@_linked/css` (`.ld-loader` / `.ld-error` defaults + `--color-error-*` ramp).
+
+  **Storage layout.** Template now ships `linked.backend.storage.ts` + `linked.backend.datasets.json` and a mirror `src/linked.frontend.storage.ts` + `src/linked.frontend.datasets.json`. Backend uses `loadStores` (async, dynamic-import). Frontend hardcodes the per-alias store mapping for webpack-friendly bundling.
+
+  **npm + yarn compatibility.** `create-app` works with either package manager. Lockfile-based detection determines which to invoke for install.
+
+  No breaking changes. Existing scaffolded apps that don't pull in the template updates keep working.
+
+### Patch Changes
+
+- [`67f01ab`](https://github.com/linked-cm/cli/commit/67f01abcbed04625175a5c82e584f09fee41cdea) - Remove `preflight.css` — moved to `@_linked/css`.
+
+  `preflight.css` is a CSS asset; it belongs in the CSS package alongside `theme-defaults.css` and `utilities.css`. Consumers should update imports from `@_linked/cli/preflight.css` to `@_linked/css/preflight.css`.
+
+  The exports entry `"./preflight.css": "./preflight.css"` is also removed from `package.json`.
+
+- [`2b40588`](https://github.com/linked-cm/cli/commit/2b405880cbb21992c5005cb048f910df79c32145) - Relax `typescript` dep from `^5.7.3` to `^5.4.0` so consumers that pin a lower 5.x version (e.g. CN at 5.4.5) don't end up with a nested `typescript@5.9.x` install in `packages/cli/node_modules/`. The nested 5.9.x was incompatible with `react-refresh-typescript@2.0.12`'s AST walk — crashed frontend builds with `TypeError: Cannot read properties of undefined (reading 'declarations')` inside `VariableStatement.declarationList.declarations` traversal.
+
 ## 1.3.3
 
 ### Patch Changes

package/README.md

@@ -86,7 +86,7 @@ The CLI recognizes two flags in `package.json`:
 }
 ```
 
-The legacy `lincd: true` and `lincdApp: true` flags are still read for the transition period.
+The legacy `lincd: true` / `lincdApp: true` flags are no longer read. Migrate to `linkedPackage` / `linkedApp`.
 
 ## Development
 
@@ -106,6 +106,25 @@ Templates live in `defaults/`:
 - `defaults/package/` — used by `linked create-package`
 - `defaults/setup-publish/` — workflow + changeset files written by `linked setup-publish` (single-branch default; `dual-branch/` subdirectory for the `--dual-branch` variant)
 
+### `linked create-app` template structure
+
+`linked create-app <name>` copies `defaults/app-with-backend/` to the new app's folder, substitutes `${name}` / `${hyphen_name}` / `${app_prefix}` / `${app_domain}` placeholders in selected files, and copies `linked.backend.datasets.example.json` → `linked.backend.datasets.json` so first boot works zero-config.
+
+Storage configuration follows the two-layer pattern from [backlog 016](https://github.com/create-now/docs/blob/main/docs/backlog/016-ejection-export-flow.md) (canonical spec) + the symmetric backend/frontend split:
+
+| File | Side | Role | Git |
+|---|---|---|---|
+| `linked.backend.storage.ts` | backend | Shape→alias routing. Uses `parseDatasetsConfig` + `loadStores` from `@_linked/core`; calls `LinkedStorage.setDefaultDataset(...)` / `setDatasetForShapes(...)`. | committed |
+| `linked.backend.datasets.json` | backend | Alias → `{ store, config }`. `store` is an npm import path; `config` is the store class's constructor arg. `${VAR:-default}` placeholders resolved at boot. | **gitignored** |
+| `linked.backend.datasets.example.json` | backend | Template / seed for the gitignored file. Has placeholders matching env vars. | committed |
+| `src/linked.frontend.storage.ts` | frontend | Same shape→alias model; imports store classes explicitly (webpack-bundle-safe), constructs per alias. | committed |
+| `src/linked.frontend.datasets.json` | frontend | Frontend alias → `{ store, config }`. Public values only — never put secrets here, it ships in the browser bundle. | committed |
+
+Conventions:
+- Aliases on the two sides are **independent**. The framework re-routes by shape on each side; matching alias names between FE and BE is convention, not a framework requirement.
+- The backend dispatcher is registry-free (dynamic `await import(entry.store)`). The frontend hardcodes each `new StoreClass(config)` because webpack can't bundle dynamic imports of arbitrary npm specifiers.
+- Each store class accepts a single config-object constructor argument — `new FusekiStore({ endpoint, credentials? })`, `new BackendAPIStore({ name?, id? })`.
+
 ## Repository
 
 `linked-cm/cli` on GitHub. License: MPL-2.0.

package/defaults/app-with-backend/.env-cmdrc.json

@@ -3,7 +3,9 @@
     "DATA_ROOT": "https://${app_domain}/data",
     "APP_PREFIX": "${app_prefix}",
     "APP_NAME": "${app_name}",
-    "SOURCE_PATH": "./src"
+    "SOURCE_PATH": "./src",
+    "FUSEKI_USER": "admin",
+    "FUSEKI_PASSWORD": "admin"
   },
   "development": {
     "NODE_ENV": "development",

package/defaults/app-with-backend/gitignore.template

@@ -5,6 +5,7 @@ public/bundles
 data/uploads
 data/metadata
 data/sessions
+linked.backend.datasets.json
 .yarn/*
 !.yarn/patches
 !.yarn/plugins

package/defaults/app-with-backend/linked.backend.datasets.example.json

@@ -0,0 +1,17 @@
+{
+  "_note": "Backend datasets config. Copy this file to linked.backend.datasets.json (gitignored) and replace placeholders with literal values, OR set the env vars referenced via ${VAR}. The ${VAR:-default} form falls back to the literal after :- when the env var is unset. Each entry has two keys: `store` (an npm import path string identifying the IDataset class) and `config` (a single JSON object passed verbatim to `new StoreClass(config)` — its fields are whatever that class's constructor expects).",
+
+  "datasets": {
+    "appData": {
+      "store": "@_linked/fuseki/shapes/FusekiStore",
+      "config": {
+        "endpoint": "${FUSEKI_BASE_URL:-http://localhost:3030}/${FUSEKI_DATASET:-${hyphen_name}-main}",
+        "credentials": {
+          "type":     "basic",
+          "username": "${FUSEKI_USER:-admin}",
+          "password": "${FUSEKI_PASSWORD:-admin}"
+        }
+      }
+    }
+  }
+}

package/defaults/app-with-backend/linked.backend.storage.ts

@@ -0,0 +1,35 @@
+// Backend storage for ${name}.
+//
+// Reads linked.backend.datasets.json, dynamically imports each alias's
+// store class via its npm path, and instantiates with the entry's `config`
+// verbatim. See the mirror at src/linked.frontend.storage.ts.
+import datasetsConfig from './linked.backend.datasets.json' assert { type: 'json' };
+import { parseDatasetsConfig } from '@_linked/core/utils/parseDatasetsConfig';
+import { loadStores } from '@_linked/core/utils/loadStores';
+import { LinkedStorage } from '@_linked/core/utils/LinkedStorage';
+import { LinkedFileStorage } from '@_linked/core/utils/LinkedFileStorage';
+import type { FusekiStore } from '@_linked/fuseki/shapes/FusekiStore';
+import { LocalFileStore } from '@_linked/server/shapes/filestores/LocalFileStore';
+
+// Resolve ${VAR} placeholders against the runtime environment, then
+// instantiate each store class declared in the JSON.
+const config = parseDatasetsConfig(datasetsConfig, process.env);
+const stores = await loadStores(config);
+
+// Auto-create the dataset on first boot.
+const appData = stores.appData as FusekiStore;
+appData.ensureDatasetExists().catch((err) =>
+  console.warn('dataset ensure failed:', err),
+);
+
+// Shape → alias. Single alias → default for every shape. For multi-alias
+// add per-shape pins, e.g.:
+//   import { Person } from '@_linked/schema/shapes/Person';
+//   LinkedStorage.setDatasetForShapes(stores.appData, [Person]);
+LinkedStorage.setDefaultDataset(appData);
+
+// File storage (binary assets). Separate from RDF dataset routing.
+const fileStore = new LocalFileStore(
+  (process.env.NODE_ENV || 'development') + '-files',
+);
+LinkedFileStorage.setDefaultDataset(fileStore);

package/defaults/app-with-backend/package.json

@@ -12,35 +12,20 @@
     "email": ""
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=20.6.0"
   },
   "main": "scripts/start-server.js",
   "license": "MIT",
   "scripts": {
-    "setup": "cp mrgit-template.json mrgit.json && yarn install && yarn mrgit sync && yarn install",
-    "start": "node --import ./node_modules/@_linked/cli/lib/esm/loaders/register.js node_modules/.bin/linked start --env development",
-    "build": "yarn linked build-app --env production",
-    "prepare": "husky",
-    "prepack": "pinst --disable",
-    "postpack": "pinst --enable",
-    "server:prod": "yarn linked start --env production",
+    "start": "linked start --env development",
+    "build": "linked build-app --env production",
+    "server:prod": "linked start --env production",
     "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"",
-    "lint:fix": "yarn lint --fix",
+    "lint:fix": "npm run lint -- --fix",
     "prettier": "prettier \"src/**/*.{js,jsx,ts,tsx,css,scss}\" --check",
-    "prettier:fix": "yarn prettier --write",
-    "format": "yarn prettier:fix && yarn lint:fix"
+    "prettier:fix": "npm run prettier -- --write",
+    "format": "npm run prettier:fix && npm run lint:fix"
   },
-  "lint-staged": {
-    "*.{js,ts,tsx}": [
-      "prettier --write"
-    ],
-    "*.{scss,css,json}": [
-      "prettier --write"
-    ]
-  },
-  "workspaces": [
-    "packages/*"
-  ],
   "keywords": [
     "linked",
     "linked code",
@@ -51,16 +36,20 @@
     "web3"
   ],
   "dependencies": {
-    "@_linked/core": "^2.0",
+    "@_linked/core": "^2.2",
     "@_linked/auth": "~1.0",
     "@_linked/server": "~1.0",
     "@_linked/server-utils": "~1.0",
+    "@_linked/schema": "^1.0",
+    "@_linked/fuseki": "^1.0",
+    "@_linked/react": "^1.2",
     "react": "^18.2",
     "react-dom": "^18.2",
     "react-error-boundary": "^3.1.3",
     "react-router-dom": "^6.3.0"
   },
   "devDependencies": {
+    "@_linked/cli": "^1.3",
     "@types/node": "^20.12.7",
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
@@ -73,14 +62,9 @@
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "latest",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "husky": "^8.0.0",
-    "@_linked/cli": "^1.2",
-    "mrgit": "latest",
     "nodemon": "^2.0.22",
-    "pinst": "^3.0.0",
     "pm2": "^5.3.0",
     "typescript-plugin-css-modules": "^5.1.0",
     "which": "^3.0.1"
-  },
-  "packageManager": "yarn@3.6.1"
+  }
 }

package/defaults/app-with-backend/readme.md

@@ -1,19 +1,93 @@
-# installation
+# ${name}
 
-Optional: to work on source of any `@_linked/*` packages locally, edit `mrgit-template.json` to list the packages you want cloned into `packages/`. Then run:
+A standalone [Linked](https://linked.cm) app generated with `@_linked/cli`. Requires **Node ≥ 20.6**.
+
+## What is Linked
+
+Linked is a TypeScript framework for building apps on top of a graph database (RDF / SPARQL). You write your domain as **shape classes**, query them with a **typed DSL**, and render with **linked React components** that subscribe to the query results.
+
+```ts
+// 1. A shape — domain class + SHACL metadata, generated from TypeScript decorators
+@linkedShape
+export class Person extends Shape {
+  static targetClass = schema.Person;
+
+  @literalProperty({ path: schema.givenName })  givenName: string;
+  @literalProperty({ path: schema.familyName }) familyName: string;
+}
+
+// 2. A query — TypeScript-embedded, type-inferred, executed against any IDataset
+const people = await Person.select((p) => [p.givenName, p.familyName]);
+
+// 3. A linked component — re-renders when its query result changes
+const PersonCard = linkedComponent(
+  Person.select((p) => [p.givenName, p.familyName]),
+  ({ givenName, familyName }) => <span>{givenName} {familyName}</span>,
+);
+```
+
+The home page in this app demonstrates the full chain end-to-end with `@_linked/schema`'s shipped `Person` shape.
+
+- **[@_linked/core](https://github.com/linked-cm/core)** — query DSL, Shape classes, storage routing.
+- **[@_linked/react](https://github.com/Semantu/linked-react)** — `linkedComponent`, `linkedSetComponent`.
+
+## Install + run
+
+With npm:
 
 ```bash
-yarn setup
+npm install
+npm start
 ```
 
-Otherwise just install dependencies:
+Or with yarn:
 
 ```bash
 yarn install
+yarn start
+```
+
+The home page demonstrates the `@_linked` query DSL with a small Person CRUD — see `src/components/PersonOverview.tsx` and `src/components/PersonPreview.tsx`.
+
+> If you scaffolded this app **inside an existing Yarn-workspace monorepo** (e.g. `create_now/packages/`), use `yarn install` — `npm install` walks up to the workspace root and may hit peer-dep conflicts there. Outside a workspace, either tool works.
+
+## Storage
+
+This app talks to an Apache Jena Fuseki SPARQL endpoint. Start a local Fuseki container:
+
+```bash
+docker run -d --rm -p 3030:3030 --name fuseki stain/jena-fuseki
 ```
 
-Start the app:
+The app auto-creates its dataset on first boot.
+
+**Storage config lives in three files**, per the spec in [`@_linked/cli` docs](https://www.npmjs.com/package/@_linked/cli):
+
+| File | Purpose |
+|---|---|
+| `linked.backend.datasets.json` | Backend Layer 2 — alias → store class + config. Gitignored. Copy of `linked.backend.datasets.example.json`. |
+| `linked.backend.storage.ts` | Backend Layer 1 — shape → alias routing. Parses the JSON, instantiates stores via `loadStores`, calls `LinkedStorage.setDefaultDataset(...)` / `setDatasetForShapes(...)`. |
+| `src/linked.frontend.{storage.ts,datasets.json}` | Frontend mirror — same JSON shape, public values only; storage TS imports store classes explicitly and constructs one per alias. |
+
+Defaults shipped:
+
+- `FUSEKI_BASE_URL` — `http://localhost:3030`
+- `FUSEKI_DATASET`  — `${hyphen_name}-main`
+- `FUSEKI_USER` / `FUSEKI_PASSWORD` — `admin` / `admin` (matches the `stain/jena-fuseki` Docker image default)
+- `FUSEKI_DB_TYPE`  — `tdb2` (persistent). Set to `mem` for in-memory.
+
+All of these are referenced as `${VAR:-default}` placeholders in `linked.backend.datasets.json`, so you can either edit the JSON directly or set env vars.
+
+## Build for production
 
 ```bash
-yarn start
+npm run build
+npm run server:prod
 ```
+
+## Learn more
+
+- [@_linked/core](https://www.npmjs.com/package/@_linked/core) — query DSL, Shape classes, storage routing. See `parseDatasetsConfig` + `loadStores` for the dataset-config helpers.
+- [@_linked/react](https://www.npmjs.com/package/@_linked/react) — `linkedComponent`, `linkedSetComponent`.
+- [@_linked/schema](https://www.npmjs.com/package/@_linked/schema) — shipped Shape classes (Person, Place, Organization, …).
+- [@_linked/css](https://www.npmjs.com/package/@_linked/css) — design tokens, Tailwind v4 theme primitives, `@utility` mixins. See `src/theme.css` for the wiring.

package/jest.config.cjs

@@ -0,0 +1,29 @@
+// Jest config for @_linked/cli unit tests.
+//
+// Tests target the compiled CJS output in lib/cjs, not raw src/. This avoids
+// configuring jest's ESM mode (notoriously fiddly with our mixed tsx/ESM
+// runtime) and keeps the test runner identical to what npm consumers see.
+// Run `yarn build` before `yarn test:unit` so lib/cjs exists.
+//
+// E2E specs live in tests/e2e/ and run under Playwright (see
+// playwright.config.ts), not Jest.
+module.exports = {
+  testEnvironment: 'node',
+  rootDir: '.',
+  roots: ['<rootDir>/tests/unit'],
+  testMatch: ['**/*.test.{ts,js}'],
+  transform: {
+    '^.+\\.tsx?$': [
+      'babel-jest',
+      {
+        configFile: false,
+        babelrc: false,
+        presets: [
+          ['@babel/preset-env', { targets: { node: 'current' } }],
+          '@babel/preset-typescript',
+        ],
+      },
+    ],
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
+};

package/lib/cjs/cli-methods.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-methods.d.ts","sourceRoot":"","sources":["../../src/cli-methods.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli-methods.d.ts","sourceRoot":"","sources":["../../src/cli-methods.ts"],"names":[],"mappings":"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"}

package/lib/cjs/cli-methods.js

@@ -66,6 +66,35 @@ let dirname__ = typeof __dirname !== 'undefined'
     ? __dirname
     : //@ts-ignore
         (0, path_1.dirname)(import.meta.url).replace('file:/', '');
+/**
+ * Dynamically import the app's backend storage configuration. Tries the
+ * canonical `linked.backend.storage.{ts,js}` at app root first, then the
+ * earlier `backend-storage-config.{ts,js}` (Iter3), then the legacy
+ * `scripts/storage-config.js` (pre-rename). The fallback chain lets older
+ * app clones keep booting through the rename.
+ */
+async function loadBackendStorageConfig() {
+    const cwd = process.cwd();
+    const candidates = [
+        // Iter4 canonical:
+        path_1.default.join(cwd, 'linked.backend.storage.ts'),
+        path_1.default.join(cwd, 'linked.backend.storage.js'),
+        // Iter3:
+        path_1.default.join(cwd, 'backend-storage-config.ts'),
+        path_1.default.join(cwd, 'backend-storage-config.js'),
+        path_1.default.join(cwd, 'scripts', 'backend-storage-config.js'),
+        path_1.default.join(cwd, 'scripts', 'backend-storage-config.ts'),
+        // legacy pre-rename:
+        path_1.default.join(cwd, 'scripts', 'storage-config.js'),
+    ];
+    for (const candidate of candidates) {
+        if (fs_extra_1.default.existsSync(candidate)) {
+            return Promise.resolve(`${candidate}`).then(s => __importStar(require(s)));
+        }
+    }
+    console.warn(chalk_1.default.yellow('[linked.backend.storage] no linked.backend.storage.{ts,js} found at app root.'));
+    return undefined;
+}
 var variables = {};
 /**
  * Prompt user for input
@@ -136,8 +165,15 @@ const createApp = async (name, basePath = process.cwd(), options = {}) => {
     });
     fs_extra_1.default.renameSync(path_1.default.join(targetFolder, 'gitignore.template'), path_1.default.join(targetFolder, '.gitignore'));
     fs_extra_1.default.renameSync(path_1.default.join(targetFolder, 'yarnrc.yml.template'), path_1.default.join(targetFolder, '.yarnrc.yml'));
+    // Seed the real (gitignored) Layer 2 config from the committed example so
+    // the scaffolded app boots first try. Users can edit either file later.
+    const datasetsExample = path_1.default.join(targetFolder, 'linked.backend.datasets.example.json');
+    const datasetsReal = path_1.default.join(targetFolder, 'linked.backend.datasets.json');
+    if (fs_extra_1.default.existsSync(datasetsExample) && !fs_extra_1.default.existsSync(datasetsReal)) {
+        fs_extra_1.default.copySync(datasetsExample, datasetsReal);
+    }
     // fs.copySync(path.join(__dirname, '..', 'defaults', 'app'), targetFolder);
-    log("Creating new LINCD application '" + appName + "'");
+    log("Creating new Linked app '" + appName + "'");
     //replace variables in some copied files
     await replaceVariablesInFolder(targetFolder);
     if (!options.skipInstall) {
@@ -149,7 +185,7 @@ const createApp = async (name, basePath = process.cwd(), options = {}) => {
             console.warn('Could not install dependencies or start application');
         });
     }
-    log(`Your LINCD App is ready at ${chalk_1.default.blueBright(targetFolder)}`, `To start, run\n${chalk_1.default.blueBright(`cd ${hyphenName}`)} and then ${chalk_1.default.blueBright('yarn start')}`);
+    log(`Your Linked app is ready at ${chalk_1.default.blueBright(targetFolder)}`, `\nStorage: linked.backend.storage.ts wires aliases to stores; linked.backend.datasets.json holds endpoints.`, `Defaults to Fuseki at ${chalk_1.default.cyan('http://localhost:3030')} (auto-creates the dataset on first boot).`, `Make sure Fuseki is running, e.g.:`, `  ${chalk_1.default.blueBright('docker run -d --rm -p 3030:3030 --name fuseki stain/jena-fuseki')}`, `Edit ${chalk_1.default.cyan('linked.backend.datasets.json')} to change endpoints or credentials.`, `Mirror file for the frontend: ${chalk_1.default.cyan('src/linked.frontend.storage.ts')} + ${chalk_1.default.cyan('src/linked.frontend.datasets.json')}.`, `\nTo start (with npm or yarn):`, `  ${chalk_1.default.blueBright(`cd ${hyphenName} && npm start`)}`, `  ${chalk_1.default.gray('# or: yarn start')}`);
 };
 exports.createApp = createApp;
 function logHelp() {
@@ -232,7 +268,7 @@ function checkPackagePath(rootPath, packagePath, res) {
         if (pack && pack.workspaces) {
             checkWorkspaces(packagePath, pack.workspaces, res);
         }
-        else if (pack && (pack.linkedPackage === true || pack.lincd === true)) {
+        else if (pack && pack.linkedPackage === true) {
             res.push({
                 path: packagePath,
                 packageName: pack.name,
@@ -443,7 +479,7 @@ function findAppRoot(startPath = process.cwd()) {
             candidateRoots.push({
                 path: currentPath,
                 hasWorkspaces: !!packageJson.workspaces,
-                isLincd: packageJson.linkedPackage === true || packageJson.lincd === true,
+                isLinked: packageJson.linkedPackage === true,
             });
         }
         const parentPath = path_1.default.join(currentPath, '..');
@@ -454,16 +490,16 @@ function findAppRoot(startPath = process.cwd()) {
         currentPath = parentPath;
     }
     // Find the topmost package.json that has workspaces
-    // Prefer non-lincd packages (app roots) over lincd packages
+    // Prefer non-linked packages (app roots) over linked packages
     let appRoot = null;
     for (let i = candidateRoots.length - 1; i >= 0; i--) {
         const candidate = candidateRoots[i];
-        if (candidate.hasWorkspaces && !candidate.isLincd) {
+        if (candidate.hasWorkspaces && !candidate.isLinked) {
             appRoot = candidate.path;
             break;
         }
     }
-    // If no non-lincd workspace found, use the topmost workspace
+    // If no non-linked workspace found, use the topmost workspace
     if (!appRoot) {
         for (let i = candidateRoots.length - 1; i >= 0; i--) {
             if (candidateRoots[i].hasWorkspaces) {
@@ -1307,23 +1343,23 @@ exports.runScript = runScript;
 const runMethod = async (packageName, method, options) => {
     await (0, exports.ensureEnvironmentLoaded)();
     if (options.spawn) {
-        let lincdConfig = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'lincd.config.js')}`).then(s => __importStar(require(s)))).default;
+        let linkedConfig = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'linked.config.js')}`).then(s => __importStar(require(s)))).default;
         // Set default loadAppComponent if not provided
-        if (!lincdConfig.server) {
-            lincdConfig.server = {};
+        if (!linkedConfig.server) {
+            linkedConfig.server = {};
         }
-        if (!lincdConfig.server.loadAppComponent) {
-            lincdConfig.server.loadAppComponent = async () => (await Promise.resolve(`${path_1.default.join(process.cwd(), 'src', 'App')}`).then(s => __importStar(require(s)))).default;
+        if (!linkedConfig.server.loadAppComponent) {
+            linkedConfig.server.loadAppComponent = async () => (await Promise.resolve(`${path_1.default.join(process.cwd(), 'src', 'App')}`).then(s => __importStar(require(s)))).default;
         }
         // Set default loadRoutes if not provided
-        if (!lincdConfig.server.loadRoutes) {
-            lincdConfig.server.loadRoutes = async () => await Promise.resolve(`${path_1.default.join(process.cwd(), 'src', 'routes.tsx')}`).then(s => __importStar(require(s)));
+        if (!linkedConfig.server.loadRoutes) {
+            linkedConfig.server.loadRoutes = async () => await Promise.resolve(`${path_1.default.join(process.cwd(), 'src', 'routes.tsx')}`).then(s => __importStar(require(s)));
         }
         //@ts-ignore
         const ServerClass = (await Promise.resolve().then(() => __importStar(require('@_linked/server/shapes/LincdServer'))))
             .LincdServer;
-        await Promise.resolve(`${path_1.default.join(process.cwd(), 'scripts', 'storage-config.js')}`).then(s => __importStar(require(s)));
-        let server = new ServerClass(lincdConfig);
+        await loadBackendStorageConfig();
+        let server = new ServerClass(linkedConfig);
         //init the server
         console.log('Initializing server...');
         server.initOnly().then(() => {
@@ -1396,7 +1432,7 @@ const runMethod = async (packageName, method, options) => {
 exports.runMethod = runMethod;
 const startServer = async (initOnly = false, ServerClass = null) => {
     await (0, exports.ensureEnvironmentLoaded)();
-    let lincdConfig = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'lincd.config.js')}`).then(s => __importStar(require(s))))
+    let linkedConfig = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'linked.config.js')}`).then(s => __importStar(require(s))))
         .default;
     // function scssLoadcall(source, filename) {
     //   return 'console.log("SCSS CALL: ' + filename + '");\n' + source;
@@ -1412,12 +1448,12 @@ const startServer = async (initOnly = false, ServerClass = null) => {
         //@ts-ignore
         ServerClass = (await Promise.resolve().then(() => __importStar(require('@_linked/server/shapes/LincdServer')))).LincdServer;
     }
-    await Promise.resolve(`${path_1.default.join(process.cwd(), 'scripts', 'storage-config.js')}`).then(s => __importStar(require(s)));
+    await loadBackendStorageConfig();
     // Set default loadAppComponent if not provided
-    if (!lincdConfig.server) {
-        lincdConfig.server = {};
+    if (!linkedConfig.server) {
+        linkedConfig.server = {};
     }
-    if (!lincdConfig.server.loadAppComponent) {
+    if (!linkedConfig.server.loadAppComponent) {
         let appPromise;
         if (process.env.NODE_ENV !== 'development') {
             appPromise = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'lib', 'App.js')}`).then(s => __importStar(require(s))))
@@ -1427,13 +1463,13 @@ const startServer = async (initOnly = false, ServerClass = null) => {
             appPromise = (await Promise.resolve(`${path_1.default.join(process.cwd(), 'src', 'App.tsx')}`).then(s => __importStar(require(s))))
                 .default;
         }
-        lincdConfig.server.loadAppComponent = async () => {
+        linkedConfig.server.loadAppComponent = async () => {
             return appPromise;
         };
     }
     // Set default loadRoutes if not provided
-    if (!lincdConfig.server.loadRoutes) {
-        lincdConfig.server.loadRoutes = async () => {
+    if (!linkedConfig.server.loadRoutes) {
+        linkedConfig.server.loadRoutes = async () => {
             if (process.env.NODE_ENV !== 'development') {
                 return await Promise.resolve(`${path_1.default.join(process.cwd(), 'lib', 'routes.js')}`).then(s => __importStar(require(s)));
             }
@@ -1442,7 +1478,7 @@ const startServer = async (initOnly = false, ServerClass = null) => {
             }
         };
     }
-    let server = new ServerClass(lincdConfig);
+    let server = new ServerClass(linkedConfig);
     //Important to use slice, because when using clusers, child processes need to be able to read the same arguments
     let args = process.argv.slice(2);
     //if --initOnly is passed, only initialize the server and don't start it
@@ -1513,10 +1549,10 @@ const buildFrontend = async () => {
             // process.exit();
         }
         // load the storage config
-        const storageConfig = await Promise.resolve(`${path_1.default.join(process.cwd(), 'scripts', 'storage-config.js')}`).then(s => __importStar(require(s)));
+        const storageConfig = await loadBackendStorageConfig();
         // check if LincdFileStorage has a default FileStore
         // if yes: copy all the files in the build folder over with LincdFileStorage
-        if (LinkedFileStorage_1.LinkedFileStorage.getDefaultStore()) {
+        if (LinkedFileStorage_1.LinkedFileStorage.getDefaultDataset()) {
             // get public directory
             const rootDirectory = 'public';
             const pathDir = path_1.default.join(process.cwd(), rootDirectory);
@@ -1917,8 +1953,8 @@ const buildPackage = async (target, target2, packagePath = process.cwd(), logRes
     // `linked build-app`. Plain packages (no linked flag) have no build pipeline
     // defined here and should have their own build script.
     const pkgJson = JSON.parse(fs_extra_1.default.readFileSync(path_1.default.join(packagePath, 'package.json'), 'utf8'));
-    const isPackage = pkgJson.linkedPackage === true || pkgJson.lincd === true;
-    const isApp = pkgJson.linkedApp === true || pkgJson.lincdApp === true;
+    const isPackage = pkgJson.linkedPackage === true;
+    const isApp = pkgJson.linkedApp === true;
     if (!isPackage) {
         if (isApp) {
             console.error(chalk_1.default.red(`'${pkgJson.name || packagePath}' is a linkedApp, not a linkedPackage. Use 'linked build-app' instead of 'linked build'.`));