@nx/plugin 16.0.0-beta.5
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 +8 -0
- package/LICENSE +22 -0
- package/README.md +67 -0
- package/executors.json +16 -0
- package/generators.d.ts +6 -0
- package/generators.js +10 -0
- package/generators.js.map +1 -0
- package/generators.json +81 -0
- package/index.d.ts +0 -0
- package/index.js +1 -0
- package/index.js.map +1 -0
- package/migrations.json +46 -0
- package/package.json +45 -0
- package/src/executors/e2e/compat.d.ts +1 -0
- package/src/executors/e2e/compat.js +7 -0
- package/src/executors/e2e/compat.js.map +1 -0
- package/src/executors/e2e/e2e.impl.d.ts +7 -0
- package/src/executors/e2e/e2e.impl.js +81 -0
- package/src/executors/e2e/e2e.impl.js.map +1 -0
- package/src/executors/e2e/schema.d.ts +6 -0
- package/src/executors/e2e/schema.json +220 -0
- package/src/generators/create-package/create-package.d.ts +5 -0
- package/src/generators/create-package/create-package.js +115 -0
- package/src/generators/create-package/create-package.js.map +1 -0
- package/src/generators/create-package/files/create-framework-package/bin/index.ts__tmpl__ +26 -0
- package/src/generators/create-package/files/e2e/__name__.spec.ts__tmpl__ +30 -0
- package/src/generators/create-package/schema.d.ts +17 -0
- package/src/generators/create-package/schema.json +69 -0
- package/src/generators/create-package/utils/normalize-schema.d.ts +10 -0
- package/src/generators/create-package/utils/normalize-schema.js +22 -0
- package/src/generators/create-package/utils/normalize-schema.js.map +1 -0
- package/src/generators/e2e-project/e2e.d.ts +6 -0
- package/src/generators/e2e-project/e2e.js +107 -0
- package/src/generators/e2e-project/e2e.js.map +1 -0
- package/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__ +37 -0
- package/src/generators/e2e-project/files/tsconfig.json__tmpl__ +6 -0
- package/src/generators/e2e-project/schema.d.ts +12 -0
- package/src/generators/e2e-project/schema.json +57 -0
- package/src/generators/executor/executor.d.ts +6 -0
- package/src/generators/executor/executor.js +104 -0
- package/src/generators/executor/executor.js.map +1 -0
- package/src/generators/executor/files/executor/__fileName__/executor.spec.ts__tmpl__ +11 -0
- package/src/generators/executor/files/executor/__fileName__/executor.ts__tmpl__ +11 -0
- package/src/generators/executor/files/executor/__fileName__/schema.d.ts__tmpl__ +1 -0
- package/src/generators/executor/files/executor/__fileName__/schema.json__tmpl__ +9 -0
- package/src/generators/executor/files/hasher/__fileName__/hasher.spec.ts__tmpl__ +22 -0
- package/src/generators/executor/files/hasher/__fileName__/hasher.ts__tmpl__ +12 -0
- package/src/generators/executor/schema.d.ts +9 -0
- package/src/generators/executor/schema.json +64 -0
- package/src/generators/generator/files/generator/__fileName__/generator.spec.ts__tmpl__ +20 -0
- package/src/generators/generator/files/generator/__fileName__/generator.ts__tmpl__ +72 -0
- package/src/generators/generator/files/generator/__fileName__/schema.d.ts__tmpl__ +5 -0
- package/src/generators/generator/files/generator/__fileName__/schema.json__tmpl__ +27 -0
- package/src/generators/generator/generator.d.ts +6 -0
- package/src/generators/generator/generator.js +106 -0
- package/src/generators/generator/generator.js.map +1 -0
- package/src/generators/generator/schema.d.ts +8 -0
- package/src/generators/generator/schema.json +60 -0
- package/src/generators/lint-checks/generator.d.ts +7 -0
- package/src/generators/lint-checks/generator.js +187 -0
- package/src/generators/lint-checks/generator.js.map +1 -0
- package/src/generators/lint-checks/schema.d.ts +4 -0
- package/src/generators/lint-checks/schema.json +25 -0
- package/src/generators/migration/files/migration/__name__/__name__.spec.ts__tmpl__ +17 -0
- package/src/generators/migration/files/migration/__name__/__name__.ts__tmpl__ +6 -0
- package/src/generators/migration/migration.d.ts +5 -0
- package/src/generators/migration/migration.js +111 -0
- package/src/generators/migration/migration.js.map +1 -0
- package/src/generators/migration/schema.d.ts +8 -0
- package/src/generators/migration/schema.json +59 -0
- package/src/generators/plugin/files/plugin/src/index.ts__tmpl__ +0 -0
- package/src/generators/plugin/plugin.d.ts +5 -0
- package/src/generators/plugin/plugin.js +95 -0
- package/src/generators/plugin/plugin.js.map +1 -0
- package/src/generators/plugin/schema.d.ts +17 -0
- package/src/generators/plugin/schema.json +93 -0
- package/src/generators/plugin/utils/normalize-schema.d.ts +14 -0
- package/src/generators/plugin/utils/normalize-schema.js +31 -0
- package/src/generators/plugin/utils/normalize-schema.js.map +1 -0
- package/src/generators/preset/generator.d.ts +3 -0
- package/src/generators/preset/generator.js +53 -0
- package/src/generators/preset/generator.js.map +1 -0
- package/src/generators/preset/schema.d.ts +4 -0
- package/src/generators/preset/schema.json +20 -0
- package/src/migrations/update-14-1-9/add-swc-deps-if-needed.d.ts +2 -0
- package/src/migrations/update-14-1-9/add-swc-deps-if-needed.js +14 -0
- package/src/migrations/update-14-1-9/add-swc-deps-if-needed.js.map +1 -0
- package/src/migrations/update-15-0-0/specify-output-capture.d.ts +2 -0
- package/src/migrations/update-15-0-0/specify-output-capture.js +57 -0
- package/src/migrations/update-15-0-0/specify-output-capture.js.map +1 -0
- package/src/migrations/update-15-9-0/jest-29-configs.d.ts +3 -0
- package/src/migrations/update-15-9-0/jest-29-configs.js +154 -0
- package/src/migrations/update-15-9-0/jest-29-configs.js.map +1 -0
- package/src/migrations/update-15-9-0/jest-29-tests.d.ts +5 -0
- package/src/migrations/update-15-9-0/jest-29-tests.js +65 -0
- package/src/migrations/update-15-9-0/jest-29-tests.js.map +1 -0
- package/src/migrations/update-16-0-0/cli-in-schema-json.d.ts +3 -0
- package/src/migrations/update-16-0-0/cli-in-schema-json.js +84 -0
- package/src/migrations/update-16-0-0/cli-in-schema-json.js.map +1 -0
- package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts +2 -0
- package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js +13 -0
- package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js.map +1 -0
- package/src/utils/has-generator.d.ts +2 -0
- package/src/utils/has-generator.js +17 -0
- package/src/utils/has-generator.js.map +1 -0
- package/src/utils/testing-utils/async-commands.d.ts +28 -0
- package/src/utils/testing-utils/async-commands.js +51 -0
- package/src/utils/testing-utils/async-commands.js.map +1 -0
- package/src/utils/testing-utils/commands.d.ts +17 -0
- package/src/utils/testing-utils/commands.js +64 -0
- package/src/utils/testing-utils/commands.js.map +1 -0
- package/src/utils/testing-utils/create-package-cli.d.ts +18 -0
- package/src/utils/testing-utils/create-package-cli.js +53 -0
- package/src/utils/testing-utils/create-package-cli.js.map +1 -0
- package/src/utils/testing-utils/index.d.ts +6 -0
- package/src/utils/testing-utils/index.js +10 -0
- package/src/utils/testing-utils/index.js.map +1 -0
- package/src/utils/testing-utils/nx-project.d.ts +25 -0
- package/src/utils/testing-utils/nx-project.js +64 -0
- package/src/utils/testing-utils/nx-project.js.map +1 -0
- package/src/utils/testing-utils/paths.d.ts +15 -0
- package/src/utils/testing-utils/paths.js +33 -0
- package/src/utils/testing-utils/paths.js.map +1 -0
- package/src/utils/testing-utils/utils.d.ts +80 -0
- package/src/utils/testing-utils/utils.js +145 -0
- package/src/utils/testing-utils/utils.js.map +1 -0
- package/src/utils/versions.d.ts +1 -0
- package/src/utils/versions.js +5 -0
- package/src/utils/versions.js.map +1 -0
- package/testing.d.ts +1 -0
- package/testing.js +5 -0
- package/testing.js.map +1 -0
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Linter } from '@nx/linter';
|
|
2
|
+
|
|
3
|
+
export interface Schema {
|
|
4
|
+
name: string;
|
|
5
|
+
directory?: string;
|
|
6
|
+
importPath?: string;
|
|
7
|
+
skipTsConfig?: boolean; // default is false
|
|
8
|
+
skipFormat?: boolean; // default is false
|
|
9
|
+
skipLintChecks?: boolean; // default is false
|
|
10
|
+
e2eTestRunner?: 'jest' | 'none';
|
|
11
|
+
tags?: string;
|
|
12
|
+
unitTestRunner: 'jest' | 'none';
|
|
13
|
+
linter: Linter;
|
|
14
|
+
setParserOptionsProject?: boolean;
|
|
15
|
+
compiler: 'swc' | 'tsc';
|
|
16
|
+
rootProject?: boolean;
|
|
17
|
+
}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/schema",
|
|
3
|
+
"cli": "nx",
|
|
4
|
+
"$id": "NxPluginPlugin",
|
|
5
|
+
"title": "Create a Plugin for Nx",
|
|
6
|
+
"description": "Create a Plugin for Nx.",
|
|
7
|
+
"type": "object",
|
|
8
|
+
"examples": [
|
|
9
|
+
{
|
|
10
|
+
"command": "nx g plugin my-plugin --directory=plugins --importPath=@myorg/my-plugin",
|
|
11
|
+
"description": "Generate `libs/plugins/my-plugin`"
|
|
12
|
+
}
|
|
13
|
+
],
|
|
14
|
+
"properties": {
|
|
15
|
+
"name": {
|
|
16
|
+
"type": "string",
|
|
17
|
+
"description": "Plugin name",
|
|
18
|
+
"$default": {
|
|
19
|
+
"$source": "argv",
|
|
20
|
+
"index": 0
|
|
21
|
+
},
|
|
22
|
+
"x-prompt": "What name would you like to use for the plugin?",
|
|
23
|
+
"x-priority": "important"
|
|
24
|
+
},
|
|
25
|
+
"directory": {
|
|
26
|
+
"type": "string",
|
|
27
|
+
"description": "A directory where the plugin is placed."
|
|
28
|
+
},
|
|
29
|
+
"importPath": {
|
|
30
|
+
"type": "string",
|
|
31
|
+
"description": "How the plugin will be published, like `@myorg/my-awesome-plugin`. Note this must be a valid NPM name.",
|
|
32
|
+
"x-priority": "important"
|
|
33
|
+
},
|
|
34
|
+
"linter": {
|
|
35
|
+
"description": "The tool to use for running lint checks.",
|
|
36
|
+
"type": "string",
|
|
37
|
+
"enum": ["eslint"],
|
|
38
|
+
"default": "eslint"
|
|
39
|
+
},
|
|
40
|
+
"unitTestRunner": {
|
|
41
|
+
"type": "string",
|
|
42
|
+
"enum": ["jest", "none"],
|
|
43
|
+
"description": "Test runner to use for unit tests.",
|
|
44
|
+
"default": "jest"
|
|
45
|
+
},
|
|
46
|
+
"tags": {
|
|
47
|
+
"type": "string",
|
|
48
|
+
"description": "Add tags to the library (used for linting).",
|
|
49
|
+
"alias": "t"
|
|
50
|
+
},
|
|
51
|
+
"skipFormat": {
|
|
52
|
+
"description": "Skip formatting files.",
|
|
53
|
+
"type": "boolean",
|
|
54
|
+
"default": false,
|
|
55
|
+
"x-priority": "internal"
|
|
56
|
+
},
|
|
57
|
+
"skipTsConfig": {
|
|
58
|
+
"type": "boolean",
|
|
59
|
+
"default": false,
|
|
60
|
+
"description": "Do not update tsconfig.json for development experience.",
|
|
61
|
+
"x-priority": "internal"
|
|
62
|
+
},
|
|
63
|
+
"skipLintChecks": {
|
|
64
|
+
"type": "boolean",
|
|
65
|
+
"default": false,
|
|
66
|
+
"description": "Do not eslint configuration for plugin json files."
|
|
67
|
+
},
|
|
68
|
+
"e2eTestRunner": {
|
|
69
|
+
"type": "string",
|
|
70
|
+
"enum": ["jest", "none"],
|
|
71
|
+
"description": "Test runner to use for end to end (E2E) tests.",
|
|
72
|
+
"default": "none"
|
|
73
|
+
},
|
|
74
|
+
"standaloneConfig": {
|
|
75
|
+
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
76
|
+
"type": "boolean",
|
|
77
|
+
"default": true,
|
|
78
|
+
"x-deprecated": "Nx only supports standaloneConfig"
|
|
79
|
+
},
|
|
80
|
+
"setParserOptionsProject": {
|
|
81
|
+
"type": "boolean",
|
|
82
|
+
"description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
|
|
83
|
+
"default": false
|
|
84
|
+
},
|
|
85
|
+
"compiler": {
|
|
86
|
+
"type": "string",
|
|
87
|
+
"enum": ["tsc", "swc"],
|
|
88
|
+
"default": "tsc",
|
|
89
|
+
"description": "The compiler used by the build and test targets."
|
|
90
|
+
}
|
|
91
|
+
},
|
|
92
|
+
"required": ["name"]
|
|
93
|
+
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Tree } from '@nx/devkit';
|
|
2
|
+
import { Schema } from '../schema';
|
|
3
|
+
export interface NormalizedSchema extends Schema {
|
|
4
|
+
name: string;
|
|
5
|
+
fileName: string;
|
|
6
|
+
libsDir: string;
|
|
7
|
+
projectRoot: string;
|
|
8
|
+
projectDirectory: string;
|
|
9
|
+
parsedTags: string[];
|
|
10
|
+
npmScope: string;
|
|
11
|
+
npmPackageName: string;
|
|
12
|
+
bundler: 'swc' | 'tsc';
|
|
13
|
+
}
|
|
14
|
+
export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizeOptions = void 0;
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
function normalizeOptions(host, options) {
|
|
6
|
+
var _a;
|
|
7
|
+
const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
|
|
8
|
+
const { npmScope, libsDir: defaultLibsDir } = (0, devkit_1.getWorkspaceLayout)(host);
|
|
9
|
+
const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDir;
|
|
10
|
+
const name = (0, devkit_1.names)(options.name).fileName;
|
|
11
|
+
const fullProjectDirectory = projectDirectory
|
|
12
|
+
? `${(0, devkit_1.names)(projectDirectory).fileName}/${name}`
|
|
13
|
+
: options.rootProject
|
|
14
|
+
? '.'
|
|
15
|
+
: name;
|
|
16
|
+
const projectName = options.rootProject
|
|
17
|
+
? name
|
|
18
|
+
: fullProjectDirectory.replace(new RegExp('/', 'g'), '-');
|
|
19
|
+
const fileName = projectName;
|
|
20
|
+
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
|
|
21
|
+
const parsedTags = options.tags
|
|
22
|
+
? options.tags.split(',').map((s) => s.trim())
|
|
23
|
+
: [];
|
|
24
|
+
const npmPackageName = options.importPath || (0, devkit_1.getImportPath)(npmScope, name);
|
|
25
|
+
return Object.assign(Object.assign({}, options), { bundler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'tsc', fileName,
|
|
26
|
+
npmScope,
|
|
27
|
+
libsDir, name: projectName, projectRoot, projectDirectory: fullProjectDirectory, parsedTags,
|
|
28
|
+
npmPackageName });
|
|
29
|
+
}
|
|
30
|
+
exports.normalizeOptions = normalizeOptions;
|
|
31
|
+
//# sourceMappingURL=normalize-schema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AAcpB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAClE,OAAO,CAAC,SAAS,CAClB,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,cAAc,CAAC;IAClD,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,oBAAoB,GAAG,gBAAgB;QAC3C,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAC/C,CAAC,CAAC,OAAO,CAAC,WAAW;YACrB,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW;QACrC,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,WAAW,CAAC;IAC7B,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;IAErE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,IAAI,IAAA,sBAAa,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAE3E,uCACK,OAAO,KACV,OAAO,EAAE,MAAA,OAAO,CAAC,QAAQ,mCAAI,KAAK,EAClC,QAAQ;QACR,QAAQ;QACR,OAAO,EACP,IAAI,EAAE,WAAW,EACjB,WAAW,EACX,gBAAgB,EAAE,oBAAoB,EACtC,UAAU;QACV,cAAc,IACd;AACJ,CAAC;AAxCD,4CAwCC"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const linter_1 = require("@nx/linter");
|
|
6
|
+
const plugin_1 = require("../plugin/plugin");
|
|
7
|
+
const create_package_1 = require("../create-package/create-package");
|
|
8
|
+
function default_1(tree, options) {
|
|
9
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
+
const tasks = [];
|
|
11
|
+
const pluginTask = yield (0, plugin_1.pluginGenerator)(tree, {
|
|
12
|
+
compiler: 'tsc',
|
|
13
|
+
linter: linter_1.Linter.EsLint,
|
|
14
|
+
name: options.pluginName.includes('/')
|
|
15
|
+
? options.pluginName.split('/')[1]
|
|
16
|
+
: options.pluginName,
|
|
17
|
+
skipFormat: true,
|
|
18
|
+
unitTestRunner: 'jest',
|
|
19
|
+
importPath: options.pluginName,
|
|
20
|
+
rootProject: true,
|
|
21
|
+
e2eTestRunner: 'jest',
|
|
22
|
+
});
|
|
23
|
+
tasks.push(pluginTask);
|
|
24
|
+
removeNpmScope(tree);
|
|
25
|
+
moveNxPluginToDevDeps(tree);
|
|
26
|
+
if (options.createPackageName) {
|
|
27
|
+
const cliTask = yield (0, create_package_1.default)(tree, {
|
|
28
|
+
name: options.createPackageName,
|
|
29
|
+
project: options.pluginName,
|
|
30
|
+
skipFormat: true,
|
|
31
|
+
unitTestRunner: 'jest',
|
|
32
|
+
linter: linter_1.Linter.EsLint,
|
|
33
|
+
compiler: 'tsc',
|
|
34
|
+
});
|
|
35
|
+
tasks.push(cliTask);
|
|
36
|
+
}
|
|
37
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
38
|
+
return (0, devkit_1.runTasksInSerial)(...tasks);
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
exports.default = default_1;
|
|
42
|
+
function removeNpmScope(tree) {
|
|
43
|
+
(0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, (0, devkit_1.readNxJson)(tree)), { npmScope: undefined }));
|
|
44
|
+
}
|
|
45
|
+
function moveNxPluginToDevDeps(tree) {
|
|
46
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
|
47
|
+
const nxPluginEntry = json.dependencies['@nx/plugin'];
|
|
48
|
+
delete json.dependencies['@nx/plugin'];
|
|
49
|
+
json.devDependencies['@nx/plugin'] = nxPluginEntry;
|
|
50
|
+
return json;
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=generator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;AAAA,uCAQoB;AACpB,uCAAoC;AAEpC,6CAAmD;AAEnD,qEAAsE;AAEtE,mBAA+B,IAAU,EAAE,OAA8B;;QACvE,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,MAAM,IAAA,wBAAe,EAAC,IAAI,EAAE;YAC7C,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;gBACpC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBAClC,CAAC,CAAC,OAAO,CAAC,UAAU;YACtB,UAAU,EAAE,IAAI;YAChB,cAAc,EAAE,MAAM;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,IAAI;YACjB,aAAa,EAAE,MAAM;SACtB,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEvB,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAE5B,IAAI,OAAO,CAAC,iBAAiB,EAAE;YAC7B,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAsB,EAAC,IAAI,EAAE;gBACjD,IAAI,EAAE,OAAO,CAAC,iBAAiB;gBAC/B,OAAO,EAAE,OAAO,CAAC,UAAU;gBAC3B,UAAU,EAAE,IAAI;gBAChB,cAAc,EAAE,MAAM;gBACtB,MAAM,EAAE,eAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACrB;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAlCD,4BAkCC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,IAAA,qBAAY,EAAC,IAAI,kCAAO,IAAA,mBAAU,EAAC,IAAI,CAAC,KAAE,QAAQ,EAAE,SAAS,IAAG,CAAC;AACnE,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAU;IACvC,IAAA,mBAAU,EAAc,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;QACrD,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACtD,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACvC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,aAAa,CAAC;QACnD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/schema",
|
|
3
|
+
"cli": "nx",
|
|
4
|
+
"$id": "NxPluginPreset",
|
|
5
|
+
"title": "Generator ran by create-nx-plugin",
|
|
6
|
+
"description": "Initializes a workspace with an nx-plugin inside of it. Use as: `create-nx-plugin` or `create-nx-workspace --preset @nrwl/nx-plugin`.",
|
|
7
|
+
"type": "object",
|
|
8
|
+
"properties": {
|
|
9
|
+
"pluginName": {
|
|
10
|
+
"type": "string",
|
|
11
|
+
"description": "Plugin name",
|
|
12
|
+
"aliases": ["name"]
|
|
13
|
+
},
|
|
14
|
+
"createPackageName": {
|
|
15
|
+
"type": "string",
|
|
16
|
+
"description": "Name of package which creates a workspace"
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
"required": ["pluginName"]
|
|
20
|
+
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
|
|
6
|
+
function addSwcNodeIfNeeded(tree) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
(0, add_swc_dependencies_1.addSwcRegisterDependencies)(tree);
|
|
9
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
10
|
+
return (0, devkit_1.installPackagesTask)(tree);
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
exports.default = addSwcNodeIfNeeded;
|
|
14
|
+
//# sourceMappingURL=add-swc-deps-if-needed.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-swc-deps-if-needed.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/migrations/update-14-1-9/add-swc-deps-if-needed.ts"],"names":[],"mappings":";;;AAAA,uCAAoE;AACpE,oFAAuF;AAEvF,SAA8B,kBAAkB,CAAC,IAAU;;QACzD,IAAA,iDAA0B,EAAC,IAAI,CAAC,CAAC;QACjC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACxB,OAAO,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IACnC,CAAC;CAAA;AAJD,qCAIC"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
function update(tree) {
|
|
6
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
+
for (const [project, { root }] of (0, devkit_1.getProjects)(tree)) {
|
|
8
|
+
const packageJsonPath = (0, devkit_1.joinPathFragments)(root, 'package.json');
|
|
9
|
+
if (!tree.exists(packageJsonPath)) {
|
|
10
|
+
continue;
|
|
11
|
+
}
|
|
12
|
+
const packageJson = (0, devkit_1.readJson)(tree, packageJsonPath);
|
|
13
|
+
if (!packageJson.executors && !packageJson.builders) {
|
|
14
|
+
continue;
|
|
15
|
+
}
|
|
16
|
+
const paths = [packageJson.executors, packageJson.builders].filter(Boolean);
|
|
17
|
+
for (const collectionPathSegment of paths) {
|
|
18
|
+
const collectionPath = (0, devkit_1.joinPathFragments)(root, collectionPathSegment);
|
|
19
|
+
if (!tree.exists(collectionPath)) {
|
|
20
|
+
continue;
|
|
21
|
+
}
|
|
22
|
+
const collectionFile = (0, devkit_1.readJson)(tree, collectionPath);
|
|
23
|
+
const collections = [
|
|
24
|
+
collectionFile.builders,
|
|
25
|
+
collectionFile.executors,
|
|
26
|
+
].filter(Boolean);
|
|
27
|
+
for (const collection of collections) {
|
|
28
|
+
if (!collection) {
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
for (const entry of Object.values(collection)) {
|
|
32
|
+
const schemaPath = (0, devkit_1.joinPathFragments)(root, entry.schema);
|
|
33
|
+
if (tree.exists(schemaPath)) {
|
|
34
|
+
(0, devkit_1.updateJson)(tree, schemaPath, (json) => {
|
|
35
|
+
if (json.version) {
|
|
36
|
+
return json;
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
const newProperties = {
|
|
40
|
+
version: 2,
|
|
41
|
+
};
|
|
42
|
+
if (!json.outputCapture) {
|
|
43
|
+
newProperties.outputCapture = 'direct-nodejs';
|
|
44
|
+
}
|
|
45
|
+
return Object.assign(Object.assign({}, newProperties), json);
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
exports.default = update;
|
|
57
|
+
//# sourceMappingURL=specify-output-capture.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"specify-output-capture.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/migrations/update-15-0-0/specify-output-capture.ts"],"names":[],"mappings":";;;AAAA,uCAQoB;AAIpB,SAA8B,MAAM,CAAC,IAAU;;QAC7C,KAAK,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,EAAE;YACnD,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YAChE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;gBACjC,SAAS;aACV;YACD,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAc,IAAI,EAAE,eAAe,CAAC,CAAC;YACjE,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;gBACnD,SAAS;aACV;YACD,MAAM,KAAK,GAAG,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC5E,KAAK,MAAM,qBAAqB,IAAI,KAAK,EAAE;gBACzC,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;gBACtE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;oBAChC,SAAS;iBACV;gBACD,MAAM,cAAc,GAAkB,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;gBAErE,MAAM,WAAW,GAAG;oBAClB,cAAc,CAAC,QAAQ;oBACvB,cAAc,CAAC,SAAS;iBACzB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAClB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;oBACpC,IAAI,CAAC,UAAU,EAAE;wBACf,SAAS;qBACV;oBACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;wBAC7C,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;wBACzD,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;4BAC3B,IAAA,mBAAU,EAAC,IAAI,EAAE,UAAU,EAAE,CAAC,IAA8B,EAAE,EAAE;gCAC9D,IAAI,IAAI,CAAC,OAAO,EAAE;oCAChB,OAAO,IAAI,CAAC;iCACb;qCAAM;oCACL,MAAM,aAAa,GAAsC;wCACvD,OAAO,EAAE,CAAC;qCACX,CAAC;oCACF,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;wCACvB,aAAa,CAAC,aAAa,GAAG,eAAe,CAAC;qCAC/C;oCACD,uCAAY,aAAa,GAAK,IAAI,EAAG;iCACtC;4BACH,CAAC,CAAC,CAAC;yBACJ;qBACF;iBACF;aACF;SACF;QACD,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAhDD,yBAgDC"}
|
|
@@ -0,0 +1,154 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateConfigsJest29 = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
7
|
+
const ts = require("typescript");
|
|
8
|
+
const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
|
|
9
|
+
const ast_utils_1 = require("@nx/jest/src/utils/ast-utils");
|
|
10
|
+
const find_root_jest_files_1 = require("@nx/jest/src/utils/config/find-root-jest-files");
|
|
11
|
+
// NOTE: this is a copy of the @nrwl/jest v15.8.0 migrations
|
|
12
|
+
function updateConfigsJest29(tree) {
|
|
13
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
+
const rootPreset = (0, find_root_jest_files_1.findRootJestPreset)(tree);
|
|
15
|
+
const targetsWithJest = new Set();
|
|
16
|
+
// have to use graph so the negative configuration targets are expanded
|
|
17
|
+
const graph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
18
|
+
(0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/nx-plugin:e2e', (options, projectName, targetName) => {
|
|
19
|
+
if (options.jestConfig && tree.exists(options.jestConfig)) {
|
|
20
|
+
targetsWithJest.add(targetName);
|
|
21
|
+
// if the default root preset exists or if the project doesn't have a 'preset' configured
|
|
22
|
+
// -> update snapshot config
|
|
23
|
+
if (!rootPreset || !hasPresetConfigured(tree, options.jestConfig)) {
|
|
24
|
+
addSnapshotOptionsToConfig(tree, options.jestConfig, `From within the project directory, run "nx test --update-snapshot"`);
|
|
25
|
+
}
|
|
26
|
+
updateTsJestOptions(tree, options.jestConfig);
|
|
27
|
+
updateNgJestOptions(tree, options.jestConfig);
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
if (rootPreset && tree.exists(rootPreset)) {
|
|
31
|
+
const cmd = `"nx affected --targets=${Array.from(targetsWithJest).join(',')} --update-snapshot"`;
|
|
32
|
+
addSnapshotOptionsToConfig(tree, rootPreset, cmd);
|
|
33
|
+
updateTsJestOptions(tree, rootPreset);
|
|
34
|
+
updateNgJestOptions(tree, rootPreset);
|
|
35
|
+
}
|
|
36
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
37
|
+
devkit_1.logger.info((0, devkit_1.stripIndents) `NX Jest Snapshot format changed in v29.
|
|
38
|
+
By default Nx kept the older style to prevent breaking of existing tests with snapshots.
|
|
39
|
+
It's recommend you update to the latest format.
|
|
40
|
+
You can do this in your project's jest config file.
|
|
41
|
+
Remove the snapshotFormat property and re-run tests with the --update-snapshot flag.
|
|
42
|
+
More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format`);
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
exports.updateConfigsJest29 = updateConfigsJest29;
|
|
46
|
+
function addSnapshotOptionsToConfig(tree, configPath, updateSnapshotExample) {
|
|
47
|
+
const config = tree.read(configPath, 'utf-8');
|
|
48
|
+
const hasSnapshotOptions = tsquery_1.tsquery.query(config, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="snapshotFormat"])`);
|
|
49
|
+
if (hasSnapshotOptions.length > 0) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
const updatedConfig = tsquery_1.tsquery.replace(config, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression`, (node) => {
|
|
53
|
+
return `{
|
|
54
|
+
${node.properties.map((p) => getNodeWithComments(config, p)).join(',\n')},
|
|
55
|
+
/* TODO: Update to latest Jest snapshotFormat
|
|
56
|
+
* By default Nx has kept the older style of Jest Snapshot formats
|
|
57
|
+
* to prevent breaking of any existing tests with snapshots.
|
|
58
|
+
* It's recommend you update to the latest format.
|
|
59
|
+
* You can do this by removing snapshotFormat property
|
|
60
|
+
* and running tests with --update-snapshot flag.
|
|
61
|
+
* Example: ${updateSnapshotExample}
|
|
62
|
+
* More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
|
|
63
|
+
*/
|
|
64
|
+
snapshotFormat: { escapeString: true, printBasicPrototype: true }
|
|
65
|
+
}`;
|
|
66
|
+
}, { visitAllChildren: false });
|
|
67
|
+
tree.write(configPath, updatedConfig);
|
|
68
|
+
}
|
|
69
|
+
function hasPresetConfigured(tree, configPath) {
|
|
70
|
+
var _a;
|
|
71
|
+
const contents = tree.read(configPath, 'utf-8');
|
|
72
|
+
return (((_a = tsquery_1.tsquery.query(contents, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="preset"])`)) === null || _a === void 0 ? void 0 : _a.length) > 0);
|
|
73
|
+
}
|
|
74
|
+
function updateTsJestOptions(tree, configPath) {
|
|
75
|
+
// query for the globals property, if they don't have one then there's nothing to modify.
|
|
76
|
+
const contents = tree.read(configPath, 'utf-8');
|
|
77
|
+
let tsJestGlobalsConfig;
|
|
78
|
+
const noTsJestGlobals = tsquery_1.tsquery.replace(contents, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="globals"])`, (node) => {
|
|
79
|
+
if (tsJestGlobalsConfig) {
|
|
80
|
+
devkit_1.logger.warn((0, devkit_1.stripIndents) `Found more than one "globals" object in the jest config, ${configPath}
|
|
81
|
+
Will use the first one`);
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
tsJestGlobalsConfig = getGlobalTsJestConfig(node);
|
|
85
|
+
return getGlobalConfigWithoutTsJest(node);
|
|
86
|
+
});
|
|
87
|
+
if (!tsJestGlobalsConfig) {
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
const updatedTsJestTransformer = tsquery_1.tsquery.replace(noTsJestGlobals, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX}> ObjectLiteralExpression PropertyAssignment:has(Identifier[name="transform"]) PropertyAssignment > :has(StringLiteral[value="ts-jest"], StringLiteral[value="jest-preset-angular"])`, (node) => {
|
|
91
|
+
return `[${node.getText()}, ${tsJestGlobalsConfig}]`;
|
|
92
|
+
});
|
|
93
|
+
tree.write(configPath, updatedTsJestTransformer);
|
|
94
|
+
}
|
|
95
|
+
function updateNgJestOptions(tree, configPath) {
|
|
96
|
+
const contents = tree.read(configPath, 'utf-8');
|
|
97
|
+
let ngJestTeardownConfig;
|
|
98
|
+
const noTeardownConfig = tsquery_1.tsquery.replace(contents, 'BinaryExpression:has(PropertyAccessExpression:has(Identifier[name=ngJest])) PropertyAssignment:has(Identifier[name=teardown])', (node) => {
|
|
99
|
+
ngJestTeardownConfig = node.initializer.getText();
|
|
100
|
+
return ' ';
|
|
101
|
+
});
|
|
102
|
+
if (!ngJestTeardownConfig) {
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
let maybeUpdatedTestEnvOpts = tsquery_1.tsquery.replace(noTeardownConfig, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression PropertyAssignment:has(Identifier[name="testEnvironmentOptions"]) ObjectLiteralExpression`, (node) => {
|
|
106
|
+
return `{
|
|
107
|
+
${node.properties
|
|
108
|
+
.map((p) => getNodeWithComments(noTeardownConfig, p))
|
|
109
|
+
.join(',\n')},
|
|
110
|
+
teardown: ${ngJestTeardownConfig}
|
|
111
|
+
}`;
|
|
112
|
+
});
|
|
113
|
+
if (maybeUpdatedTestEnvOpts !== noTeardownConfig) {
|
|
114
|
+
tree.write(configPath, maybeUpdatedTestEnvOpts);
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
// didn't find existing testEnvironmentOptions, so add the new property
|
|
118
|
+
const updatedConfig = tsquery_1.tsquery.replace(maybeUpdatedTestEnvOpts, `${ast_utils_1.TS_QUERY_JEST_CONFIG_PREFIX} > ObjectLiteralExpression`, (node) => {
|
|
119
|
+
return `{
|
|
120
|
+
${node.properties
|
|
121
|
+
.map((p) => getNodeWithComments(maybeUpdatedTestEnvOpts, p))
|
|
122
|
+
.join(',\n')},
|
|
123
|
+
testEnvironmentOptions: { teardown: ${ngJestTeardownConfig} },
|
|
124
|
+
}`;
|
|
125
|
+
}, { visitAllChildren: false });
|
|
126
|
+
tree.write(configPath, updatedConfig);
|
|
127
|
+
}
|
|
128
|
+
function getGlobalTsJestConfig(node) {
|
|
129
|
+
var _a;
|
|
130
|
+
const globalObject = node.initializer;
|
|
131
|
+
const foundConfig = globalObject.properties.find((p) => ts.isPropertyAssignment(p) && p.name.getText().includes('ts-jest'));
|
|
132
|
+
return ((_a = foundConfig === null || foundConfig === void 0 ? void 0 : foundConfig.initializer) === null || _a === void 0 ? void 0 : _a.getText()) || '';
|
|
133
|
+
}
|
|
134
|
+
function getGlobalConfigWithoutTsJest(node) {
|
|
135
|
+
var _a;
|
|
136
|
+
const globalObject = node === null || node === void 0 ? void 0 : node.initializer;
|
|
137
|
+
const withoutTsJest = (_a = globalObject === null || globalObject === void 0 ? void 0 : globalObject.properties) === null || _a === void 0 ? void 0 : _a.filter((p) => {
|
|
138
|
+
return !(ts.isPropertyAssignment(p) && p.name.getText().includes('ts-jest'));
|
|
139
|
+
});
|
|
140
|
+
const globalConfigs = withoutTsJest.map((c) => c.getText()).join(',\n');
|
|
141
|
+
return `globals: { ${globalConfigs} }`;
|
|
142
|
+
}
|
|
143
|
+
function getNodeWithComments(fullText, node) {
|
|
144
|
+
const commentRanges = ts.getLeadingCommentRanges(fullText, node.getFullStart());
|
|
145
|
+
if ((commentRanges === null || commentRanges === void 0 ? void 0 : commentRanges.length) > 0) {
|
|
146
|
+
const withComments = `${commentRanges
|
|
147
|
+
.map((r) => fullText.slice(r.pos, r.end))
|
|
148
|
+
.join('\n')}\n${node.getText()}`;
|
|
149
|
+
return withComments;
|
|
150
|
+
}
|
|
151
|
+
return node.getText();
|
|
152
|
+
}
|
|
153
|
+
exports.default = updateConfigsJest29;
|
|
154
|
+
//# sourceMappingURL=jest-29-configs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jest-29-configs.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/migrations/update-15-9-0/jest-29-configs.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Tree } from '@nx/devkit';
|
|
2
|
+
export declare function updateTestsJest29(tree: Tree): Promise<void>;
|
|
3
|
+
export declare function updateJestMockTypes(tree: Tree, filePath: string): void;
|
|
4
|
+
export declare function updateJestMocked(tree: Tree, filePath: string): void;
|
|
5
|
+
export default updateTestsJest29;
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateJestMocked = exports.updateJestMockTypes = exports.updateTestsJest29 = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const ast_utils_1 = require("@nx/jest/src/utils/ast-utils");
|
|
7
|
+
const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
|
|
8
|
+
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
9
|
+
// NOTE: this is a copy of the @nrwl/jest v15.8.0 migrations
|
|
10
|
+
function updateTestsJest29(tree) {
|
|
11
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
+
const graph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
13
|
+
(0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nrwl/nx-plugin:e2e', (options, projectName) => {
|
|
14
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
15
|
+
(0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot || projectConfig.root, (file) => {
|
|
16
|
+
if (!ast_utils_1.TEST_FILE_PATTERN.test(file)) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
updateJestMockTypes(tree, file);
|
|
20
|
+
updateJestMocked(tree, file);
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
exports.updateTestsJest29 = updateTestsJest29;
|
|
27
|
+
function updateJestMockTypes(tree, filePath) {
|
|
28
|
+
const contents = tree.read(filePath, 'utf-8');
|
|
29
|
+
const updatedContent = tsquery_1.tsquery.replace(contents, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="MaybeMockedDeep"], Identifier[name="MaybeMocked"]):has(StringLiteral[value="jest-mock"])', (node) => {
|
|
30
|
+
const text = node.getText();
|
|
31
|
+
return (text
|
|
32
|
+
// MaybeMockedDeep and MaybeMocked now are exported as Mocked and MockedShallow
|
|
33
|
+
.replace('MaybeMockedDeep', 'Mocked')
|
|
34
|
+
.replace('MaybeMocked', 'MockedShallow'));
|
|
35
|
+
});
|
|
36
|
+
tree.write(filePath, updatedContent);
|
|
37
|
+
}
|
|
38
|
+
exports.updateJestMockTypes = updateJestMockTypes;
|
|
39
|
+
function updateJestMocked(tree, filePath) {
|
|
40
|
+
const contents = tree.read(filePath, 'utf-8');
|
|
41
|
+
const jestGlobalNodes = tsquery_1.tsquery.query(contents, ':matches(ImportDeclaration, VariableStatement):has(Identifier[name="jest"]):has(StringLiteral[value="@jest/globals"])');
|
|
42
|
+
// this only applies if using jest from @jest/globals
|
|
43
|
+
if (jestGlobalNodes.length === 0) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
const updatedJestMockTypes = tsquery_1.tsquery.replace(contents, 'CallExpression:has(Identifier[name="jest"]):has(Identifier[name="mocked"])', (node) => {
|
|
47
|
+
if (node.arguments.length === 2 &&
|
|
48
|
+
node.getText().startsWith('jest.mocked(')) {
|
|
49
|
+
const text = node.getText();
|
|
50
|
+
// jest.mocked(someObject, true); => jest.mocked(someObject);
|
|
51
|
+
if (node.arguments[1].getText() === 'true') {
|
|
52
|
+
return text.replace(/,\s*true/g, '');
|
|
53
|
+
}
|
|
54
|
+
// jest.mocked(someObject, false); => jest.mocked(someObject, {shallow: true});
|
|
55
|
+
// opt into the new behavior unless explicitly opting out
|
|
56
|
+
if (node.arguments[1].getText() === 'false') {
|
|
57
|
+
return text.replace('false', '{shallow: true}');
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
});
|
|
61
|
+
tree.write(filePath, updatedJestMockTypes);
|
|
62
|
+
}
|
|
63
|
+
exports.updateJestMocked = updateJestMocked;
|
|
64
|
+
exports.default = updateTestsJest29;
|
|
65
|
+
//# sourceMappingURL=jest-29-tests.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jest-29-tests.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/migrations/update-15-9-0/jest-29-tests.ts"],"names":[],"mappings":"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"}
|