Skip to content

Commit 41cd3de

Browse files
committed
chore: run migrations
1 parent 7c7bb4c commit 41cd3de

File tree

92 files changed

+357
-436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+357
-436
lines changed

.eslintrc.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx", "unused-imports", "simple-import-sort", "import", "prettier"],
4+
"plugins": ["@nx", "unused-imports", "simple-import-sort", "import", "prettier"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
88
"rules": {
9-
"@nrwl/nx/enforce-module-boundaries": [
9+
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
1212
"enforceBuildableLibDependency": true,
@@ -35,15 +35,15 @@
3535
},
3636
{
3737
"files": ["*.ts", "*.tsx"],
38-
"extends": ["plugin:@nrwl/nx/typescript"],
38+
"extends": ["plugin:@nx/typescript"],
3939
"rules": {
4040
"@typescript-eslint/ban-ts-comment": 0,
4141
"@typescript-eslint/no-var-requires": 0
4242
}
4343
},
4444
{
4545
"files": ["*.js", "*.jsx"],
46-
"extends": ["plugin:@nrwl/nx/javascript"],
46+
"extends": ["plugin:@nx/javascript"],
4747
"rules": {}
4848
},
4949
{

e2e/nx-core-e2e/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sourceRoot": "e2e/nx-core-e2e/src",
66
"targets": {
77
"e2e": {
8-
"executor": "@nrwl/nx-plugin:e2e",
8+
"executor": "@nx/plugin:e2e",
99
"options": {
1010
"target": "nx-core-e2e:prepare",
1111
"passWithNoTests": true,

e2e/nx-jest-playwright-e2e/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sourceRoot": "e2e/nx-jest-playwright-e2e/src",
66
"targets": {
77
"e2e": {
8-
"executor": "@nrwl/nx-plugin:e2e",
8+
"executor": "@nx/plugin:e2e",
99
"options": {
1010
"target": "nx-jest-playwright-e2e:prepare",
1111
"jestConfig": "e2e/nx-jest-playwright-e2e/jest.config.ts"

e2e/nx-jest-playwright-e2e/tests/nx-jest-playwright.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { checkFilesExist, readJson, runNxCommandAsync, uniq } from '@nrwl/nx-plugin/testing';
1+
import { checkFilesExist, readJson, runNxCommandAsync, uniq } from '@nx/plugin/testing';
22
import { ensureComplexNxProject } from '@ns3/nx-core/src/testing-utils/ensure-complex-nx-project';
33

44
describe('nx-jest-playwright e2e', () => {

e2e/nx-npm-e2e/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sourceRoot": "e2e/nx-npm-e2e/src",
66
"targets": {
77
"e2e": {
8-
"executor": "@nrwl/nx-plugin:e2e",
8+
"executor": "@nx/plugin:e2e",
99
"options": {
1010
"target": "nx-npm-e2e:prepare",
1111
"jestConfig": "e2e/nx-npm-e2e/jest.config.ts"

e2e/nx-npm-e2e/tests/nx-npm.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { runCommandAsync, runNxCommandAsync, tmpProjPath, uniq } from '@nrwl/nx-plugin/testing';
1+
import { runCommandAsync, runNxCommandAsync, tmpProjPath, uniq } from '@nx/plugin/testing';
22
import { getPackageManagerCommand } from '@nrwl/tao/src/shared/package-manager';
33
import { ensureComplexNxProject } from '@ns3/nx-core/src/testing-utils/ensure-complex-nx-project';
44
import { readFileSync, writeFileSync } from 'fs';
@@ -10,7 +10,7 @@ describe('nx-npm e2e', () => {
1010
['@ns3/nx-core', 'dist/packages/nx-core'],
1111
);
1212
const pmc = getPackageManagerCommand();
13-
await runCommandAsync(`${pmc.addDev} @nrwl/js`);
13+
await runCommandAsync(`${pmc.addDev} @nx/js`);
1414
const p = JSON.parse(readFileSync(tmpProjPath('package.json')).toString());
1515
p['repository'] = {
1616
type: 'git',
@@ -22,7 +22,7 @@ describe('nx-npm e2e', () => {
2222
it('should create nx-npm', async () => {
2323
const plugin = uniq('nx-npm');
2424

25-
await runNxCommandAsync(`generate @nrwl/js:lib ${plugin} --importPath ${plugin} --bundler tsc`);
25+
await runNxCommandAsync(`generate @nx/js:lib ${plugin} --importPath ${plugin} --bundler tsc`);
2626
await runNxCommandAsync(`generate @ns3/nx-npm:npm --project ${plugin}`);
2727

2828
const buildResult = await runNxCommandAsync(`build ${plugin}`);

e2e/nx-playwright-e2e/tests/nx-playwright.spec.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
runCommandAsync,
55
runNxCommandAsync,
66
uniq,
7-
} from '@nrwl/nx-plugin/testing';
7+
} from '@nx/plugin/testing';
88
import { ensureComplexNxProject } from '@ns3/nx-core/src/testing-utils/ensure-complex-nx-project';
99
import * as assert from 'node:assert/strict';
1010
import { after, before, describe, it } from 'node:test';
@@ -35,9 +35,17 @@ describe('nx-playwright e2e', () => {
3535
assert.match(sanitised, /Successfully ran target e2e for project/);
3636

3737
const helpResult = await runNxCommandAsync(`e2e ${project} --help_`, { silenceError: true });
38-
const hResult = await runNxCommandAsync(`e2e ${project} app.spec.ts -h_`, { silenceError: true });
39-
assert.match(helpResult.stdout, /yarn playwright test --config=.*\/playwright.config.ts --help/);
40-
assert.match(hResult.stdout, /yarn playwright test app.spec.ts --config=.*\/playwright.config.ts -h/);
38+
const hResult = await runNxCommandAsync(`e2e ${project} app.spec.ts -h_`, {
39+
silenceError: true,
40+
});
41+
assert.match(
42+
helpResult.stdout,
43+
/yarn playwright test --config=.*\/playwright.config.ts --help/,
44+
);
45+
assert.match(
46+
hResult.stdout,
47+
/yarn playwright test app.spec.ts --config=.*\/playwright.config.ts -h/,
48+
);
4149
});
4250

4351
describe('--directory', () => {

e2e/nx-serverless-e2e/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sourceRoot": "e2e/nx-serverless-e2e/src",
66
"targets": {
77
"e2e": {
8-
"executor": "@nrwl/nx-plugin:e2e",
8+
"executor": "@nx/plugin:e2e",
99
"options": {
1010
"target": "nx-serverless-e2e:prepare",
1111
"jestConfig": "e2e/nx-serverless-e2e/jest.config.ts"

e2e/nx-serverless-e2e/tests/serverless.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { checkFilesExist, readJson, runNxCommandAsync, uniq } from '@nrwl/nx-plugin/testing';
1+
import { checkFilesExist, readJson, runNxCommandAsync, uniq } from '@nx/plugin/testing';
22
import { ensureComplexNxProject } from '@ns3/nx-core/src/testing-utils/ensure-complex-nx-project';
33

44
describe('serverless e2e', () => {

jest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { getJestProjects } = require('@nrwl/jest');
1+
const { getJestProjects } = require('@nx/jest');
22

33
export default {
44
projects: getJestProjects(),

0 commit comments

Comments
 (0)