@takeshape/cli 11.63.3 → 11.64.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.
@@ -26,7 +26,7 @@ const getBranchListQuery = (0, _graphql.graphQLQuery)(`
26
26
  }
27
27
  }
28
28
  `);
29
- const listBranches = exports.listBranches = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, params) => {
29
+ const listBranches = exports.listBranches = (0, _linkedCommand.loggedInAndLinkedCommand)(async (_cli, params) => {
30
30
  const client = (0, _graphql.createAdminConnector)(params, params.authToken, params.projectId);
31
31
  const {
32
32
  nodes: branches
@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.buildHandler = buildHandler;
7
7
  exports.default = void 0;
8
+ var _nodePath = _interopRequireDefault(require("node:path"));
8
9
  var _ssg = require("@takeshape/ssg");
9
- var _path = _interopRequireDefault(require("path"));
10
10
  var _files = require("../files");
11
11
  var _branches = require("../util/branches");
12
12
  var _connector = require("../util/connector");
@@ -29,10 +29,10 @@ function buildHandler(config, params) {
29
29
  }
30
30
  var _default = exports.default = (0, _linkedCommand.linkedCommand)(async (cli, params) => {
31
31
  const command = cli.input[0];
32
- const sitePath = _path.default.dirname(params.configFilePath);
32
+ const sitePath = _nodePath.default.dirname(params.configFilePath);
33
33
  const fileLoader = (0, _ssg.createFileSystemLoader)(sitePath);
34
34
  const templateFileLoader = (0, _ssg.createSyncFileSystemLoader)(sitePath);
35
- const config = await (0, _ssg.loadConfig)(fileLoader, _path.default.basename(params.configFilePath), {
35
+ const config = await (0, _ssg.loadConfig)(fileLoader, _nodePath.default.basename(params.configFilePath), {
36
36
  env: process.env
37
37
  });
38
38
  const connector = (0, _connector.createConnector)(params, (0, _branches.getBranchParams)(cli), {
@@ -5,18 +5,18 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  exports.successMessage = successMessage;
8
+ var _nodePath = _interopRequireDefault(require("node:path"));
8
9
  var _ssg = require("@takeshape/ssg");
9
10
  var _chalk = _interopRequireDefault(require("chalk"));
10
11
  var _glob = _interopRequireDefault(require("glob"));
11
- var _path = _interopRequireDefault(require("path"));
12
12
  var _prettyBytes = _interopRequireDefault(require("pretty-bytes"));
13
13
  var _log = require("../../log");
14
14
  var _linkedCommand = require("../../util/linked-command");
15
15
  var _zip = require("./zip");
16
16
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
17
17
  function countFiles(projectPath, config) {
18
- const staticFiles = _glob.default.sync(`${_path.default.join(projectPath, config.staticPath)}/**/*.*`);
19
- const templateFiles = _glob.default.sync(`${_path.default.join(projectPath, config.templatePath)}/**/*.*`);
18
+ const staticFiles = _glob.default.sync(`${_nodePath.default.join(projectPath, config.staticPath)}/**/*.*`);
19
+ const templateFiles = _glob.default.sync(`${_nodePath.default.join(projectPath, config.templatePath)}/**/*.*`);
20
20
  return staticFiles.length + templateFiles.length;
21
21
  }
22
22
  function successMessage({
@@ -35,8 +35,8 @@ var _default = exports.default = (0, _linkedCommand.linkedCommand)(async (_, par
35
35
  process.exit(1);
36
36
  }
37
37
  try {
38
- const projectPath = _path.default.dirname(params.configFilePath);
39
- const configFilename = _path.default.basename(params.configFilePath);
38
+ const projectPath = _nodePath.default.dirname(params.configFilePath);
39
+ const configFilename = _nodePath.default.basename(params.configFilePath);
40
40
  const config = await (0, _ssg.loadConfig)((0, _ssg.createFileSystemLoader)(projectPath), configFilename);
41
41
  const zipSize = await (0, _zip.deployZip)({
42
42
  config,
@@ -1 +1 @@
1
- {"version":3,"file":"zip.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/zip.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAK7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAG7C,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,SAAS,CAAC,EAC9B,WAAW,EACX,UAAU,EACV,YAAY,EACZ,cAAc,EACd,OAAO,EACR,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CASjC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBxE"}
1
+ {"version":3,"file":"zip.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/zip.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAI7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAG7C,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,SAAS,CAAC,EAC9B,WAAW,EACX,UAAU,EACV,YAAY,EACZ,cAAc,EACd,OAAO,EACR,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CASjC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBxE"}
@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.createZip = createZip;
7
7
  exports.deployZip = deployZip;
8
+ var _nodePath = _interopRequireDefault(require("node:path"));
8
9
  var _archiver = _interopRequireDefault(require("archiver"));
9
10
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
10
- var _path = _interopRequireDefault(require("path"));
11
11
  var _streamToPromise = _interopRequireDefault(require("stream-to-promise"));
12
12
  var _upload = require("../../util/upload");
13
13
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -24,8 +24,8 @@ async function createZip({
24
24
  archive.file(configFilePath, {
25
25
  name: 'tsg.yml'
26
26
  });
27
- archive.directory(_path.default.join(projectPath, staticPath), staticPath);
28
- archive.directory(_path.default.join(projectPath, templatePath), templatePath);
27
+ archive.directory(_nodePath.default.join(projectPath, staticPath), staticPath);
28
+ archive.directory(_nodePath.default.join(projectPath, templatePath), templatePath);
29
29
  await archive.finalize();
30
30
  return (0, _streamToPromise.default)(output);
31
31
  }
@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.default = void 0;
7
+ var _nodePath = _interopRequireDefault(require("node:path"));
7
8
  var _streams = require("@takeshape/streams");
8
9
  var _chalk = _interopRequireDefault(require("chalk"));
9
10
  var _fsExtra = require("fs-extra");
10
11
  var _nodeFetch = _interopRequireDefault(require("node-fetch"));
11
- var _path = _interopRequireDefault(require("path"));
12
12
  var _graphql = require("../../graphql");
13
13
  var _log = require("../../log");
14
14
  var _linkedCommand = require("../../util/linked-command");
@@ -33,7 +33,7 @@ async function downloadExport(projectExport, basePath) {
33
33
  // Download the file to the current directory
34
34
  const fileName = `export-${projectExport.id}.zip`;
35
35
  const res = await (0, _nodeFetch.default)(projectExport.file);
36
- await (0, _streams.pump)(res.body, (0, _fsExtra.createWriteStream)(_path.default.join(basePath, fileName)));
36
+ await (0, _streams.pump)(res.body, (0, _fsExtra.createWriteStream)(_nodePath.default.join(basePath, fileName)));
37
37
  return fileName;
38
38
  }
39
39
 
@@ -80,7 +80,7 @@ var _default = exports.default = (0, _linkedCommand.loggedInCommand)(async (cli,
80
80
  });
81
81
  (0, _log.log)('Downloading the export…\n');
82
82
  const fileName = await downloadExport(projectExport, basePath);
83
- (0, _log.log)(`Success! Downloaded to ${_path.default.join(basePath, fileName)}\n`);
83
+ (0, _log.log)(`Success! Downloaded to ${_nodePath.default.join(basePath, fileName)}\n`);
84
84
  } catch (error) {
85
85
  (0, _log.log)(_chalk.default.red('Error: ', error.message));
86
86
  process.exit(1);
@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.default = void 0;
7
+ var _nodeFs = _interopRequireDefault(require("node:fs"));
8
+ var _nodePath = _interopRequireDefault(require("node:path"));
7
9
  var _chalk = _interopRequireDefault(require("chalk"));
8
- var _fs = _interopRequireDefault(require("fs"));
9
10
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
10
- var _path = _interopRequireDefault(require("path"));
11
11
  var _log = require("../../log");
12
12
  var _api = _interopRequireDefault(require("../../util/api"));
13
13
  var _branches = require("../../util/branches");
@@ -39,10 +39,10 @@ var _default = exports.default = (0, _linkedCommand.loggedInCommand)(async (cli,
39
39
  outputPath = flags.to;
40
40
  } else {
41
41
  await _fsExtra.default.ensureDir(flags.to);
42
- outputPath = _path.default.join(flags.to, DEFAULT_SCHEMA_FILE_NAME);
42
+ outputPath = _nodePath.default.join(flags.to, DEFAULT_SCHEMA_FILE_NAME);
43
43
  }
44
44
  } else {
45
- outputPath = _path.default.join('.', DEFAULT_SCHEMA_FILE_NAME);
45
+ outputPath = _nodePath.default.join('.', DEFAULT_SCHEMA_FILE_NAME);
46
46
  }
47
47
  if (!projectId) {
48
48
  const choice = await (0, _selectProject.selectProject)(params);
@@ -55,7 +55,7 @@ var _default = exports.default = (0, _linkedCommand.loggedInCommand)(async (cli,
55
55
  try {
56
56
  (0, _log.log)(`Downloading schema for project ${projectName}…\n`);
57
57
  const schema = await (0, _api.default)(params, 'GET', `${(0, _branches.getBranchBasePath)(branchParams, projectId)}/schema`);
58
- _fs.default.writeFileSync(outputPath, JSON.stringify(schema, null, 2), {
58
+ _nodeFs.default.writeFileSync(outputPath, JSON.stringify(schema, null, 2), {
59
59
  encoding: 'utf8'
60
60
  });
61
61
  (0, _log.log)(_chalk.default.green('Success!'), `Schema version ${schema.version} written to ${outputPath}.`);
@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  exports.determineImportStrategy = determineImportStrategy;
8
+ var _nodePath = require("node:path");
8
9
  var _streams = require("@takeshape/streams");
9
10
  var _archiver = _interopRequireDefault(require("archiver"));
10
11
  var _chalk = _interopRequireDefault(require("chalk"));
11
12
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
12
- var _path = require("path");
13
13
  var _graphql = require("../../graphql");
14
14
  var _log = require("../../log");
15
15
  var _fatalError = require("../../util/fatal-error");
@@ -126,7 +126,7 @@ var _default = exports.default = (0, _linkedCommand.loggedInCommand)(async (cli,
126
126
  let importId;
127
127
  if (strategy === 'dir') {
128
128
  (0, _log.log)(`Zipping up ${from}…`);
129
- const dirName = (0, _path.basename)(from);
129
+ const dirName = (0, _nodePath.basename)(from);
130
130
  const [zipPath] = (0, _upload.createTempFile)(`${dirName}.zip`);
131
131
  const output = _fsExtra.default.createWriteStream(zipPath);
132
132
  const archive = (0, _archiver.default)('zip');
@@ -138,7 +138,7 @@ var _default = exports.default = (0, _linkedCommand.loggedInCommand)(async (cli,
138
138
  }
139
139
  if (strategy === 'zip') {
140
140
  (0, _log.log)(`Starting import from ${from}…\n`);
141
- const fileName = (0, _path.basename)(from);
141
+ const fileName = (0, _nodePath.basename)(from);
142
142
  importId = await uploadZipFile(client, fileName, from, projectId);
143
143
  }
144
144
  if (strategy === 'uri') {
@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.default = void 0;
7
+ var _nodeUrl = require("node:url");
7
8
  var _schema = require("@takeshape/schema");
8
9
  var _chalk = _interopRequireDefault(require("chalk"));
9
10
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
10
- var _url = require("url");
11
11
  var _log = require("../../log");
12
12
  var _api = _interopRequireDefault(require("../../util/api"));
13
13
  var _branches = require("../../util/branches");
@@ -59,7 +59,7 @@ var _default = exports.default = (0, _linkedCommand.linkedCommand)(async (cli, p
59
59
  return (0, _fatalError.fatalError)(validationString);
60
60
  }
61
61
  (0, _log.log)(`Uploading schema from ${file}…\n`);
62
- const schemaImportPath = `${(0, _branches.getBranchBasePath)(branchParams, projectId)}/schema?${new _url.URLSearchParams(queryParams)}`;
62
+ const schemaImportPath = `${(0, _branches.getBranchBasePath)(branchParams, projectId)}/schema?${new _nodeUrl.URLSearchParams(queryParams)}`;
63
63
  const uploaded = await (0, _api.default)(params, 'POST', schemaImportPath, newSchema);
64
64
  (0, _log.log)(_chalk.default.green('Success!'), `Schema updated to version ${uploaded.version}.`);
65
65
  process.exit(0);
@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  var _log = require("../log");
8
8
  var _linkedCommand = require("../util/linked-command");
9
- var _default = exports.default = (0, _linkedCommand.linkedCommand)(async (cli, params) => {
9
+ var _default = exports.default = (0, _linkedCommand.linkedCommand)(async (_cli, params) => {
10
10
  (0, _log.log)(`Project: ${params.projectName} \nStatic Site: ${params.siteName ?? 'not configured'}`);
11
11
  });
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.default = void 0;
7
+ var _nodePath = _interopRequireDefault(require("node:path"));
7
8
  var _schema = require("@takeshape/schema");
8
9
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
9
- var _path = _interopRequireDefault(require("path"));
10
10
  var _graphql = require("../graphql");
11
11
  var _log = require("../log");
12
12
  var _data = require("../util/data");
@@ -20,12 +20,12 @@ const validate = async (cli, params) => {
20
20
  let schemaPath;
21
21
  if (flags.path) {
22
22
  if (_fsExtra.default.existsSync(flags.path) && _fsExtra.default.statSync(flags.path).isDirectory()) {
23
- schemaPath = _path.default.join(flags.path, 'schema.json');
23
+ schemaPath = _nodePath.default.join(flags.path, 'schema.json');
24
24
  } else {
25
25
  schemaPath = flags.path;
26
26
  }
27
27
  } else {
28
- schemaPath = _path.default.join('.', 'schema.json');
28
+ schemaPath = _nodePath.default.join('.', 'schema.json');
29
29
  }
30
30
  if (!_fsExtra.default.existsSync(schemaPath)) {
31
31
  return (0, _fatalError.fatalError)(`${schemaPath} does not exist. You can download a project schema with 'takeshape export --schema' or specify a path with 'takeshape validate --path=/path/to/schema.json'`);
package/dist/config.d.ts CHANGED
@@ -2,7 +2,8 @@ import type meow from 'meow';
2
2
  import type { AnyFlags } from 'meow';
3
3
  import type { Choice } from './prompt';
4
4
  import type { CliConfig } from './types';
5
- import type { ApiKey, PersonalAccessToken } from './util/data';
5
+ import type { ApiKey } from './types';
6
+ import type { PersonalAccessToken } from './util/data';
6
7
  export declare const TAKESHAPE_CONFIG_FILENAME = ".takeshaperc";
7
8
  export declare const GRAPHQL_CONFIG_FILENAME = ".graphqlconfig";
8
9
  export declare function getHomeConfigPath(): string;
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAIrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAI/D,eAAO,MAAM,yBAAyB,iBAAiB,CAAC;AACxD,eAAO,MAAM,uBAAuB,mBAAmB,CAAC;AAExD,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CA6B7E;AAWD,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,SAAS,GACvB,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED,wBAAgB,kBAAkB,SAQjC;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIrF;AAED,wBAAgB,gBAAgB,SAK/B"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAErC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAIvD,eAAO,MAAM,yBAAyB,iBAAiB,CAAC;AACxD,eAAO,MAAM,uBAAuB,mBAAmB,CAAC;AAExD,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CA6B7E;AAWD,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,SAAS,GACvB,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED,wBAAgB,kBAAkB,SAQjC;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIrF;AAED,wBAAgB,gBAAgB,SAK/B"}
package/dist/config.js CHANGED
@@ -10,10 +10,10 @@ exports.getHomeConfigPath = getHomeConfigPath;
10
10
  exports.loadConfig = loadConfig;
11
11
  exports.writeHomeConfig = writeHomeConfig;
12
12
  exports.writeLinkedProjectConfig = writeLinkedProjectConfig;
13
+ var _nodeOs = _interopRequireDefault(require("node:os"));
14
+ var _nodePath = _interopRequireDefault(require("node:path"));
13
15
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
14
16
  var _ignore = _interopRequireDefault(require("ignore"));
15
- var _os = _interopRequireDefault(require("os"));
16
- var _path = _interopRequireDefault(require("path"));
17
17
  var _graphql = require("./graphql");
18
18
  var _api = require("./util/api");
19
19
  var _connector = require("./util/connector");
@@ -23,11 +23,11 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
23
23
  const TAKESHAPE_CONFIG_FILENAME = exports.TAKESHAPE_CONFIG_FILENAME = '.takeshaperc';
24
24
  const GRAPHQL_CONFIG_FILENAME = exports.GRAPHQL_CONFIG_FILENAME = '.graphqlconfig';
25
25
  function getHomeConfigPath() {
26
- return _path.default.join(_os.default.homedir(), TAKESHAPE_CONFIG_FILENAME);
26
+ return _nodePath.default.join(_nodeOs.default.homedir(), TAKESHAPE_CONFIG_FILENAME);
27
27
  }
28
28
  function loadConfig(cwd, cli) {
29
29
  let config = {};
30
- const configPath = _path.default.join(cwd, TAKESHAPE_CONFIG_FILENAME);
30
+ const configPath = _nodePath.default.join(cwd, TAKESHAPE_CONFIG_FILENAME);
31
31
  if (_fsExtra.default.existsSync(configPath)) {
32
32
  config = _fsExtra.default.readJsonSync(configPath);
33
33
  }
@@ -38,8 +38,8 @@ function loadConfig(cwd, cli) {
38
38
  config.personalAccessTokenId = homeConfig.id;
39
39
  }
40
40
  return {
41
- buildPath: _path.default.join(cwd, cli.flags.output ?? 'build'),
42
- configFilePath: _path.default.join(cwd, cli.flags.file ?? 'tsg.yml'),
41
+ buildPath: _nodePath.default.join(cwd, cli.flags.output ?? 'build'),
42
+ configFilePath: _nodePath.default.join(cwd, cli.flags.file ?? 'tsg.yml'),
43
43
  appUrl: process.env.TS_APP_URL ?? config.appUrl ?? 'https://app.takeshape.io',
44
44
  endpoint: process.env.TS_API_ENDPOINT ?? config.endpoint ?? 'https://api.takeshape.io',
45
45
  authToken: cli.flags.token ?? process.env.TS_AUTH_TOKEN ?? config.authToken,
package/dist/files.js CHANGED
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.copyStatic = copyStatic;
7
7
  exports.syncStatic = syncStatic;
8
8
  exports.writePages = writePages;
9
+ var _nodePath = _interopRequireDefault(require("node:path"));
9
10
  var _bluebird = _interopRequireDefault(require("bluebird"));
10
11
  var _fsExtra = require("fs-extra");
11
- var _path = _interopRequireDefault(require("path"));
12
12
  var _log = require("./log");
13
13
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
14
14
  async function copyStatic(config) {
@@ -19,7 +19,7 @@ async function copyStatic(config) {
19
19
  function syncStatic(config) {
20
20
  return (event, sourcePath) => {
21
21
  const relativePath = sourcePath.replace(config.staticPath, '');
22
- const destPath = _path.default.join(config.buildPath, relativePath);
22
+ const destPath = _nodePath.default.join(config.buildPath, relativePath);
23
23
  if (event === 'addDir') {
24
24
  (0, _log.log)(`takeshape watch - copied ${relativePath}`);
25
25
  (0, _fsExtra.mkdirs)(destPath);
@@ -35,8 +35,8 @@ function syncStatic(config) {
35
35
  function writePages(outputPath) {
36
36
  return generated => {
37
37
  return _bluebird.default.map(generated.pages, async page => {
38
- const filePath = _path.default.join(outputPath, page.path);
39
- return (0, _fsExtra.mkdirs)(_path.default.dirname(filePath)).then(async () => (0, _fsExtra.writeFile)(filePath, page.contents, 'utf8'));
38
+ const filePath = _nodePath.default.join(outputPath, page.path);
39
+ return (0, _fsExtra.mkdirs)(_nodePath.default.dirname(filePath)).then(async () => (0, _fsExtra.writeFile)(filePath, page.contents, 'utf8'));
40
40
  }).then(() => generated.stats);
41
41
  };
42
42
  }
package/dist/types.d.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  import type { Cli } from './options';
2
- import type { ApiKey } from './util/data';
3
2
  export type Handler = (cli: Cli, params: CliConfig) => Promise<void>;
4
3
  export type CliConfig = {
5
4
  buildPath: string;
@@ -43,4 +42,8 @@ export type GraphQLError = {
43
42
  message: string;
44
43
  };
45
44
  export type Client = (params: GraphQLRequestParams) => Promise<GraphQLResponse>;
45
+ export type ApiKey = {
46
+ id: string;
47
+ apiKey: string;
48
+ };
46
49
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,MAAM,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACnF,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACjF,MAAM,MAAM,wBAAwB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEpG,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE1E,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,eAAe,CAEpF;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,iBAAiB,CAExF;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,uBAAuB,CAEpG;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAErC,MAAM,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACnF,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACjF,MAAM,MAAM,wBAAwB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEpG,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE1E,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,eAAe,CAEpF;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,iBAAiB,CAExF;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,uBAAuB,CAEpG;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;AAEhF,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC"}
@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.connectorWithCache = connectorWithCache;
7
+ var _nodePath = _interopRequireDefault(require("node:path"));
7
8
  var _fsExtra = require("fs-extra");
8
9
  var _objectHash = _interopRequireDefault(require("object-hash"));
9
- var _path = _interopRequireDefault(require("path"));
10
10
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
11
11
  const cacheDir = '.cache';
12
12
  function connectorWithCache(connector) {
13
13
  const decorated = async params => {
14
- const cachePath = _path.default.join(cacheDir, `${(0, _objectHash.default)(params)}.json`);
14
+ const cachePath = _nodePath.default.join(cacheDir, `${(0, _objectHash.default)(params)}.json`);
15
15
  if (await (0, _fsExtra.pathExists)(cachePath)) {
16
16
  return (0, _fsExtra.readJSON)(cachePath);
17
17
  }
@@ -1,6 +1,6 @@
1
1
  import { type ProjectPathParams } from '../graphql';
2
2
  import type { Choice } from '../prompt';
3
- import type { CliConfig, LoggedInCliConfig } from '../types';
3
+ import type { ApiKey, CliConfig, LoggedInCliConfig } from '../types';
4
4
  export declare const projectListQuery = "\n {\n projects: getProjectList {\n value: id\n name\n invite\n }\n }\n";
5
5
  export declare const siteListQuery = "\n {\n sites: getTSStaticSiteList {\n items {\n value: _id\n name: title\n }\n }\n }\n";
6
6
  export declare const getProjectQuery = "\n query($id: ID!) {\n project: getProject(id: $id) {\n status\n }\n }\n";
@@ -17,10 +17,6 @@ export type PersonalAccessToken = {
17
17
  accessToken: string;
18
18
  id: string;
19
19
  };
20
- export type ApiKey = {
21
- id: string;
22
- apiKey: string;
23
- };
24
20
  export declare const createPersonalAccessTokenMutation: (client: import("../types").Client, variables: {
25
21
  name: string;
26
22
  }) => Promise<PersonalAccessToken>;
@@ -1 +1 @@
1
- {"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/util/data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuD,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACzG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7D,eAAO,MAAM,gBAAgB,0HAQ5B,CAAC;AAEF,eAAO,MAAM,aAAa,sJASzB,CAAC;AAEF,eAAO,MAAM,eAAe,0FAM3B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAC;CACjB,GAAG,MAAM,CAAC;AAEX,wBAAsB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQhF;AAED,eAAO,MAAM,SAAS;;;CAA+C,CAAC;AAEtE,wBAAsB,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAS5G;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,iCAAiC;UAAwB,MAAM;kCAO1E,CAAC;AAEH,eAAO,MAAM,4BAA4B;UAAwB,MAAM;qBAOrE,CAAC;AAEH,eAAO,MAAM,iCAAiC;QAAsB,MAAM;sBAIxE,CAAC;AAEH,eAAO,MAAM,oBAAoB;QAAsB,MAAM;sBAI3D,CAAC;AAMH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAShH;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,oBAaxE;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CASpH;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,oBAO5G"}
1
+ {"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/util/data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuD,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACzG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAErE,eAAO,MAAM,gBAAgB,0HAQ5B,CAAC;AAEF,eAAO,MAAM,aAAa,sJASzB,CAAC;AAEF,eAAO,MAAM,eAAe,0FAM3B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,OAAO,CAAC;CACjB,GAAG,MAAM,CAAC;AAEX,wBAAsB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQhF;AAED,eAAO,MAAM,SAAS;;;CAA+C,CAAC;AAEtE,wBAAsB,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAS5G;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,eAAO,MAAM,iCAAiC;UAAwB,MAAM;kCAO1E,CAAC;AAEH,eAAO,MAAM,4BAA4B;UAAwB,MAAM;qBAOrE,CAAC;AAEH,eAAO,MAAM,iCAAiC;QAAsB,MAAM;sBAIxE,CAAC;AAEH,eAAO,MAAM,oBAAoB;QAAsB,MAAM;sBAI3D,CAAC;AAMH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAShH;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,oBAaxE;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CASpH;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,oBAO5G"}
package/dist/util/data.js CHANGED
@@ -14,7 +14,7 @@ exports.deletePersonalAccessTokenMutation = void 0;
14
14
  exports.fetchProjects = fetchProjects;
15
15
  exports.fetchSites = fetchSites;
16
16
  exports.siteListQuery = exports.projectListQuery = exports.laterSite = exports.getProjectQuery = void 0;
17
- var _os = _interopRequireDefault(require("os"));
17
+ var _nodeOs = _interopRequireDefault(require("node:os"));
18
18
  var _errors = require("../errors");
19
19
  var _graphql = require("../graphql");
20
20
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -102,7 +102,7 @@ const deleteApiKeyMutation = exports.deleteApiKeyMutation = (0, _graphql.graphQL
102
102
  }
103
103
  `);
104
104
  function createKeyName() {
105
- return `TakeShape CLI ${_os.default.hostname()} ${new Date().toISOString().split('T')[0]}`;
105
+ return `TakeShape CLI ${_nodeOs.default.hostname()} ${new Date().toISOString().split('T')[0]}`;
106
106
  }
107
107
  async function createPersonalAccessToken(params, userJwt) {
108
108
  try {
package/dist/util/fs.js CHANGED
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.resolveFromFlag = resolveFromFlag;
7
+ var _nodePath = _interopRequireDefault(require("node:path"));
7
8
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
8
- var _path = _interopRequireDefault(require("path"));
9
9
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
10
10
  function resolveFromFlag(from, expectedFilename) {
11
11
  if (!_fsExtra.default.existsSync(from)) {
@@ -20,7 +20,7 @@ function resolveFromFlag(from, expectedFilename) {
20
20
  file: from
21
21
  };
22
22
  }
23
- const file = _path.default.join(from, expectedFilename);
23
+ const file = _nodePath.default.join(from, expectedFilename);
24
24
  if (_fsExtra.default.existsSync(file) && _fsExtra.default.lstatSync(file).isFile()) {
25
25
  return {
26
26
  exists: true,
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.generateTypes = generateTypes;
7
+ var _nodePath = require("node:path");
7
8
  var _core = require("@graphql-codegen/core");
8
9
  var typescriptPlugin = _interopRequireWildcard(require("@graphql-codegen/typescript"));
9
10
  var _graphqlFileLoader = require("@graphql-tools/graphql-file-loader");
@@ -11,7 +12,6 @@ var _load = require("@graphql-tools/load");
11
12
  var _chalk = _interopRequireDefault(require("chalk"));
12
13
  var _fsExtra = require("fs-extra");
13
14
  var _graphql = require("graphql");
14
- var _path = require("path");
15
15
  var _log = require("../log");
16
16
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
17
17
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
@@ -21,8 +21,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
21
21
  */
22
22
  async function generateTypes(schemaFile, outputFile) {
23
23
  (0, _log.log)(`Generating types from ${schemaFile}…`);
24
- const origin = (0, _path.join)(process.cwd(), schemaFile);
25
- const destination = (0, _path.join)(process.cwd(), outputFile);
24
+ const origin = (0, _nodePath.join)(process.cwd(), schemaFile);
25
+ const destination = (0, _nodePath.join)(process.cwd(), outputFile);
26
26
  const schema = await (0, _load.loadSchema)(origin, {
27
27
  loaders: [new _graphqlFileLoader.GraphQLFileLoader()]
28
28
  });
@@ -7,16 +7,16 @@ exports.isGlitch = isGlitch;
7
7
  exports.readDotEnv = readDotEnv;
8
8
  exports.updateEnv = updateEnv;
9
9
  exports.writeDotEnv = writeDotEnv;
10
+ var _nodePath = _interopRequireDefault(require("node:path"));
10
11
  var _dotenv = _interopRequireDefault(require("dotenv"));
11
12
  var _dotenvStringify = _interopRequireDefault(require("dotenv-stringify"));
12
13
  var _fsExtra = require("fs-extra");
13
- var _path = _interopRequireDefault(require("path"));
14
14
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
15
15
  function isGlitch() {
16
16
  return Boolean(process.env.GLITCH) || Boolean(process.env.PROJECT_REMIX_CHAIN);
17
17
  }
18
18
  function getEnvPath() {
19
- return _path.default.resolve(process.cwd(), '.env');
19
+ return _nodePath.default.resolve(process.cwd(), '.env');
20
20
  }
21
21
  async function readDotEnv() {
22
22
  const path = getEnvPath();
@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.loginBrowser = loginBrowser;
7
7
  exports.waitingQuestions = void 0;
8
+ var _nodeHttp = _interopRequireDefault(require("node:http"));
8
9
  var _getPort = _interopRequireDefault(require("get-port"));
9
- var _http = _interopRequireDefault(require("http"));
10
10
  var _open = _interopRequireDefault(require("open"));
11
11
  var _prompt = require("../prompt");
12
12
  var _messages = require("./messages");
@@ -28,7 +28,7 @@ async function loginBrowser(params) {
28
28
 
29
29
  // Spin up an ad-hoc server to recive the auth token from the login page
30
30
  return new Promise((resolve, reject) => {
31
- const server = _http.default.createServer((req, res) => {
31
+ const server = _nodeHttp.default.createServer((req, res) => {
32
32
  res.setHeader('Content-Type', 'text/plain');
33
33
  res.setHeader('Access-Control-Allow-Origin', params.appUrl);
34
34
  res.setHeader('Access-Control-Allow-Headers', 'x-takeshape-token');
@@ -1 +1 @@
1
- {"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../src/util/upload.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAGrE;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAOrE;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAWrF"}
1
+ {"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../src/util/upload.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAGrE;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAOrE;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAYrF"}
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.createTempFile = createTempFile;
7
7
  exports.getUploadUrl = getUploadUrl;
8
8
  exports.uploadFile = uploadFile;
9
+ var _nodePath = _interopRequireDefault(require("node:path"));
9
10
  var _streams = require("@takeshape/streams");
10
11
  var _fsExtra = _interopRequireDefault(require("fs-extra"));
11
- var _path = _interopRequireDefault(require("path"));
12
12
  var _request = _interopRequireDefault(require("request"));
13
13
  var _tmp = _interopRequireDefault(require("tmp"));
14
14
  var _api = _interopRequireDefault(require("./api"));
@@ -17,7 +17,7 @@ function createTempFile(filePath) {
17
17
  const tmpDir = _tmp.default.dirSync({
18
18
  unsafeCleanup: true
19
19
  });
20
- return [_path.default.join(tmpDir.name, filePath), tmpDir.removeCallback];
20
+ return [_nodePath.default.join(tmpDir.name, filePath), tmpDir.removeCallback];
21
21
  }
22
22
  async function getUploadUrl(params) {
23
23
  try {
@@ -38,6 +38,7 @@ async function uploadFile(filePath, uploadUrl) {
38
38
  'Content-Length': stats.size
39
39
  }
40
40
  });
41
+ // @ts-expect-error Request types are incompatible with newer stream types
41
42
  await (0, _streams.pump)(_fsExtra.default.createReadStream(filePath), putStream);
42
43
  return stats.size;
43
44
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@takeshape/cli",
3
- "version": "11.63.3",
3
+ "version": "11.64.0",
4
4
  "description": "TakeShape CLI",
5
5
  "homepage": "https://www.takeshape.io",
6
6
  "repository": {
@@ -52,11 +52,11 @@
52
52
  "semver": "^6.3.0",
53
53
  "stream-to-promise": "^2.2.0",
54
54
  "tmp": "^0.0.33",
55
- "@takeshape/branches": "11.63.3",
56
- "@takeshape/schema": "11.63.3",
57
- "@takeshape/ssg": "11.63.3",
58
- "@takeshape/util": "11.63.3",
59
- "@takeshape/streams": "11.63.3"
55
+ "@takeshape/branches": "11.64.0",
56
+ "@takeshape/ssg": "11.64.0",
57
+ "@takeshape/streams": "11.64.0",
58
+ "@takeshape/util": "11.64.0",
59
+ "@takeshape/schema": "11.64.0"
60
60
  },
61
61
  "devDependencies": {
62
62
  "@types/archiver": "^3.1.0",
@@ -66,10 +66,9 @@
66
66
  "@types/inquirer": "^7.3.1",
67
67
  "@types/jsonwebtoken": "^8.3.9",
68
68
  "@types/lodash": "^4.14.165",
69
- "@types/node": "^12.7.1",
70
69
  "@types/node-fetch": "^2.5.6",
71
70
  "@types/prettyjson": "^0.0.30",
72
- "@types/request": "^2.48.4",
71
+ "@types/request": "^2.48.12",
73
72
  "@types/semver": "^6.0.1",
74
73
  "@types/stream-to-promise": "^2.2.1",
75
74
  "@types/tmp": "^0.1.0",