Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try to migrate #35

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ testem.log
# System Files
.DS_Store
Thumbs.db

.nx/cache
.nx/workspace-data
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@

/dist
/coverage

/.nx/cache
/.nx/workspace-data
17 changes: 17 additions & 0 deletions e2e/esbuildnx-e2e/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "esbuildnx-e2e",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "e2e/esbuildnx-e2e/src",
"targets": {
"e2e": {
"executor": "@nx/nx-plugin:e2e",
"options": {
"target": "esbuildnx:build",
"npmPackageName": "@anatine/esbuildnx",
"pluginOutputPath": "dist/packages/esbuildnx",
"jestConfig": "e2e/esbuildnx-e2e/jest.config.js"
}
}
}
}
4 changes: 2 additions & 2 deletions e2e/esbuildnx-e2e/tests/esbuildnx.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('esbuildnx e2e', () => {
const plugin = uniq('esbuildnx');

console.log(`Generating temp project`);
await runNxCommandAsync(`generate @nrwl/node:application ${plugin}`);
await runNxCommandAsync(`generate @nx/node:application ${plugin}`);

console.log(`Running esbuild setup on new project`);
// Setup the node project
Expand All @@ -46,7 +46,7 @@ describe('esbuildnx e2e', () => {
);
const esbuildFile = `${tmpProjPath()}/apps/${plugin}/esbuild.json`;
const esbuildOptions = await readJson(esbuildFile);
esbuildOptions.external = ['@nrwl/jest'];
esbuildOptions.external = ['@nx/jest'];
console.log(
`Updating file: ${esbuildFile} with ${inspect(
esbuildOptions,
Expand Down
2 changes: 1 addition & 1 deletion jest.preset.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const nxPreset = require('@nrwl/jest/preset');
const nxPreset = require('@nx/jest/preset');

module.exports = { ...nxPreset };
27 changes: 18 additions & 9 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"npmScope": "anatine",
"affected": {
"defaultBase": "main"
},
"implicitDependencies": {
"workspace.json": "*",
"package.json": {
Expand All @@ -16,10 +12,8 @@
},
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/workspace/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "lint", "test", "e2e"]
}
"runner": "@nx/workspace/tasks-runners/default",
"options": {}
}
},
"projects": {
Expand All @@ -45,5 +39,20 @@
"projects": "dependencies"
}
]
}
},
"targetDefaults": {
"build": {
"cache": true
},
"lint": {
"cache": true
},
"test": {
"cache": true
},
"e2e": {
"cache": true
}
},
"defaultBase": "main"
}
Loading