@yarn-tool/setup-module-env 2.0.11 → 2.0.13
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.
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,34 @@
|
|
|
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
|
+
## [2.0.13](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/setup-module-env@2.0.12...@yarn-tool/setup-module-env@2.0.13) (2022-10-01)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### 🐛 Bug Fixes
|
|
11
|
+
|
|
12
|
+
* fixTsdxPackage when init pkg ([cd5309e](https://github.com/bluelovers/ws-yarn-workspaces/commit/cd5309e9ba764499ef6bd4b6f7b14f62f035c38d))
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### 📌 Dependencies
|
|
16
|
+
|
|
17
|
+
* update deps ([c430f84](https://github.com/bluelovers/ws-yarn-workspaces/commit/c430f84f3f3dcfe685b2875f8706f985d5a41ef2))
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### 🔖 Miscellaneous
|
|
21
|
+
|
|
22
|
+
* . ([777d61a](https://github.com/bluelovers/ws-yarn-workspaces/commit/777d61af255146b2b1b1f364587c36a0f5bfc00c))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
## [2.0.12](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/setup-module-env@2.0.11...@yarn-tool/setup-module-env@2.0.12) (2022-09-30)
|
|
27
|
+
|
|
28
|
+
**Note:** Version bump only for package @yarn-tool/setup-module-env
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
6
34
|
## [2.0.11](https://github.com/bluelovers/ws-yarn-workspaces/compare/@yarn-tool/setup-module-env@2.0.10...@yarn-tool/setup-module-env@2.0.11) (2022-09-29)
|
|
7
35
|
|
|
8
36
|
|
package/lib/preset/tsdx/fix.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { IPackageJson } from '@ts-type/package-dts/package-json';
|
|
2
2
|
import { ISetupTsdxOptions } from './index';
|
|
3
|
-
|
|
3
|
+
import { ITSPickExtra } from 'ts-type/lib/type/record';
|
|
4
|
+
export declare function fixTsdxPackage<P extends IPackageJson>(pkg: P, config: ITSPickExtra<ISetupTsdxOptions<P>, 'rootData'>): P;
|
package/lib/preset/tsdx/fix.js
CHANGED
|
@@ -5,7 +5,7 @@ const dot_values2_1 = require("dot-values2");
|
|
|
5
5
|
function fixTsdxPackage(pkg, config) {
|
|
6
6
|
var _a, _b, _c, _d, _e;
|
|
7
7
|
var _f, _g;
|
|
8
|
-
if (
|
|
8
|
+
if (config.rootData.hasWorkspace && !config.rootData.isWorkspace) {
|
|
9
9
|
(0, dot_values2_1.deleteValue)(pkg, ['dependencies', 'tslib']);
|
|
10
10
|
(0, dot_values2_1.deleteValue)(pkg, ['devDependencies', 'tslib']);
|
|
11
11
|
}
|
|
@@ -15,7 +15,7 @@ function fixTsdxPackage(pkg, config) {
|
|
|
15
15
|
(_d = (_f = pkg.devDependencies)['tslib']) !== null && _d !== void 0 ? _d : (_f['tslib'] = pkg.dependencies['tslib']);
|
|
16
16
|
(0, dot_values2_1.deleteValue)(pkg, ['dependencies', 'tslib']);
|
|
17
17
|
}
|
|
18
|
-
if (config
|
|
18
|
+
if (config.rootData.isRoot) {
|
|
19
19
|
(_e = (_g = pkg.devDependencies)['@bluelovers/tsconfig']) !== null && _e !== void 0 ? _e : (_g['@bluelovers/tsconfig'] = '*');
|
|
20
20
|
}
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix.js","sourceRoot":"","sources":["fix.ts"],"names":[],"mappings":";;;AAEA,6CAA0C;
|
|
1
|
+
{"version":3,"file":"fix.js","sourceRoot":"","sources":["fix.ts"],"names":[],"mappings":";;;AAEA,6CAA0C;AAG1C,SAAgB,cAAc,CAAyB,GAAM,EAAE,MAAsD;;;IAEpH,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAChE;QACC,IAAA,yBAAW,EAAC,GAAG,EAAE,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;QAC5C,IAAA,yBAAW,EAAC,GAAG,EAAE,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;KAC/C;SAED;QACC,MAAA,GAAG,CAAC,eAAe,oCAAnB,GAAG,CAAC,eAAe,GAAK,EAAE,EAAC;QAE3B,IAAI,CAAA,MAAA,MAAA,GAAG,CAAC,YAAY,0CAAG,OAAO,CAAC,0CAAE,MAAM,IAAG,CAAC,EAC3C;YACC,YAAA,GAAG,CAAC,eAAe,EAAC,OAAO,wCAAP,OAAO,IAAM,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,EAAC;YAC3D,IAAA,yBAAW,EAAC,GAAG,EAAE,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;SAC5C;QAED,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,EAC1B;YACC,YAAA,GAAG,CAAC,eAAe,EAAC,sBAAsB,wCAAtB,sBAAsB,IAAM,GAAG,EAAC;SACpD;KACD;IAED,OAAO,GAAG,CAAA;AACX,CAAC;AAxBD,wCAwBC","sourcesContent":["import { IPackageJson } from '@ts-type/package-dts/package-json';\nimport { ISetupTsdxOptions } from './index';\nimport { deleteValue } from 'dot-values2';\nimport { ITSPickExtra } from 'ts-type/lib/type/record';\n\nexport function fixTsdxPackage<P extends IPackageJson>(pkg: P, config: ITSPickExtra<ISetupTsdxOptions<P>, 'rootData'>)\n{\n\tif (config.rootData.hasWorkspace && !config.rootData.isWorkspace)\n\t{\n\t\tdeleteValue(pkg, ['dependencies', 'tslib']);\n\t\tdeleteValue(pkg, ['devDependencies', 'tslib']);\n\t}\n\telse\n\t{\n\t\tpkg.devDependencies ??= {};\n\n\t\tif (pkg.dependencies?.['tslib']?.length > 0)\n\t\t{\n\t\t\tpkg.devDependencies['tslib'] ??= pkg.dependencies['tslib'];\n\t\t\tdeleteValue(pkg, ['dependencies', 'tslib']);\n\t\t}\n\n\t\tif (config.rootData.isRoot)\n\t\t{\n\t\t\tpkg.devDependencies['@bluelovers/tsconfig'] ??= '*';\n\t\t}\n\t}\n\n\treturn pkg\n}\n"]}
|
package/lib/preset/tsdx/index.js
CHANGED
|
@@ -19,7 +19,11 @@ function updatePackageJson(pkg, config) {
|
|
|
19
19
|
(_f = (_t = pkg.scripts)["build:tsdx"]) !== null && _f !== void 0 ? _f : (_t["build:tsdx"] = "ynpx @bluelovers/tsdx build --target node");
|
|
20
20
|
(_g = (_u = pkg.scripts)["build:dts:copy"]) !== null && _g !== void 0 ? _g : (_u["build:dts:copy"] = "copy .\\src\\index.d.ts .\\dist\\index.d.ts & echo build:dts");
|
|
21
21
|
(_h = (_v = pkg.scripts)["build:dts:tsc:emit"]) !== null && _h !== void 0 ? _h : (_v["build:dts:tsc:emit"] = "tsc --emitDeclarationOnly --declaration --noEmit false");
|
|
22
|
-
(_j = (_w = pkg.scripts)["build:dts:tsc"]) !== null && _j !== void 0 ? _j : (_w["build:dts:tsc"] =
|
|
22
|
+
(_j = (_w = pkg.scripts)["build:dts:tsc"]) !== null && _j !== void 0 ? _j : (_w["build:dts:tsc"] = [
|
|
23
|
+
'yarn run build:dts:copy',
|
|
24
|
+
'yarn run build:dts:tsc:emit',
|
|
25
|
+
'yarn run build:dts:copy',
|
|
26
|
+
].join(' && '));
|
|
23
27
|
pkg.main = "dist/index.cjs";
|
|
24
28
|
pkg.module = "dist/index.esm.mjs";
|
|
25
29
|
pkg.types = pkg.typings = "dist/index.d.ts";
|
|
@@ -35,7 +39,7 @@ function updatePackageJson(pkg, config) {
|
|
|
35
39
|
if (!pkg.keywords.includes("create-by-tsdx" /* EnumTsdx.keyword */)) {
|
|
36
40
|
pkg.keywords.push("create-by-tsdx" /* EnumTsdx.keyword */);
|
|
37
41
|
}
|
|
38
|
-
(0, fix_1.fixTsdxPackage)(pkg);
|
|
42
|
+
(0, fix_1.fixTsdxPackage)(pkg, config);
|
|
39
43
|
return pkg;
|
|
40
44
|
}
|
|
41
45
|
exports.updatePackageJson = updatePackageJson;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAGA,yEAA8G;AAG9G,+BAAuC;AAEvC,SAAgB,iBAAiB,CAAyB,GAAM,EAAE,MAA6B;;;IAE9F,MAAA,GAAG,CAAC,OAAO,oCAAX,GAAG,CAAC,OAAO,GAAK,EAAE,EAAC;IAEnB,IAAI,IAAA,uCAA6B,EAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EACtD;QACC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC;KAC7B;IAED,YAAA,GAAG,CAAC,OAAO,EAAC,MAAM,wCAAN,MAAM,+DAAiC;IAEnD,YAAA,GAAG,CAAC,OAAO,EAAC,UAAU,wCAAV,UAAU,IAAM,gBAAgB,EAAC;IAE7C,IAAI,CAAC,CAAA,MAAA,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAA,EACrD;QACC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,kDAAkD,CAAC;KAC1E;IAED,YAAA,GAAG,CAAC,OAAO,EAAC,kBAAkB,wCAAlB,kBAAkB,yKAAwC;IACtE,YAAA,GAAG,CAAC,OAAO,EAAC,YAAY,wCAAZ,YAAY,IAAM,2CAA2C,EAAC;IAE1E,YAAA,GAAG,CAAC,OAAO,EAAC,gBAAgB,wCAAhB,gBAAgB,IAAM,8DAA8D,EAAC;IACjG,YAAA,GAAG,CAAC,OAAO,EAAC,oBAAoB,wCAApB,oBAAoB,IAAM,wDAAwD,EAAC;IAC/F,YAAA,GAAG,CAAC,OAAO,EAAC,eAAe,wCAAf,eAAe,IAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import { IPackageJson } from '@ts-type/package-dts/package-json';\nimport { IFindRootReturnType } from '@yarn-tool/find-root';\nimport { _Key, IStaticFilesMapArray } from '@yarn-tool/static-file/lib/types';\nimport { EnumScriptsEntry, scriptsEntryIsNoTestSpecified } from '@yarn-tool/pkg-entry-util/lib/field/scripts';\nimport { deleteValue } from 'dot-values2';\nimport { EnumTsdx } from './const';\nimport { fixTsdxPackage } from './fix';\n\nexport function updatePackageJson<P extends IPackageJson>(pkg: P, config?: ISetupTsdxOptions<P>)\n{\n\tpkg.scripts ??= {};\n\n\tif (scriptsEntryIsNoTestSpecified(pkg.scripts[\"test\"]))\n\t{\n\t\tpkg.scripts[\"test\"] = void 0;\n\t}\n\n\tpkg.scripts[\"test\"] ??= EnumScriptsEntry.JEST_TEST;\n\n\tpkg.scripts[\"posttest\"] ??= \"yarn run build\";\n\n\tif (!pkg.scripts[\"build\"]?.includes('run build:tsdx'))\n\t{\n\t\tpkg.scripts[\"build\"] = \"yarn run build:tsdx && yarn run build:dts:bundle\";\n\t}\n\n\tpkg.scripts[\"build:dts:bundle\"] ??= EnumScriptsEntry.BUILD_DTS_BUNDLE;\n\tpkg.scripts[\"build:tsdx\"] ??= \"ynpx @bluelovers/tsdx build --target node\";\n\n\tpkg.scripts[\"build:dts:copy\"] ??= \"copy .\\\\src\\\\index.d.ts .\\\\dist\\\\index.d.ts & echo build:dts\";\n\tpkg.scripts[\"build:dts:tsc:emit\"] ??= \"tsc --emitDeclarationOnly --declaration --noEmit false\";\n\tpkg.scripts[\"build:dts:tsc\"] ??= [\n 'yarn run build:dts:copy',\n 'yarn run build:dts:tsc:emit',\n 'yarn run build:dts:copy',\n ].join(' && ');\n\n\tpkg.main = \"dist/index.cjs\";\n\tpkg.module = \"dist/index.esm.mjs\";\n\tpkg.types = pkg.typings = \"dist/index.d.ts\";\n\tpkg.unpkg ??= \"dist/index.umd.production.min.cjs\";\n\n\tpkg.exports ??= {};\n\tpkg.exports['.'] ??= {};\n\tpkg.exports['.'].types = \"./dist/index.d.ts\";\n\tpkg.exports['.'].import = \"./dist/index.esm.mjs\";\n\tpkg.exports['.'].require = \"./dist/index.cjs\";\n\n\tpkg.exports['./src/*'] = './src/*';\n\tpkg.exports['./package.json'] ??= './package.json';\n\n\tpkg.keywords ??= [];\n\tif (!pkg.keywords.includes(EnumTsdx.keyword))\n\t{\n\t\tpkg.keywords.push(EnumTsdx.keyword);\n\t}\n\n\tfixTsdxPackage(pkg, config);\n\n\treturn pkg\n}\n\nconst _defaultCopyStaticFilesTsdx = [\n\n\t['tsconfig.json', 'file/tsconfig.tsdx.json.tpl', 'tsconfig.json'],\n\t['test/tsconfig.json', 'file/test/tsconfig.json.tpl', 'test/tsconfig.json'],\n\n] as const;\n\nexport const defaultCopyStaticFilesTsdx = Object.freeze(_defaultCopyStaticFilesTsdx) as any as IStaticFilesMapArray<_Key<typeof _defaultCopyStaticFilesTsdx>>;\n\nexport interface ISetupTsdxOptions<P extends IPackageJson>\n{\n\ttargetDir: string,\n\tpkg: P,\n\trootData: IFindRootReturnType,\n\tfile_map: IStaticFilesMapArray<string>,\n\tmdFile: string,\n\texistsReadme: boolean,\n\toldExists: boolean,\n}\n\nexport function setup<P extends IPackageJson>(config: ISetupTsdxOptions<P>)\n{\n\tlet {\n\t\tpkg,\n\t\tfile_map,\n\t} = config;\n\n\tpkg = updatePackageJson(pkg, config);\n\n\tfile_map = [\n ...defaultCopyStaticFilesTsdx,\n\t\t...file_map,\n\t];\n\n\treturn {\n\t\t...config,\n\t\tpkg,\n\t\tfile_map,\n\t}\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yarn-tool/setup-module-env",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.13",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"yarn",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"tsc:showConfig": "ynpx get-current-tsconfig -p"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@yarn-tool/pkg-entry-util": "^2.0.
|
|
57
|
+
"@yarn-tool/pkg-entry-util": "^2.0.21",
|
|
58
58
|
"dot-values2": "^2.0.6",
|
|
59
59
|
"tslib": ">=2"
|
|
60
60
|
},
|
|
@@ -62,5 +62,5 @@
|
|
|
62
62
|
"publishConfig": {
|
|
63
63
|
"access": "public"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "70f3fb546a70fe2f65ce29d7ecb3a07e8b5e0483"
|
|
66
66
|
}
|