create-yarn-workspaces 1.0.132 → 1.0.133

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.
Files changed (4) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/index.js +47 -42
  3. package/index.js.map +1 -1
  4. package/package.json +5 -3
package/CHANGELOG.md CHANGED
@@ -3,6 +3,22 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [1.0.133](https://github.com/bluelovers/create-yarn-workspaces/compare/create-yarn-workspaces@1.0.132...create-yarn-workspaces@1.0.133) (2021-12-26)
7
+
8
+
9
+ ### 🐛　Bug Fixes
10
+
11
+ * `ignoreExistsPackage` not work ([5865591](https://github.com/bluelovers/create-yarn-workspaces/commit/5865591fe10fd5b29c4d8b010fa97dce65ffa199))
12
+
13
+
14
+ ### ♻️　Chores
15
+
16
+ * **deps:** update deps ([2915799](https://github.com/bluelovers/create-yarn-workspaces/commit/2915799b24c73c0116d5bd48eeb724944bb39fbe))
17
+
18
+
19
+
20
+
21
+
6
22
  ## [1.0.132](https://github.com/bluelovers/create-yarn-workspaces/compare/create-yarn-workspaces@1.0.131...create-yarn-workspaces@1.0.132) (2021-12-26)
7
23
 
8
24
  **Note:** Version bump only for package create-yarn-workspaces
package/index.js CHANGED
@@ -5,16 +5,15 @@
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.createDirByPackages = exports._createYarnWorkspaces = exports.createYarnWorkspaces = void 0;
7
7
  const tslib_1 = require("tslib");
8
- const core_1 = tslib_1.__importDefault(require("find-yarn-workspace-root2/core"));
9
- const path_1 = require("path");
10
- const pkg_dir_1 = tslib_1.__importDefault(require("pkg-dir"));
11
- const logger_1 = tslib_1.__importDefault(require("debug-color2/logger"));
8
+ const upath2_1 = require("upath2");
9
+ const logger_1 = require("debug-color2/logger");
12
10
  const static_file_1 = require("@yarn-tool/static-file");
13
11
  const fs_extra_1 = require("fs-extra");
14
- const sort_package_json3_1 = tslib_1.__importDefault(require("sort-package-json3"));
12
+ const sort_package_json3_1 = require("sort-package-json3");
15
13
  const lib_1 = require("./lib");
16
14
  const util_1 = require("./lib/util");
17
- const wsCopyStaticFiles_1 = tslib_1.__importDefault(require("./lib/wsCopyStaticFiles"));
15
+ const wsCopyStaticFiles_1 = require("./lib/wsCopyStaticFiles");
16
+ const find_root_1 = require("@yarn-tool/find-root");
18
17
  tslib_1.__exportStar(require("./lib/index"), exports);
19
18
  tslib_1.__exportStar(require("./lib/util"), exports);
20
19
  function createYarnWorkspaces(cwd, options = {}) {
@@ -22,43 +21,35 @@ function createYarnWorkspaces(cwd, options = {}) {
22
21
  options = cwd;
23
22
  cwd = options.cwd;
24
23
  }
25
- if (!cwd) {
26
- cwd = process.cwd();
27
- }
28
- cwd = (0, path_1.resolve)(cwd);
29
- let root = pkg_dir_1.default.sync(cwd);
30
- let ws;
31
- try {
32
- // @FIXME 一個奇怪的BUG 不使用 try 的話 在 NPX 底下就會出現無訊息的停止
33
- ws = (0, core_1.default)(root);
34
- }
35
- catch (e) {
36
- logger_1.default.log(e.toString());
37
- ws = null;
38
- }
39
- let targetPath = (0, path_1.resolve)(root || cwd);
40
- options.debug && logger_1.default.debug({
24
+ const rootData = (0, find_root_1.findRootLazy)({
25
+ cwd,
26
+ });
27
+ cwd = rootData.cwd;
28
+ let root = rootData.pkg;
29
+ let ws = rootData.ws;
30
+ let targetPath = (0, upath2_1.resolve)(root || cwd);
31
+ options.debug && logger_1.consoleLogger.debug({
41
32
  targetPath,
42
33
  ws,
43
34
  options,
44
35
  });
45
36
  if (!options.ignoreExistsPackage && root) {
46
- logger_1.default.error(`already have package at "${root}", or use ignoreExistsPackage for overwrite it`);
37
+ logger_1.consoleLogger.error(`already have package at "${root}", or use ignoreExistsPackage for overwrite it`);
47
38
  return false;
48
39
  }
49
40
  else if (root) {
50
- logger_1.default.warn(`ignore exists package "${root}"`);
41
+ logger_1.consoleLogger.warn(`ignore exists package "${root}"`);
51
42
  }
52
43
  if (ws) {
53
- let bool = true;
54
- logger_1.default.warn(`detect exists workspace "${ws}"`);
55
- if (options.ignoreParentWorkspaces) {
56
- bool = (0, util_1.isSamePath)(targetPath, ws);
57
- if (!bool) {
58
- logger_1.default.warn(`ignoreParentWorkspaces = true`);
44
+ let bool = !(0, util_1.isSamePath)(targetPath, ws);
45
+ logger_1.consoleLogger.warn(`detect exists workspace "${ws}"`);
46
+ if (bool) {
47
+ if (options.ignoreParentWorkspaces) {
48
+ logger_1.consoleLogger.warn(`ignoreParentWorkspaces = true`);
49
+ bool = false;
59
50
  }
60
51
  else {
61
- logger_1.default.error(`target path already is workspace`);
52
+ logger_1.consoleLogger.error(`target path already is workspace`);
62
53
  }
63
54
  }
64
55
  if (bool) {
@@ -69,11 +60,11 @@ function createYarnWorkspaces(cwd, options = {}) {
69
60
  }
70
61
  exports.createYarnWorkspaces = createYarnWorkspaces;
71
62
  function _createYarnWorkspaces(targetPath, options = {}) {
72
- logger_1.default.info(`create in target path "${targetPath}"`);
63
+ logger_1.consoleLogger.info(`create in target path "${targetPath}"`);
73
64
  let pkg;
74
65
  let lerna;
75
66
  {
76
- let file = (0, path_1.join)(targetPath, 'lerna.json');
67
+ let file = (0, upath2_1.join)(targetPath, 'lerna.json');
77
68
  if ((0, fs_extra_1.existsSync)(file)) {
78
69
  let json = JSON.parse((0, fs_extra_1.readFileSync)(file).toString());
79
70
  if (json.packages && !Object.keys(json.packages).length) {
@@ -85,9 +76,9 @@ function _createYarnWorkspaces(targetPath, options = {}) {
85
76
  let packages = lerna && lerna.packages || [
86
77
  "packages/*",
87
78
  ];
88
- let file = (0, path_1.join)(targetPath, 'package.json');
79
+ let file = (0, upath2_1.join)(targetPath, 'package.json');
89
80
  if (!(0, fs_extra_1.existsSync)(file)) {
90
- let name = (0, path_1.basename)(targetPath);
81
+ let name = (0, upath2_1.basename)(targetPath);
91
82
  if (!(0, fs_extra_1.existsSync)(targetPath)) {
92
83
  (0, fs_extra_1.mkdirSync)(targetPath);
93
84
  }
@@ -119,20 +110,34 @@ function _createYarnWorkspaces(targetPath, options = {}) {
119
110
  "workspaces": workspaces,
120
111
  });
121
112
  pkg.resolutions = pkg.resolutions || {};
113
+ Object.entries((0, lib_1.getDefaultPackageJson)(json.name))
114
+ .forEach(([field, value]) => {
115
+ var _a, _b;
116
+ if (field === 'scripts') {
117
+ (_a = pkg.scripts) !== null && _a !== void 0 ? _a : (pkg.scripts = {});
118
+ pkg.scripts = {
119
+ ...value,
120
+ ...pkg.scripts,
121
+ };
122
+ }
123
+ else {
124
+ (_b = pkg[field]) !== null && _b !== void 0 ? _b : (pkg[field] = value);
125
+ }
126
+ });
122
127
  }
123
- let s = JSON.stringify((0, sort_package_json3_1.default)(pkg), null, 2);
128
+ let s = JSON.stringify((0, sort_package_json3_1.sortPackageJson)(pkg), null, 2);
124
129
  (0, fs_extra_1.writeFileSync)(file, s);
125
- logger_1.default.success(`create workspace package.json`);
130
+ logger_1.consoleLogger.success(`create workspace package.json`);
126
131
  if (lerna && (packages != lerna.packages || lerna.npmClient !== 'yarn' || lerna.useWorkspaces !== true)) {
127
- let file = (0, path_1.join)(targetPath, 'lerna.json');
132
+ let file = (0, upath2_1.join)(targetPath, 'lerna.json');
128
133
  lerna.packages = packages;
129
134
  lerna.npmClient = 'yarn';
130
135
  lerna.useWorkspaces = true;
131
- let s = JSON.stringify((0, sort_package_json3_1.default)(lerna), null, 2);
136
+ let s = JSON.stringify((0, sort_package_json3_1.sortPackageJson)(lerna), null, 2);
132
137
  (0, fs_extra_1.writeFileSync)(file, s);
133
- logger_1.default.info(`update lerna.json`);
138
+ logger_1.consoleLogger.info(`update lerna.json`);
134
139
  }
135
- const file_map = (0, wsCopyStaticFiles_1.default)();
140
+ const file_map = (0, wsCopyStaticFiles_1.getWsCopyStaticFiles)();
136
141
  (0, static_file_1.copyStaticFiles)({
137
142
  cwd: targetPath,
138
143
  file_map,
@@ -146,7 +151,7 @@ function createDirByPackages(cwd, packages) {
146
151
  let bool;
147
152
  let s = value.split(/[\/\\]/)[0];
148
153
  if (!/[!?\*{}\[\]]/.test(s)) {
149
- let dir = (0, path_1.join)(cwd, s);
154
+ let dir = (0, upath2_1.join)(cwd, s);
150
155
  if (!(0, fs_extra_1.existsSync)(dir)) {
151
156
  (0, fs_extra_1.mkdirSync)(dir);
152
157
  }
package/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Created by user on 2018/5/13/013.\n */\n\nimport findYarnWorkspaceRoot from 'find-yarn-workspace-root2/core';\nimport { resolve, join, basename } from 'path';\nimport pkgDir from 'pkg-dir';\nimport console from 'debug-color2/logger';\nimport { copyStaticFiles } from '@yarn-tool/static-file';\nimport { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs-extra';\nimport sortPackageJson from 'sort-package-json3';\nimport { getDefaultPackageJson } from './lib';\nimport { isSamePath } from './lib/util';\nimport { ILernaJson } from '@ts-type/package-dts/lerna-json';\nimport { IPackageJson } from '@ts-type/package-dts/package-json';\nimport getWsCopyStaticFiles from './lib/wsCopyStaticFiles';\n\nexport * from './lib/index';\nexport * from './lib/util';\n\nexport interface IOptions\n{\n\tcwd?: string,\n\n\tignoreParentWorkspaces?: boolean,\n\tignoreExistsPackage?: boolean,\n\n\tinitPackageJson?<T extends Record<string, any> = {}>(current: IPackageJson): IPackageJson & T,\n\n\tdebug?: boolean,\n}\n\nexport function createYarnWorkspaces(cwd?: string, options: IOptions = {})\n{\n\tif (cwd && typeof cwd != 'string')\n\t{\n\t\toptions = cwd;\n\t\tcwd = options.cwd;\n\t}\n\n\tif (!cwd)\n\t{\n\t\tcwd = process.cwd();\n\t}\n\n\tcwd = resolve(cwd);\n\n\tlet root: string = pkgDir.sync(cwd);\n\n\tlet ws: string;\n\n\ttry\n\t{\n\t\t// @FIXME 一個奇怪的BUG 不使用 try 的話 在 NPX 底下就會出現無訊息的停止\n\t\tws = findYarnWorkspaceRoot(root);\n\t}\n\tcatch (e)\n\t{\n\t\tconsole.log(e.toString());\n\n\t\tws = null;\n\t}\n\n\tlet targetPath = resolve(root || cwd);\n\n\toptions.debug && console.debug({\n\t\ttargetPath,\n\t\tws,\n\t\toptions,\n\t});\n\n\tif (!options.ignoreExistsPackage && root)\n\t{\n\t\tconsole.error(`already have package at \"${root}\", or use ignoreExistsPackage for overwrite it`);\n\n\t\treturn false;\n\t}\n\telse if (root)\n\t{\n\t\tconsole.warn(`ignore exists package \"${root}\"`);\n\t}\n\n\tif (ws)\n\t{\n\t\tlet bool: boolean = true;\n\n\t\tconsole.warn(`detect exists workspace \"${ws}\"`);\n\n\t\tif (options.ignoreParentWorkspaces)\n\t\t{\n\t\t\tbool = isSamePath(targetPath, ws);\n\n\t\t\tif (!bool)\n\t\t\t{\n\t\t\t\tconsole.warn(`ignoreParentWorkspaces = true`);\n\t\t\t}\n\t\t\telse\n\t\t\t{\n\t\t\t\tconsole.error(`target path already is workspace`);\n\t\t\t}\n\t\t}\n\n\t\tif (bool)\n\t\t{\n\t\t\treturn false;\n\t\t}\n\t}\n\n\treturn _createYarnWorkspaces(targetPath);\n}\n\nexport function _createYarnWorkspaces(targetPath: string, options: IOptions = {})\n{\n\tconsole.info(`create in target path \"${targetPath}\"`);\n\n\tlet pkg: IPackageJson;\n\n\tlet lerna: ILernaJson;\n\n\t{\n\t\tlet file = join(targetPath, 'lerna.json');\n\n\t\tif (existsSync(file))\n\t\t{\n\t\t\tlet json: ILernaJson = JSON.parse(readFileSync(file).toString());\n\n\t\t\tif (json.packages && !Object.keys(json.packages).length)\n\t\t\t{\n\t\t\t\tjson.packages = undefined;\n\t\t\t}\n\n\t\t\tlerna = json;\n\t\t}\n\t}\n\n\tlet packages = lerna && lerna.packages || [\n\t\t\"packages/*\",\n\t];\n\n\tlet file = join(targetPath, 'package.json');\n\n\tif (!existsSync(file))\n\t{\n\t\tlet name = basename(targetPath);\n\n\t\tif (!existsSync(targetPath))\n\t\t{\n\t\t\tmkdirSync(targetPath);\n\t\t}\n\n\t\tpkg = Object.assign(getDefaultPackageJson(name), {\n\t\t\tname,\n\t\t\tworkspaces: packages,\n\t\t});\n\n\t\tif (options.initPackageJson)\n\t\t{\n\t\t\tlet ret = options.initPackageJson(pkg);\n\n\t\t\tif (ret)\n\t\t\t{\n\t\t\t\tpkg = ret;\n\t\t\t}\n\t\t}\n\t}\n\telse\n\t{\n\t\tlet json: IPackageJson = JSON.parse(readFileSync(file).toString());\n\n\t\tlet workspaces: ILernaJson['packages'];\n\n\t\tif (json.workspaces && Object.keys(json.workspaces).length)\n\t\t{\n\t\t\tworkspaces = json.workspaces;\n\n\t\t\t// https://yarnpkg.com/blog/2018/02/15/nohoist/\n\t\t\t// @ts-ignore\n\t\t\tpackages = workspaces.packages || workspaces;\n\t\t}\n\t\telse\n\t\t{\n\t\t\tworkspaces = packages;\n\t\t}\n\n\t\tpkg = Object.assign(json, {\n\t\t\t\"private\": true,\n\t\t\t\"workspaces\": workspaces,\n\t\t});\n\n\t\tpkg.resolutions = pkg.resolutions || {};\n\t}\n\n\tlet s = JSON.stringify(sortPackageJson(pkg), null, 2);\n\twriteFileSync(file, s);\n\n\tconsole.success(`create workspace package.json`);\n\n\tif (lerna && (packages != lerna.packages || lerna.npmClient !== 'yarn' || lerna.useWorkspaces !== true))\n\t{\n\t\tlet file = join(targetPath, 'lerna.json');\n\n\t\tlerna.packages = packages;\n\t\tlerna.npmClient = 'yarn';\n\t\tlerna.useWorkspaces = true;\n\n\t\tlet s = JSON.stringify(sortPackageJson(lerna), null, 2);\n\t\twriteFileSync(file, s);\n\n\t\tconsole.info(`update lerna.json`);\n\t}\n\n\tconst file_map = getWsCopyStaticFiles();\n\n\tcopyStaticFiles({\n\t\tcwd: targetPath,\n\t\tfile_map,\n\t});\n\n\tcreateDirByPackages(targetPath, packages);\n\n\treturn true;\n}\n\nexport function createDirByPackages(cwd: string, packages: string[])\n{\n\treturn packages.some(function (value)\n\t{\n\t\tlet bool: boolean;\n\n\t\tlet s = value.split(/[\\/\\\\]/)[0];\n\n\t\tif (!/[!?\\*{}\\[\\]]/.test(s))\n\t\t{\n\t\t\tlet dir = join(cwd, s);\n\n\t\t\tif (!existsSync(dir))\n\t\t\t{\n\t\t\t\tmkdirSync(dir);\n\t\t\t}\n\n\t\t\treturn true;\n\t\t}\n\n\t\treturn bool;\n\t})\n}\n\nexport default createYarnWorkspaces;\n"]}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Created by user on 2018/5/13/013.\n */\n\nimport findYarnWorkspaceRoot from 'find-yarn-workspace-root2/core';\nimport { resolve, join, basename } from 'upath2';\nimport pkgDir from 'pkg-dir';\nimport { consoleLogger as console } from 'debug-color2/logger';\nimport { copyStaticFiles } from '@yarn-tool/static-file';\nimport { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs-extra';\nimport { sortPackageJson } from 'sort-package-json3';\nimport { getDefaultPackageJson } from './lib';\nimport { isSamePath } from './lib/util';\nimport { ILernaJson } from '@ts-type/package-dts/lerna-json';\nimport { IPackageJson } from '@ts-type/package-dts/package-json';\nimport { getWsCopyStaticFiles } from './lib/wsCopyStaticFiles';\nimport { findRootLazy } from '@yarn-tool/find-root';\n\nexport * from './lib/index';\nexport * from './lib/util';\n\nexport interface IOptions\n{\n\tcwd?: string,\n\n\tignoreParentWorkspaces?: boolean,\n\tignoreExistsPackage?: boolean,\n\n\tinitPackageJson?<T extends Record<string, any> = {}>(current: IPackageJson): IPackageJson & T,\n\n\tdebug?: boolean,\n}\n\nexport function createYarnWorkspaces(cwd?: string, options: IOptions = {})\n{\n\tif (cwd && typeof cwd != 'string')\n\t{\n\t\toptions = cwd;\n\t\tcwd = options.cwd;\n\t}\n\n\tconst rootData = findRootLazy({\n\t\tcwd,\n\t});\n\n\tcwd = rootData.cwd;\n\n\tlet root: string = rootData.pkg;\n\n\tlet ws: string = rootData.ws;\n\n\tlet targetPath = resolve(root || cwd);\n\n\toptions.debug && console.debug({\n\t\ttargetPath,\n\t\tws,\n\t\toptions,\n\t});\n\n\tif (!options.ignoreExistsPackage && root)\n\t{\n\t\tconsole.error(`already have package at \"${root}\", or use ignoreExistsPackage for overwrite it`);\n\n\t\treturn false;\n\t}\n\telse if (root)\n\t{\n\t\tconsole.warn(`ignore exists package \"${root}\"`);\n\t}\n\n\tif (ws)\n\t{\n\t\tlet bool: boolean = !isSamePath(targetPath, ws);\n\n\t\tconsole.warn(`detect exists workspace \"${ws}\"`);\n\n\t\tif (bool)\n\t\t{\n\t\t\tif (options.ignoreParentWorkspaces)\n\t\t\t{\n\t\t\t\tconsole.warn(`ignoreParentWorkspaces = true`);\n\t\t\t\tbool = false;\n\t\t\t}\n\t\t\telse\n\t\t\t{\n\t\t\t\tconsole.error(`target path already is workspace`);\n\t\t\t}\n\t\t}\n\n\t\tif (bool)\n\t\t{\n\t\t\treturn false;\n\t\t}\n\t}\n\n\treturn _createYarnWorkspaces(targetPath);\n}\n\nexport function _createYarnWorkspaces(targetPath: string, options: IOptions = {})\n{\n\tconsole.info(`create in target path \"${targetPath}\"`);\n\n\tlet pkg: IPackageJson;\n\n\tlet lerna: ILernaJson;\n\n\t{\n\t\tlet file = join(targetPath, 'lerna.json');\n\n\t\tif (existsSync(file))\n\t\t{\n\t\t\tlet json: ILernaJson = JSON.parse(readFileSync(file).toString());\n\n\t\t\tif (json.packages && !Object.keys(json.packages).length)\n\t\t\t{\n\t\t\t\tjson.packages = undefined;\n\t\t\t}\n\n\t\t\tlerna = json;\n\t\t}\n\t}\n\n\tlet packages = lerna && lerna.packages || [\n\t\t\"packages/*\",\n\t];\n\n\tlet file = join(targetPath, 'package.json');\n\n\tif (!existsSync(file))\n\t{\n\t\tlet name = basename(targetPath);\n\n\t\tif (!existsSync(targetPath))\n\t\t{\n\t\t\tmkdirSync(targetPath);\n\t\t}\n\n\t\tpkg = Object.assign(getDefaultPackageJson(name), {\n\t\t\tname,\n\t\t\tworkspaces: packages,\n\t\t});\n\n\t\tif (options.initPackageJson)\n\t\t{\n\t\t\tlet ret = options.initPackageJson(pkg);\n\n\t\t\tif (ret)\n\t\t\t{\n\t\t\t\tpkg = ret;\n\t\t\t}\n\t\t}\n\t}\n\telse\n\t{\n\t\tlet json: IPackageJson = JSON.parse(readFileSync(file).toString());\n\n\t\tlet workspaces: ILernaJson['packages'];\n\n\t\tif (json.workspaces && Object.keys(json.workspaces).length)\n\t\t{\n\t\t\tworkspaces = json.workspaces;\n\n\t\t\t// https://yarnpkg.com/blog/2018/02/15/nohoist/\n\t\t\t// @ts-ignore\n\t\t\tpackages = workspaces.packages || workspaces;\n\t\t}\n\t\telse\n\t\t{\n\t\t\tworkspaces = packages;\n\t\t}\n\n\t\tpkg = Object.assign(json, {\n\t\t\t\"private\": true,\n\t\t\t\"workspaces\": workspaces,\n\t\t});\n\n\t\tpkg.resolutions = pkg.resolutions || {};\n\n\t\tObject.entries(getDefaultPackageJson(json.name))\n\t\t\t.forEach(([field, value]) => {\n\n\t\t\t\tif (field === 'scripts')\n\t\t\t\t{\n\t\t\t\t\tpkg.scripts ??= {};\n\t\t\t\t\tpkg.scripts = {\n\t\t\t\t\t\t...value,\n\t\t\t\t\t\t...pkg.scripts,\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\telse\n\t\t\t\t{\n\t\t\t\t\tpkg[field] ??= value\n\t\t\t\t}\n\n\t\t\t})\n\t\t;\n\n\t}\n\n\tlet s = JSON.stringify(sortPackageJson(pkg), null, 2);\n\twriteFileSync(file, s);\n\n\tconsole.success(`create workspace package.json`);\n\n\tif (lerna && (packages != lerna.packages || lerna.npmClient !== 'yarn' || lerna.useWorkspaces !== true))\n\t{\n\t\tlet file = join(targetPath, 'lerna.json');\n\n\t\tlerna.packages = packages;\n\t\tlerna.npmClient = 'yarn';\n\t\tlerna.useWorkspaces = true;\n\n\t\tlet s = JSON.stringify(sortPackageJson(lerna), null, 2);\n\t\twriteFileSync(file, s);\n\n\t\tconsole.info(`update lerna.json`);\n\t}\n\n\tconst file_map = getWsCopyStaticFiles();\n\n\tcopyStaticFiles({\n\t\tcwd: targetPath,\n\t\tfile_map,\n\t});\n\n\tcreateDirByPackages(targetPath, packages);\n\n\treturn true;\n}\n\nexport function createDirByPackages(cwd: string, packages: string[])\n{\n\treturn packages.some(function (value)\n\t{\n\t\tlet bool: boolean;\n\n\t\tlet s = value.split(/[\\/\\\\]/)[0];\n\n\t\tif (!/[!?\\*{}\\[\\]]/.test(s))\n\t\t{\n\t\t\tlet dir = join(cwd, s);\n\n\t\t\tif (!existsSync(dir))\n\t\t\t{\n\t\t\t\tmkdirSync(dir);\n\t\t\t}\n\n\t\t\treturn true;\n\t\t}\n\n\t\treturn bool;\n\t})\n}\n\nexport default createYarnWorkspaces;\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "create-yarn-workspaces",
3
- "version": "1.0.132",
3
+ "version": "1.0.133",
4
4
  "description": "yarn create yarn-workspaces npx create-yarn-workspaces",
5
5
  "keywords": [
6
6
  "cli",
@@ -48,6 +48,7 @@
48
48
  "resolutions": {},
49
49
  "dependencies": {
50
50
  "@ts-type/package-dts": "^1.0.56",
51
+ "@yarn-tool/find-root": "^1.0.59",
51
52
  "@yarn-tool/static-file": "^1.0.81",
52
53
  "debug-color2": "^1.2.7",
53
54
  "find-yarn-workspace-root2": "^1.2.35",
@@ -57,7 +58,8 @@
57
58
  "sort-package-json": "^1.53.1",
58
59
  "sort-package-json3": "^1.0.48",
59
60
  "tslib": "^2.3.1",
60
- "yargs": "^17.3.0"
61
+ "upath2": "^3.1.10",
62
+ "yargs": "^17.3.1"
61
63
  },
62
- "gitHead": "7e1c8611ed210b7d459a3dde52fbbf43d8fb7937"
64
+ "gitHead": "94c353980d59a7cebfd89d3d6d62bef692d95f69"
63
65
  }