Skip to content

Commit

Permalink
feat: nx and flavor updates
Browse files Browse the repository at this point in the history
* nx 14.3.x
* angular 14
  • Loading branch information
NathanWalker committed Jul 4, 2022
1 parent a8f8095 commit afa72d4
Show file tree
Hide file tree
Showing 15 changed files with 674 additions and 767 deletions.
2 changes: 1 addition & 1 deletion e2e/plugin-tools-e2e/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"root": "e2e/plugin-tools-e2e",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "e2e/plugin-tools-e2e/src",
"targets": {
Expand Down
3 changes: 0 additions & 3 deletions jest.config.js

This file was deleted.

3 changes: 3 additions & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const { getJestProjects } = require('@nrwl/jest');

export default { projects: [...getJestProjects(), '<rootDir>/e2e/plugin-tools-e2e'] };
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('@nrwl/jest/preset').default;

module.exports = { ...nxPreset };
38 changes: 28 additions & 10 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,37 @@
},
".eslintrc.json": "*"
},
"targetDependencies": {
"build": [
{
"target": "build",
"projects": "dependencies"
}
]
},
"workspaceLayout": {
"appsDir": "e2e",
"libsDir": "packages"
},
"cli": {
"defaultCollection": "@nrwl/workspace"
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build": {
"dependsOn": [
"^build"
]
}
},
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"useDaemonProcess": false,
"cacheableOperations": [
"build",
"build.all",
"lint",
"test",
"e2e"
],
"runtimeCacheInputs": [
"node -v"
],
"canTrackAnalytics": false,
"showUsageWarnings": true,
"parallel": 1
}
}
}
}
50 changes: 26 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,37 @@
"tslib": "^2.0.0"
},
"devDependencies": {
"@angular-devkit/schematics": "^13.2.4",
"@nrwl/cli": "13.8.5",
"@nrwl/devkit": "13.8.5",
"@nrwl/eslint-plugin-nx": "13.8.5",
"@nrwl/jest": "13.8.5",
"@nrwl/js": "13.8.5",
"@nrwl/linter": "13.8.5",
"@nrwl/node": "13.8.5",
"@nrwl/nx-plugin": "13.8.5",
"@nrwl/tao": "13.8.5",
"@nrwl/workspace": "13.8.5",
"@types/jest": "27.0.2",
"@types/node": "14.14.33",
"@typescript-eslint/eslint-plugin": "5.10.2",
"@typescript-eslint/parser": "5.10.2",
"conventional-changelog-cli": "~2.1.0",
"dotenv": "10.0.0",
"eslint": "8.7.0",
"@angular-devkit/schematics": "^14.0.0",
"@nrwl/cli": "14.3.6",
"@nrwl/devkit": "14.3.6",
"@nrwl/eslint-plugin-nx": "14.3.6",
"@nrwl/jest": "14.3.6",
"@nrwl/js": "14.3.6",
"@nrwl/linter": "14.3.6",
"@nrwl/node": "14.3.6",
"@nrwl/nx-plugin": "14.3.6",
"@nrwl/workspace": "14.3.6",
"@swc-node/register": "^1.4.2",
"@swc/core": "^1.2.173",
"@types/jest": "27.4.1",
"@types/node": "~18.0.0",
"@typescript-eslint/eslint-plugin": "5.24.0",
"@typescript-eslint/parser": "5.24.0",
"conventional-changelog-cli": "~2.2.0",
"dotenv": "~10.0.0",
"eslint": "8.15.0",
"eslint-config-prettier": "8.1.0",
"github-contributors-list": "~1.2.3",
"husky": "~7.0.4",
"jest": "27.2.3",
"husky": "~8.0.0",
"jest": "27.5.1",
"jsonc-parser": "3.0.0",
"nx": "14.3.6",
"parse-version-string": "^1.0.1",
"prettier": "2.5.1",
"ts-jest": "27.0.5",
"ts-node": "~9.1.1",
"prettier": "^2.7.1",
"ts-jest": "27.1.4",
"ts-node": "10.8.1",
"tslib": "^2.0.0",
"typescript": "~4.5.4"
"typescript": "4.7.4"
},
"lint-staged": {
"**/*.{js,ts,scss,json,html}": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
/* eslint-disable */
export default {
displayName: 'plugin-tools',
preset: '../../jest.preset.js',
globals: {
Expand Down
8 changes: 4 additions & 4 deletions packages/plugin-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
"nativescript-theme-core": "~1.0.4",
"sass": "^1.35.0",
"parse-version-string": "^1.0.1",
"prettier": "^2.3.0",
"prettier": "^2.7.0",
"pretty-data": "^0.40.0",
"rimraf": "^3.0.2",
"ts-jest": "27.0.3",
"ts-node": "~9.1.0",
"ts-patch": "^1.3.0"
"ts-jest": "27.1.4",
"ts-node": "10.8.1",
"ts-patch": "^2.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-tools/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"root": "packages/plugin-tools",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/plugin-tools/src",
"projectType": "library",
"targets": {
Expand All @@ -14,7 +14,7 @@
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/packages/plugin-tools"],
"options": {
"jestConfig": "packages/plugin-tools/jest.config.js",
"jestConfig": "packages/plugin-tools/jest.config.ts",
"passWithNoTests": true
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-tools/src/generators/add-demo/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { addProjectConfiguration, generateFiles, joinPathFragments, readProjectConfiguration, Tree, updateJson, updateProjectConfiguration } from '@nrwl/devkit';
import { stringUtils, addProjectToNxJsonInTree } from '@nrwl/workspace';
import { stringUtils } from '@nrwl/workspace';
import { updateReadMe, prerun, getNpmScope, getSrcFolderForType, SupportedDemoType, getAllPackages } from '../../utils';
import syncPackagesWithDemos from '../sync-packages-with-demos';
import { Schema } from './schema';
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-tools/src/generators/add-package/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { addProjectConfiguration, generateFiles, getProjects, joinPathFragments, readJson, readProjectConfiguration, Tree, updateJson, updateProjectConfiguration } from '@nrwl/devkit';
import { stringUtils, addProjectToNxJsonInTree } from '@nrwl/workspace';
import { stringUtils } from '@nrwl/workspace';
import { updateReadMe, prerun, getNpmScope } from '../../utils';
import syncPackagesWithDemos from '../sync-packages-with-demos';
import { Schema } from './schema';
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-tools/tsconfig.lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"declaration": true,
"types": ["node"]
},
"exclude": ["**/*.spec.ts", "**/*.test.ts"],
"exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
"include": ["**/*.ts"]
}
2 changes: 1 addition & 1 deletion packages/plugin-tools/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"module": "commonjs",
"types": ["jest", "node"]
},
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx", "**/*.d.ts"]
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx", "**/*.d.ts", "jest.config.ts"]
}
3 changes: 2 additions & 1 deletion workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"projects": {
"plugin-tools": "packages/plugin-tools",
"plugin-tools-e2e": "e2e/plugin-tools-e2e"
}
},
"$schema": "./node_modules/nx/schemas/workspace-schema.json"
}
Loading

0 comments on commit afa72d4

Please sign in to comment.