Skip to content

Commit

Permalink
chore: migrate to nx 16 (#366)
Browse files Browse the repository at this point in the history
Signed-off-by: Todd Baert <[email protected]>
  • Loading branch information
toddbaert authored May 15, 2023
1 parent 8e3be4d commit 7a9c201
Show file tree
Hide file tree
Showing 44 changed files with 7,117 additions and 7,986 deletions.
13 changes: 9 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
Expand All @@ -23,12 +23,17 @@
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
},
{
"files": "*.json",
"parser": "jsonc-eslint-parser",
"rules": {}
}
]
Expand Down
2 changes: 1 addition & 1 deletion assets/package.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"module": "commonjs"
}
}
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getJestProjects } from '@nrwl/jest';
import { getJestProjects } from '@nx/jest';

export default {
projects: getJestProjects(),
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').default;
const nxPreset = require('@nx/jest/preset').default;

module.exports = { ...nxPreset };
2 changes: 1 addition & 1 deletion libs/hooks/open-telemetry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"@opentelemetry/api": "^1.2.0"
},
"license": "Apache-2.0"
}
}
13 changes: 6 additions & 7 deletions libs/hooks/open-telemetry/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"projectType": "library",
"targets": {
"package": {
"executor": "@nrwl/rollup:rollup",
"executor": "@nx/rollup:rollup",
"outputs": ["{options.outputPath}"],
"options": {
"project": "libs/hooks/open-telemetry/package.json",
Expand All @@ -15,7 +15,7 @@
"compiler": "tsc",
"generateExportsField": true,
"umdName": "OpenTelemetry",
"external": ["typescript"],
"external": "all",
"format": ["cjs", "esm"],
"assets": [
{
Expand All @@ -37,7 +37,7 @@
}
},
"build": {
"executor": "@nrwl/js:tsc",
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/libs/hooks/open-telemetry",
Expand All @@ -47,27 +47,26 @@
}
},
"publish": {
"executor": "@nrwl/workspace:run-commands",
"executor": "@nx/workspace:run-commands",
"options": {
"command": "npm run publish-if-not-exists",
"cwd": "dist/libs/hooks/open-telemetry"
},
"dependsOn": [
{
"projects": "self",
"target": "package"
}
]
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/hooks/open-telemetry/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["coverage/libs/hooks/open-telemetry"],
"options": {
"jestConfig": "libs/hooks/open-telemetry/jest.config.ts",
Expand Down
9 changes: 4 additions & 5 deletions libs/providers/config-cat/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,19 @@
},
"dependsOn": [
{
"projects": "self",
"target": "package"
}
]
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/providers/config-cat/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "libs/providers/config-cat/jest.config.ts",
Expand All @@ -39,7 +38,7 @@
}
},
"package": {
"executor": "@nrwl/rollup:rollup",
"executor": "@nx/rollup:rollup",
"outputs": ["{options.outputPath}"],
"options": {
"project": "libs/providers/config-cat/package.json",
Expand All @@ -50,7 +49,7 @@
"compiler": "tsc",
"generateExportsField": true,
"umdName": "config-cat",
"external": ["typescript"],
"external": "all",
"format": ["cjs", "esm"],
"assets": [
{
Expand Down
2 changes: 1 addition & 1 deletion libs/providers/env-var/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/js/babel",
"@nx/js/babel",
{
"useBuiltIns": "usage"
}
Expand Down
11 changes: 5 additions & 6 deletions libs/providers/env-var/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,26 @@
"projectType": "library",
"targets": {
"publish": {
"executor": "@nrwl/workspace:run-commands",
"executor": "@nx/workspace:run-commands",
"options": {
"command": "npm run publish-if-not-exists",
"cwd": "dist/libs/providers/env-var"
},
"dependsOn": [
{
"projects": "self",
"target": "package"
}
]
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/providers/env-var/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "libs/providers/env-var/jest.config.ts",
Expand All @@ -39,7 +38,7 @@
}
},
"package": {
"executor": "@nrwl/rollup:rollup",
"executor": "@nx/rollup:rollup",
"outputs": ["{options.outputPath}"],
"options": {
"project": "libs/providers/env-var/package.json",
Expand All @@ -50,7 +49,7 @@
"compiler": "tsc",
"generateExportsField": true,
"umdName": "Env Var",
"external": ["typescript"],
"external": "all",
"format": ["cjs", "esm"],
"assets": [
{
Expand Down
2 changes: 1 addition & 1 deletion libs/providers/flagd-web/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/web/babel",
"@nx/web/babel",
{
"useBuiltIns": "usage"
}
Expand Down
12 changes: 4 additions & 8 deletions libs/providers/flagd-web/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
},
"dependsOn": [
{
"projects": "self",
"target": "package"
}
]
Expand All @@ -31,34 +30,32 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/providers/flagd-web/**/*.ts"]
},
"dependsOn": [
{
"projects": "self",
"target": "generate"
}
]
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["coverage/libs/providers/flagd-web"],
"options": {
"jestConfig": "libs/providers/flagd-web/jest.config.ts",
"passWithNoTests": true
},
"dependsOn": [
{
"projects": "self",
"target": "generate"
}
]
},
"package": {
"executor": "@nrwl/rollup:rollup",
"executor": "@nx/rollup:rollup",
"outputs": ["{options.outputPath}"],
"options": {
"project": "libs/providers/flagd-web/package.json",
Expand All @@ -69,7 +66,7 @@
"generateExportsField": true,
"buildableProjectDepsInPackageJsonType": "dependencies",
"umdName": "flagd-web",
"external": ["typescript"],
"external": "all",
"format": ["cjs", "esm"],
"assets": [
{
Expand All @@ -91,7 +88,6 @@
},
"dependsOn": [
{
"projects": "self",
"target": "generate"
}
]
Expand Down
2 changes: 1 addition & 1 deletion libs/providers/flagd/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/web/babel",
"@nx/web/babel",
{
"useBuiltIns": "usage"
}
Expand Down
2 changes: 1 addition & 1 deletion libs/providers/flagd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
"peerDependencies": {
"@openfeature/js-sdk": "^1.1.0"
}
}
}
12 changes: 4 additions & 8 deletions libs/providers/flagd/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
},
"dependsOn": [
{
"projects": "self",
"target": "package"
}
]
Expand All @@ -31,34 +30,32 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/providers/flagd/**/*.ts"]
},
"dependsOn": [
{
"projects": "self",
"target": "generate"
}
]
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["coverage/libs/providers/flagd"],
"options": {
"jestConfig": "libs/providers/flagd/jest.config.ts",
"passWithNoTests": true
},
"dependsOn": [
{
"projects": "self",
"target": "generate"
}
]
},
"package": {
"executor": "@nrwl/rollup:rollup",
"executor": "@nx/rollup:rollup",
"outputs": ["{options.outputPath}"],
"options": {
"project": "libs/providers/flagd/package.json",
Expand All @@ -69,7 +66,7 @@
"generateExportsField": true,
"buildableProjectDepsInPackageJsonType": "dependencies",
"umdName": "flagd",
"external": ["typescript"],
"external": "all",
"format": ["cjs", "esm"],
"assets": [
{
Expand All @@ -91,7 +88,6 @@
},
"dependsOn": [
{
"projects": "self",
"target": "generate"
}
]
Expand Down
2 changes: 1 addition & 1 deletion libs/providers/go-feature-flag/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/web/babel",
"@nx/web/babel",
{
"useBuiltIns": "usage"
}
Expand Down
2 changes: 1 addition & 1 deletion libs/providers/go-feature-flag/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
"peerDependencies": {
"@openfeature/js-sdk": "^1.0.0"
}
}
}
Loading

0 comments on commit 7a9c201

Please sign in to comment.