fix: Corrections for #1708 being merged too early (#1724)

* fix: Corrections for #1708 being merged too early * test: Fix import path * style: Strip file extensions from imports for consistency
preactjs · Aug 18, 2022 · aa0db12 · aa0db12
1 parent fae1e27
commit aa0db12
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 11 deletions.
diff --git a/packages/cli/tests/lib/cli.js b/packages/cli/tests/lib/cli.js
@@ -3,7 +3,7 @@ const { mkdir, symlink, readFile, writeFile } = require('fs').promises;
 const { build: buildCmd, watch: watchCmd } = require('../../lib/commands');
 const {
 	create: createCmd,
-} = require('../../../create-cli/src/commands/create');
+} = require('../../../create-cli/lib/commands/create');
 const { tmpDir } = require('./output');
 const { disableOptimizeConfig, disableOptimize } = require('./utils');
 

diff --git a/packages/create-cli/src/commands/create.js → packages/create-cli/lib/commands/create.js b/packages/create-cli/src/commands/create.js → packages/create-cli/lib/commands/create.js
diff --git a/packages/create-cli/src/commands/list.js → packages/create-cli/lib/commands/list.js b/packages/create-cli/src/commands/list.js → packages/create-cli/lib/commands/list.js
@@ -4,7 +4,7 @@ const { error, info } = require('../util');
 
 const REPOS_URL = 'https://api.github.com/users/preactjs-templates/repos';
 
-module.exports = async function () {
+exports.list = async function () {
 	try {
 		const repos = await fetch(REPOS_URL).then(r => r.json());
 

diff --git a/packages/create-cli/src/index.js → packages/create-cli/lib/index.js b/packages/create-cli/src/index.js → packages/create-cli/lib/index.js
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 const sade = require('sade');
-const { create } = require('./commands/create.js');
-//const { create } = require('./commands/create.js)';
-const { error } = require('./util.js');
+const { create } = require('./commands/create');
+const { list } = require('./commands/list');
+const { error } = require('./util');
 
 const prog = sade('create-preact-app').version('0.1.3');
 
@@ -16,10 +16,7 @@ prog
 	.option('--git', 'Initialize git repository', true)
 	.action(create);
 
-//prog
-//    .command('list')
-//    .describe('List official templates')
-//    .action(list);
+prog.command('list').describe('List official templates').action(list);
 
 prog.parse(process.argv, {
 	unknown: arg => {

diff --git a/packages/create-cli/src/resources/sw.js → packages/create-cli/lib/resources/sw.js b/packages/create-cli/src/resources/sw.js → packages/create-cli/lib/resources/sw.js
diff --git a/...es/create-cli/src/resources/template.html → ...es/create-cli/lib/resources/template.html b/...es/create-cli/src/resources/template.html → ...es/create-cli/lib/resources/template.html
diff --git a/packages/create-cli/src/util.js → packages/create-cli/lib/util.js b/packages/create-cli/src/util.js → packages/create-cli/lib/util.js
diff --git a/packages/create-cli/package.json b/packages/create-cli/package.json
@@ -3,8 +3,8 @@
   "version": "3.4.0",
   "description": "Start building a Preact Progressive Web App in seconds.",
   "repository": "preactjs/preact-cli",
-  "main": "src/index.js",
-  "bin": "src/index.js",
+  "main": "lib/index.js",
+  "bin": "lib/index.js",
   "scripts": {
     "pretest": "rimraf ../cli/tests/output",
     "test": "jest"