Skip to content

Commit

Permalink
bump versions to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
EwanLyon committed Aug 5, 2023
1 parent dcf0374 commit 3ccd9d7
Show file tree
Hide file tree
Showing 39 changed files with 24,700 additions and 21,598 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
13 changes: 7 additions & 6 deletions apps/keystone-plugin-e2e/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
export default {
displayName: "keystone-plugin-e2e",
preset: "../../jest.preset.js",
globals: {
"ts-jest": {
tsconfig: "<rootDir>/tsconfig.spec.json",
},
},
globals: {},
transform: {
"^.+\\.[tj]s$": "ts-jest",
"^.+\\.[tj]s$": [
"ts-jest",
{
tsconfig: "<rootDir>/tsconfig.spec.json",
},
],
},
moduleFileExtensions: ["ts", "js", "html"],
coverageDirectory: "../../coverage/apps/keystone-plugin-e2e",
Expand Down
9 changes: 5 additions & 4 deletions apps/keystone-plugin-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
"sourceRoot": "apps/keystone-plugin-e2e/src",
"targets": {
"e2e": {
"executor": "@nrwl/nx-plugin:e2e",
"executor": "@nx/jest:jest",
"options": {
"target": "keystone-plugin:build",
"jestConfig": "apps/keystone-plugin-e2e/jest.config.ts"
}
"jestConfig": "apps/keystone-plugin-e2e/jest.config.ts",
"runInBand": true
},
"dependsOn": ["keystone-plugin:build"]
}
},
"tags": [],
Expand Down
26 changes: 5 additions & 21 deletions apps/keystone-plugin-e2e/tests/keystone-plugin.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import {
checkFilesExist,
ensureNxProject,
readJson,
runNxCommandAsync,
uniq,
} from "@nrwl/nx-plugin/testing";
import { checkFilesExist, ensureNxProject, readJson, runNxCommandAsync, uniq } from "@nx/plugin/testing";

describe("keystone-plugin e2e", () => {
// Setting up individual workspaces per
Expand All @@ -14,10 +8,7 @@ describe("keystone-plugin e2e", () => {
// on a unique project in the workspace, such that they
// are not dependant on one another.
beforeAll(() => {
ensureNxProject(
"@ausspeedruns.com/keystone-plugin",
"dist/libs/keystone-plugin",
);
ensureNxProject("@ausspeedruns.com/keystone-plugin", "dist/libs/keystone-plugin");
});

afterAll(() => {
Expand All @@ -28,9 +19,7 @@ describe("keystone-plugin e2e", () => {

it("should create keystone-plugin", async () => {
const project = uniq("keystone-plugin");
await runNxCommandAsync(
`generate @ausspeedruns.com/keystone-plugin:keystone-plugin ${project}`,
);
await runNxCommandAsync(`generate @ausspeedruns.com/keystone-plugin:keystone-plugin ${project}`);
const result = await runNxCommandAsync(`build ${project}`);
expect(result.stdout).toContain("Executor ran");
}, 120000);
Expand All @@ -41,19 +30,14 @@ describe("keystone-plugin e2e", () => {
await runNxCommandAsync(
`generate @ausspeedruns.com/keystone-plugin:keystone-plugin ${project} --directory subdir`,
);
expect(() =>
checkFilesExist(`libs/subdir/${project}/src/index.ts`),
).not.toThrow();
expect(() => checkFilesExist(`libs/subdir/${project}/src/index.ts`)).not.toThrow();
}, 120000);
});

describe("--tags", () => {
it("should add tags to the project", async () => {
const projectName = uniq("keystone-plugin");
ensureNxProject(
"@ausspeedruns.com/keystone-plugin",
"dist/libs/keystone-plugin",
);
ensureNxProject("@ausspeedruns.com/keystone-plugin", "dist/libs/keystone-plugin");
await runNxCommandAsync(
`generate @ausspeedruns.com/keystone-plugin:keystone-plugin ${projectName} --tags e2etag,e2ePackage`,
);
Expand Down
Loading

0 comments on commit 3ccd9d7

Please sign in to comment.