livingdocs-cli 1.3.1 → 2.1.0

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g livingdocs-cli
 $ livingdocs-cli COMMAND
 running command...
 $ livingdocs-cli (-v|--version|version)
-livingdocs-cli/0.0.0 darwin-x64 node-v12.10.0
+livingdocs-cli/2.1.0 linux-x64 node-v16.11.1
 $ livingdocs-cli --help [COMMAND]
 USAGE
   $ livingdocs-cli COMMAND
@@ -29,42 +29,47 @@ USAGE
 <!-- usagestop -->
 # Commands
 <!-- commands -->
-* [`livingdocs-cli cli-config:print`](#livingdocs-cli-cli-configprint)
 * [`livingdocs-cli component-library:build`](#livingdocs-cli-component-librarybuild)
+* [`livingdocs-cli config:print`](#livingdocs-cli-configprint)
 * [`livingdocs-cli design-server:start`](#livingdocs-cli-design-serverstart)
 * [`livingdocs-cli help [COMMAND]`](#livingdocs-cli-help-command)
 * [`livingdocs-cli project-config:download`](#livingdocs-cli-project-configdownload)
 * [`livingdocs-cli project-config:drafts`](#livingdocs-cli-project-configdrafts)
+* [`livingdocs-cli project-config:import-design`](#livingdocs-cli-project-configimport-design)
 * [`livingdocs-cli project-config:plan`](#livingdocs-cli-project-configplan)
 * [`livingdocs-cli project-config:publish`](#livingdocs-cli-project-configpublish)
 * [`livingdocs-cli project-config:upload`](#livingdocs-cli-project-configupload)
 * [`livingdocs-cli project-config:upload_assets`](#livingdocs-cli-project-configupload_assets)
 
-## `livingdocs-cli cli-config:print`
+## `livingdocs-cli component-library:build`
 
-Print current CLI configuration
+Build a Component Library JSON file
 
 ```
 USAGE
-  $ livingdocs-cli cli-config:print
+  $ livingdocs-cli component-library:build
+
+OPTIONS
+  -d, --dist=dist  The folder where the output will be written.
+  -s, --src=src    The folder with your .html component templates
 ```
 
-_See code: [src/commands/cli-config/print.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v0.0.0/src/commands/cli-config/print.js)_
+_See code: [src/commands/component-library/build.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v2.1.0/src/commands/component-library/build.js)_
 
-## `livingdocs-cli component-library:build`
+## `livingdocs-cli config:print`
 
-Build a Component Library JSON file
+Print current CLI configuration
 
 ```
 USAGE
-  $ livingdocs-cli component-library:build
+  $ livingdocs-cli config:print
 
 OPTIONS
-  -d, --dist=dist  The folder where the output will be written.
-  -s, --src=src    The folder with your .html component templates
+  -e, --env=env          If used configuration options are loaded from .livingdocs-cli file.
+  -p, --project=project  If used configuration options are loaded from .livingdocs-cli file.
 ```
 
-_See code: [src/commands/component-library/build.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v0.0.0/src/commands/component-library/build.js)_
+_See code: [src/commands/config/print.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v2.1.0/src/commands/config/print.js)_
 
 ## `livingdocs-cli design-server:start`
 
@@ -75,13 +80,14 @@ USAGE
   $ livingdocs-cli design-server:start
 
 OPTIONS
-  -d, --dist=dist  (required) The folder to load designs from.
-  -p, --port=port  [default: 9030] The port of the design-server.
-  --assets=assets  Asset folder to serve static files.
+  -d, --dist=dist      (required) The folder to load designs from.
+  -p, --port=port      [default: 9030] The port of the design-server.
+  --assets=assets      Asset folder to serve static files.
+  --basePath=basePath  The basePath to set in `assets.basePath`.
   --verbose
 ```
 
-_See code: [src/commands/design-server/start.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v0.0.0/src/commands/design-server/start.js)_
+_See code: [src/commands/design-server/start.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v2.1.0/src/commands/design-server/start.js)_
 
 ## `livingdocs-cli help [COMMAND]`
 
@@ -98,7 +104,7 @@ OPTIONS
   --all  see all commands in CLI
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v2.2.1/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v2.2.3/src/commands/help.ts)_
 
 ## `livingdocs-cli project-config:download`
 
@@ -110,17 +116,20 @@ USAGE
 
 OPTIONS
   -d, --dist=dist           The folder where the output will be written.
+  -e, --env=env             If used configuration options are loaded from .livingdocs-cli file.
 
-  -h, --host=host           [default: http://localhost:9090] The livingdocs host.
+  -h, --host=host           (required) [default: http://localhost:9090] The livingdocs host.
                             Can be set by the environment variable 'LI_HOST'.
 
-  -t, --token=token         (required) The Access Token to your project (needs write permission).
+  -p, --project=project     If used configuration options are loaded from .livingdocs-cli file.
+
+  -t, --token=token         (required) Access Token for your project (needs `public-api:config:read` permission).
                             Can be set by the environment variable 'LI_TOKEN'.
 
   --format=js|js/html|json  The format of the files written.
 ```
 
-_See code: [src/commands/project-config/download.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v0.0.0/src/commands/project-config/download.js)_
+_See code: [src/commands/project-config/download.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v2.1.0/src/commands/project-config/download.js)_
 
 ## `livingdocs-cli project-config:drafts`
 
@@ -134,11 +143,28 @@ OPTIONS
   -h, --host=host    [default: http://localhost:9090] The livingdocs host.
                      Can be set by the environment variable 'LI_HOST'.
 
-  -t, --token=token  (required) The Access Token to your project (needs write permission).
+  -t, --token=token  (required) Access Token for your project (needs `public-api:config:read` permission).
                      Can be set by the environment variable 'LI_TOKEN'.
 ```
 
-_See code: [src/commands/project-config/drafts.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v0.0.0/src/commands/project-config/drafts.js)_
+_See code: [src/commands/project-config/drafts.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v2.1.0/src/commands/project-config/drafts.js)_
+
+## `livingdocs-cli project-config:import-design`
+
+Import a design into a given project configuration
+
+```
+USAGE
+  $ livingdocs-cli project-config:import-design
+
+OPTIONS
+  -d, --dist=dist            (required) The folder where the output will be written.
+  -e, --env=env              If used configuration options are loaded from .livingdocs-cli file.
+  -p, --project=project      If used configuration options are loaded from .livingdocs-cli file.
+  -u, --designUri=designUri  (required) URL of the design to import
+```
+
+_See code: [src/commands/project-config/import-design.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v2.1.0/src/commands/project-config/import-design.js)_
 
 ## `livingdocs-cli project-config:plan`
 
@@ -149,16 +175,19 @@ USAGE
   $ livingdocs-cli project-config:plan
 
 OPTIONS
-  -d, --dist=dist    The folder or filename where to download to.
+  -d, --dist=dist        (required) The folder or filename to the channelConfig.
+  -e, --env=env          If used configuration options are loaded from .livingdocs-cli file.
 
-  -h, --host=host    [default: http://localhost:9090] The livingdocs host.
-                     Can be set by the environment variable 'LI_HOST'.
+  -h, --host=host        (required) [default: http://localhost:9090] The livingdocs host.
+                         Can be set by the environment variable 'LI_HOST'.
 
-  -t, --token=token  (required) The Access Token to your project (needs write permission).
-                     Can be set by the environment variable 'LI_TOKEN'.
+  -p, --project=project  If used configuration options are loaded from .livingdocs-cli file.
+
+  -t, --token=token      (required) Access Token for your project (needs `public-api:config:write` permission).
+                         Can be set by the environment variable 'LI_TOKEN'.
 ```
 
-_See code: [src/commands/project-config/plan.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v0.0.0/src/commands/project-config/plan.js)_
+_See code: [src/commands/project-config/plan.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v2.1.0/src/commands/project-config/plan.js)_
 
 ## `livingdocs-cli project-config:publish`
 
@@ -169,16 +198,19 @@ USAGE
   $ livingdocs-cli project-config:publish
 
 OPTIONS
-  -d, --dist=dist    The folder to publish from.
+  -d, --dist=dist        (required) The folder or filename to the channelConfig.
+  -e, --env=env          If used configuration options are loaded from .livingdocs-cli file.
 
-  -h, --host=host    [default: http://localhost:9090] The livingdocs host.
-                     Can be set by the environment variable 'LI_HOST'.
+  -h, --host=host        (required) [default: http://localhost:9090] The livingdocs host.
+                         Can be set by the environment variable 'LI_HOST'.
 
-  -t, --token=token  (required) The Access Token to your project (needs write permission).
-                     Can be set by the environment variable 'LI_TOKEN'.
+  -p, --project=project  If used configuration options are loaded from .livingdocs-cli file.
+
+  -t, --token=token      (required) Access Token for your project (needs `public-api:config:write` permission).
+                         Can be set by the environment variable 'LI_TOKEN'.
 ```
 
-_See code: [src/commands/project-config/publish.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v0.0.0/src/commands/project-config/publish.js)_
+_See code: [src/commands/project-config/publish.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v2.1.0/src/commands/project-config/publish.js)_
 
 ## `livingdocs-cli project-config:upload`
 
@@ -189,18 +221,21 @@ USAGE
   $ livingdocs-cli project-config:upload
 
 OPTIONS
-  -d, --dist=dist        The folder or filename where to download to.
+  -d, --dist=dist        (required) The folder or filename to the channelConfig.
+  -e, --env=env          If used configuration options are loaded from .livingdocs-cli file.
 
-  -h, --host=host        [default: http://localhost:9090] The livingdocs host.
+  -h, --host=host        (required) [default: http://localhost:9090] The livingdocs host.
                          Can be set by the environment variable 'LI_HOST'.
 
-  -t, --token=token      (required) The Access Token to your project (needs write permission).
+  -p, --project=project  If used configuration options are loaded from .livingdocs-cli file.
+
+  -t, --token=token      (required) Access Token for your project (needs `public-api:config:write` permission).
                          Can be set by the environment variable 'LI_TOKEN'.
 
   --draftName=draftName  (required) The name of the draft the config will be saved under.
 ```
 
-_See code: [src/commands/project-config/upload.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v0.0.0/src/commands/project-config/upload.js)_
+_See code: [src/commands/project-config/upload.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v2.1.0/src/commands/project-config/upload.js)_
 
 ## `livingdocs-cli project-config:upload_assets`
 
@@ -216,9 +251,9 @@ OPTIONS
   -h, --host=host      [default: http://localhost:9090] The livingdocs host.
                        Can be set by the environment variable 'LI_HOST'.
 
-  -t, --token=token    (required) The Access Token to your project (needs write permission).
+  -t, --token=token    (required) Access Token for your project (needs `public-api:config:write` permission).
                        Can be set by the environment variable 'LI_TOKEN'.
 ```
 
-_See code: [src/commands/project-config/upload_assets.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v0.0.0/src/commands/project-config/upload_assets.js)_
+_See code: [src/commands/project-config/upload_assets.js](https://github.com/livingdocsIO/livingdocs-cli/blob/v2.1.0/src/commands/project-config/upload_assets.js)_
 <!-- commandsstop -->

package/oclif.manifest.json

@@ -0,0 +1 @@
+{"version":"2.1.0","commands":{"component-library:build":{"id":"component-library:build","description":"Build a Component Library JSON file","pluginName":"livingdocs-cli","pluginType":"core","aliases":[],"flags":{"src":{"name":"src","type":"option","char":"s","description":"The folder with your .html component templates"},"dist":{"name":"dist","type":"option","char":"d","description":"The folder where the output will be written."}},"args":[]},"config:print":{"id":"config:print","description":"Print current CLI configuration","pluginName":"livingdocs-cli","pluginType":"core","aliases":[],"flags":{"project":{"name":"project","type":"option","char":"p","description":"If used configuration options are loaded from .livingdocs-cli file."},"env":{"name":"env","type":"option","char":"e","description":"If used configuration options are loaded from .livingdocs-cli file."}},"args":[]},"design-server:start":{"id":"design-server:start","description":"Start a design server for development","pluginName":"livingdocs-cli","pluginType":"core","aliases":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"The port of the design-server.","default":9030},"dist":{"name":"dist","type":"option","char":"d","description":"The folder to load designs from.","required":true},"assets":{"name":"assets","type":"option","description":"Asset folder to serve static files."},"basePath":{"name":"basePath","type":"option","description":"The basePath to set in `assets.basePath`."},"verbose":{"name":"verbose","type":"boolean","allowNo":false}},"args":[]},"project-config:download":{"id":"project-config:download","description":"Download a project configuration","pluginName":"livingdocs-cli","pluginType":"core","aliases":[],"flags":{"project":{"name":"project","type":"option","char":"p","description":"If used configuration options are loaded from .livingdocs-cli file."},"env":{"name":"env","type":"option","char":"e","description":"If used configuration options are loaded from .livingdocs-cli file."},"token":{"name":"token","type":"option","char":"t","description":"Access Token for your project (needs `public-api:config:read` permission).\nCan be set by the environment variable 'LI_TOKEN'.","required":true},"host":{"name":"host","type":"option","char":"h","description":"The livingdocs host.\nCan be set by the environment variable 'LI_HOST'.","required":true,"default":"http://localhost:9090"},"dist":{"name":"dist","type":"option","char":"d","description":"The folder where the output will be written."},"format":{"name":"format","type":"option","description":"The format of the files written.","options":["js","js/html","json"]}},"args":[]},"project-config:drafts":{"id":"project-config:drafts","description":"List project configuration drafts","pluginName":"livingdocs-cli","pluginType":"core","aliases":[],"flags":{"token":{"name":"token","type":"option","char":"t","description":"Access Token for your project (needs `public-api:config:read` permission).\nCan be set by the environment variable 'LI_TOKEN'.","required":true},"host":{"name":"host","type":"option","char":"h","description":"The livingdocs host.\nCan be set by the environment variable 'LI_HOST'.","default":"http://localhost:9090"}},"args":[]},"project-config:import-design":{"id":"project-config:import-design","description":"Import a design into a given project configuration","pluginName":"livingdocs-cli","pluginType":"core","aliases":[],"flags":{"project":{"name":"project","type":"option","char":"p","description":"If used configuration options are loaded from .livingdocs-cli file."},"env":{"name":"env","type":"option","char":"e","description":"If used configuration options are loaded from .livingdocs-cli file."},"dist":{"name":"dist","type":"option","char":"d","description":"The folder where the output will be written.","required":true},"designUri":{"name":"designUri","type":"option","char":"u","description":"URL of the design to import","required":true}},"args":[]},"project-config:plan":{"id":"project-config:plan","description":"See what would be updated in a publish command","pluginName":"livingdocs-cli","pluginType":"core","aliases":[],"flags":{"project":{"name":"project","type":"option","char":"p","description":"If used configuration options are loaded from .livingdocs-cli file."},"env":{"name":"env","type":"option","char":"e","description":"If used configuration options are loaded from .livingdocs-cli file."},"token":{"name":"token","type":"option","char":"t","description":"Access Token for your project (needs `public-api:config:write` permission).\nCan be set by the environment variable 'LI_TOKEN'.","required":true},"host":{"name":"host","type":"option","char":"h","description":"The livingdocs host.\nCan be set by the environment variable 'LI_HOST'.","required":true,"default":"http://localhost:9090"},"dist":{"name":"dist","type":"option","char":"d","description":"The folder or filename to the channelConfig.","required":true}},"args":[]},"project-config:publish":{"id":"project-config:publish","description":"Publish a ChannelConfig to your project","pluginName":"livingdocs-cli","pluginType":"core","aliases":[],"flags":{"project":{"name":"project","type":"option","char":"p","description":"If used configuration options are loaded from .livingdocs-cli file."},"env":{"name":"env","type":"option","char":"e","description":"If used configuration options are loaded from .livingdocs-cli file."},"token":{"name":"token","type":"option","char":"t","description":"Access Token for your project (needs `public-api:config:write` permission).\nCan be set by the environment variable 'LI_TOKEN'.","required":true},"host":{"name":"host","type":"option","char":"h","description":"The livingdocs host.\nCan be set by the environment variable 'LI_HOST'.","required":true,"default":"http://localhost:9090"},"dist":{"name":"dist","type":"option","char":"d","description":"The folder or filename to the channelConfig.","required":true}},"args":[]},"project-config:upload":{"id":"project-config:upload","description":"Upload a ChannelConfig into a draft for your project","pluginName":"livingdocs-cli","pluginType":"core","aliases":[],"flags":{"project":{"name":"project","type":"option","char":"p","description":"If used configuration options are loaded from .livingdocs-cli file."},"env":{"name":"env","type":"option","char":"e","description":"If used configuration options are loaded from .livingdocs-cli file."},"token":{"name":"token","type":"option","char":"t","description":"Access Token for your project (needs `public-api:config:write` permission).\nCan be set by the environment variable 'LI_TOKEN'.","required":true},"host":{"name":"host","type":"option","char":"h","description":"The livingdocs host.\nCan be set by the environment variable 'LI_HOST'.","required":true,"default":"http://localhost:9090"},"dist":{"name":"dist","type":"option","char":"d","description":"The folder or filename to the channelConfig.","required":true},"draftName":{"name":"draftName","type":"option","description":"The name of the draft the config will be saved under.","required":true}},"args":[]},"project-config:upload_assets":{"id":"project-config:upload_assets","description":"Upload assets to your project","pluginName":"livingdocs-cli","pluginType":"core","aliases":[],"flags":{"token":{"name":"token","type":"option","char":"t","description":"Access Token for your project (needs `public-api:config:write` permission).\nCan be set by the environment variable 'LI_TOKEN'.","required":true},"host":{"name":"host","type":"option","char":"h","description":"The livingdocs host.\nCan be set by the environment variable 'LI_HOST'.","default":"http://localhost:9090"},"assets":{"name":"assets","type":"option","char":"a","description":"The folder where you asset files are located."}},"args":[]}}}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "livingdocs-cli",
   "description": "Livingdocs Command Line Utility",
-  "version": "1.3.1",
+  "version": "2.1.0",
   "author": "Livingdocs AG",
   "repository": "livingdocsIO/livingdocs-cli",
   "homepage": "https://github.com/livingdocsIO/livingdocs-cli",
@@ -15,8 +15,7 @@
     "test": "mocha --forbid-only \"test/**/*.test.js\"",
     "test:coverage": "nyc mocha --forbid-only \"test/**/*.test.js\"",
     "posttest": "eslint .",
-    "version": "oclif-dev readme && git add README.md",
-    "postversion": "/release/node_modules/.bin/set-ci"
+    "version": "oclif-dev readme && git add README.md"
   },
   "dependencies": {
     "@oclif/command": "^1.5.19",
@@ -24,38 +23,40 @@
     "@oclif/plugin-help": "^2.2.1",
     "@oclif/plugin-not-found": "^1.2.3",
     "@oclif/plugin-warn-if-update-available": "^1.7.0",
-    "axios": "^0.19.0",
+    "axios": "^0.21.2",
     "chalk": "^2.4.2",
     "cheerio": "^1.0.0-rc.3",
     "dedent": "^0.7.0",
     "fastify": "^2.10.0",
     "fastify-cors": "^2.1.3",
     "fastify-static": "^2.5.0",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^10.0.0",
     "globby": "^10.0.1",
     "html-minifier": "^4.0.0",
     "inquirer": "^7.0.0",
     "javascript-stringify": "^2.0.0",
     "js-beautify": "^1.10.2",
-    "lodash": "^4.17.15",
+    "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
     "nanoid": "^2.1.0",
     "npmlog": "^4.1.2",
     "p-queue": "^6.1.1",
     "pino-pretty": "^3.2.2",
+    "prettify-html": "0.0.2",
     "warning-header-parser": "^2.0.0"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.22.2",
     "@oclif/test": "^1.2.5",
     "chai": "^4.2.0",
-    "eslint": "^6.3.0",
-    "eslint-config-oclif": "^3.1.0",
+    "eslint": "^8.5.0",
+    "eslint-config-oclif": "^4.0.0",
     "mocha": "^6.2.0",
     "nock": "^11.3.3",
     "nyc": "^14.1.1"
   },
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "/bin",
@@ -84,11 +85,11 @@
     "isCi": true,
     "name": "Drone",
     "service": "drone",
-    "commit": "520b8f8fd20d7f11fa391de57e84b0b89b09c3ac",
-    "build": "37",
+    "commit": "1de7088cc46f9c07a51f0dc57a1f44ac7a324ae0",
+    "build": "82",
     "branch": "master",
     "isPr": false,
     "slug": "livingdocsIO/livingdocs-cli",
-    "date": "2020-03-26T21:52:50.081Z"
+    "date": "2022-01-03T10:00:09.235Z"
   }
 }

package/src/commands/component-library/build.js

@@ -5,16 +5,16 @@ const sharedFlags = require('../../lib/cli/shared_flags')
 const parseComponents = require('../../lib/parsing/parse_components')
 const writeComponentLibrary = require('../../lib/write_component_library')
 
-const description = `Build a Component Library JSON file`
-const commandFlags = {
-  src: flags.string({
-    char: 's',
-    description: 'The folder with your .html component templates'
-  }),
-  dist: sharedFlags.dist
-}
-
 class BuildCommand extends Command {
+  static description = `Build a Component Library JSON file`
+
+  static flags = {
+    src: flags.string({
+      char: 's',
+      description: 'The folder with your .html component templates'
+    }),
+    dist: sharedFlags.dist
+  }
 
   async run () {
     const {src, dist} = this.parse(BuildCommand).flags
@@ -41,6 +41,4 @@ class BuildCommand extends Command {
 
 }
 
-BuildCommand.description = description
-BuildCommand.flags = commandFlags
 module.exports = BuildCommand

package/src/commands/config/print.js

@@ -0,0 +1,59 @@
+const chalk = require('chalk')
+const {Command} = require('@oclif/command')
+
+const sharedFlags = require('../../lib/cli/shared_flags')
+const loadCliConfig = require('../../lib/cli/load_cli_config')
+
+const defaults = {
+  LI_HOST: 'http://localhost:9090'
+}
+
+class ListConfigCommand extends Command {
+  static description = `Print current CLI configuration`
+  static flags = {
+    project: sharedFlags.project,
+    env: sharedFlags.env
+  }
+
+  async run () {
+    const {project, env} = this.parse(ListConfigCommand).flags
+    const sessionConfig = loadCliConfig({project, env})
+
+    this.printVar(`LI_HOST`, 'host', sessionConfig)
+    this.printVar(`LI_TOKEN`, 'token', sessionConfig)
+    this.printVar(`LI_DIST_FOLDER`, 'distFolder', sessionConfig)
+  }
+
+  printVar (name, prop, sessionConfig) {
+    const varObj = getVar(name, prop, sessionConfig)
+
+    this.log(chalk.green(`${name}`), chalk.gray(` (source: ${varObj.source})`))
+    this.log(chalk.gray(`${varObj.value}\n`))
+  }
+}
+
+function getVar (key, prop, sessionConfig) {
+  if (sessionConfig?.[prop] !== undefined) {
+    return {
+      value: sessionConfig?.[prop],
+      source: '.livingdocs-cli file'
+    }
+  } else if (process.env[key]) {
+    return {
+      value: process.env[key],
+      source: 'environment variable'
+    }
+  } else if (defaults[key]) {
+    return {
+      value: defaults[key],
+      source: 'default value'
+    }
+  } else {
+    return {
+      value: '[undefined]',
+      source: 'not set'
+    }
+  }
+}
+
+module.exports = ListConfigCommand

package/src/commands/design-server/start.js

@@ -4,29 +4,28 @@ const {Command, flags} = require('@oclif/command')
 
 const loadDesigns = require('../../lib/load_designs')
 
-const description = `Start a design server for development`
-
-const commandFlags = {
-  port: flags.integer({
-    char: 'p',
-    description: 'The port of the design-server.',
-    default: 9030
-  }),
-  dist: flags.string({
-    char: 'd',
-    description: 'The folder to load designs from.',
-    required: true
-  }),
-  assets: flags.string({
-    description: 'Asset folder to serve static files.'
-  }),
-  basePath: flags.string({
-    description: 'The basePath to set in `assets.basePath`.'
-  }),
-  verbose: flags.boolean()
-}
-
 class DesignServerCommand extends Command {
+  static description = `Start a design server for development`
+
+  static flags = {
+    port: flags.integer({
+      char: 'p',
+      description: 'The port of the design-server.',
+      default: 9030
+    }),
+    dist: flags.string({
+      char: 'd',
+      description: 'The folder to load designs from.',
+      required: true
+    }),
+    assets: flags.string({
+      description: 'Asset folder to serve static files.'
+    }),
+    basePath: flags.string({
+      description: 'The basePath to set in `assets.basePath`.'
+    }),
+    verbose: flags.boolean()
+  }
 
   async run () {
     let host
@@ -86,9 +85,20 @@ class DesignServerCommand extends Command {
         return
       }
 
-      designConfig.assets = designConfig.assets || {}
-      const defaultBasePath = `${host}/designs/${designName}/${version}`
-      designConfig.assets.basePath = basePath || defaultBasePath
+      const designBasePath = basePath || `${host}/designs/${designName}/${version}`
+      if (
+        typeof designConfig.assets === 'object' &&
+        !designConfig.assets.basePath
+      ) {
+        designConfig.assets.basePath = designBasePath
+      }
+
+      if (
+        typeof designConfig.designSettings?.assets === 'object' &&
+        !designConfig.designSettings.assets.basePath
+      ) {
+        designConfig.designSettings.assets.basePath = designBasePath
+      }
 
       reply.send(designConfig)
     })
@@ -126,6 +136,4 @@ function setupStaticFolder ({fastify, assets}) {
   })
 }
 
-DesignServerCommand.description = description
-DesignServerCommand.flags = commandFlags
 module.exports = DesignServerCommand

package/src/commands/project-config/download.js

@@ -9,21 +9,20 @@ const writeConfig = require('../../lib/write_channel_config')
 const errorReporter = require('../../lib/api/error_reporter')
 const assertDistFolder = require('../../lib/cli/assert_dist_folder')
 
-const description = `Download a project configuration`
-const commandFlags = {
-  project: sharedFlags.project,
-  env: sharedFlags.env,
-  token: {...sharedFlags.configReadToken, required: true},
-  host: {...sharedFlags.host, required: true},
-  dist: sharedFlags.dist,
-  format: flags.string({
-    options: ['js', 'js/html', 'json'],
-    description: 'The format of the files written.',
-    dependsOn: ['dist']
-  })
-}
-
 class DownloadCommand extends Command {
+  static description = `Download a project configuration`
+  static flags = {
+    project: sharedFlags.project,
+    env: sharedFlags.env,
+    token: {...sharedFlags.configReadToken, required: true},
+    host: {...sharedFlags.host, required: true},
+    dist: sharedFlags.dist,
+    format: flags.string({
+      options: ['js', 'js/html', 'json'],
+      description: 'The format of the files written.',
+      dependsOn: ['dist']
+    })
+  }
 
   async run () {
     const {token, host, dist, format} = this.parse(DownloadCommand).flags
@@ -74,6 +73,4 @@ class DownloadCommand extends Command {
   }
 }
 
-DownloadCommand.description = description
-DownloadCommand.flags = commandFlags
 module.exports = DownloadCommand

package/src/commands/project-config/drafts.js

@@ -5,13 +5,12 @@ const sharedFlags = require('../../lib/cli/shared_flags')
 const liApi = require('../../lib/api/livingdocs_api')
 const errorReporter = require('../../lib/api/error_reporter')
 
-const description = `List project configuration drafts`
-const commandFlags = {
-  token: {...sharedFlags.configReadToken, required: true},
-  host: sharedFlags.host
-}
-
 class DraftsCommand extends Command {
+  static description = `List project configuration drafts`
+  static flags = {
+    token: {...sharedFlags.configReadToken, required: true},
+    host: sharedFlags.host
+  }
 
   async run () {
     const {token, host} = this.parse(DraftsCommand).flags
@@ -32,6 +31,4 @@ class DraftsCommand extends Command {
   }
 }
 
-DraftsCommand.description = description
-DraftsCommand.flags = commandFlags
 module.exports = DraftsCommand

package/src/commands/project-config/import-design.js

@@ -1,4 +1,5 @@
 const chalk = require('chalk')
+const _ = require('lodash')
 const {Command} = require('@oclif/command')
 
 const sharedFlags = require('../../lib/cli/shared_flags')
@@ -31,11 +32,29 @@ class ImportDesignCommand extends Command {
     }
 
     const design = await downloadDesign(designUri)
-    const designV2 = parseDesignV2(design)
+    const designV2 = parseDesignV2(design, this.log)
 
     config.components = designV2.components
     config.designSettings = designV2.designSettings
 
+    if (design.v !== 2) {
+      _.each(config.contentTypes, (ct) => {
+        // write wrapper on each content-type
+        const matchingLayout = _.find(design.layouts, l => l.name === ct.handle)
+        if (matchingLayout) ct.editorWrapper = matchingLayout.wrapper
+        else ct.editorWrapper = design.wrapper
+        // write components on content-type
+        if (matchingLayout) {
+          ct.components = _.reduce(matchingLayout.groups, (acc, g) => {
+            acc = _.union(acc, _.map(g.components, c => ({name: c})))
+            return acc
+          }, [])
+        }
+        // write default content on content-type
+        if (matchingLayout) ct.defaultContent = matchingLayout.defaultContent || []
+      })
+    }
+
     await writeConfig({
       destination: dist,
       channelConfig: config,