chore: run migrations

taiga-family · Dec 7, 2023 · 6a2fdba · 6a2fdba
1 parent ecd9c73
commit 6a2fdba
Show file tree

Hide file tree

Showing 14 changed files with 232 additions and 795 deletions.
diff --git a/jest.config.ts b/jest.config.ts
@@ -1,4 +1,4 @@
-import {getJestProjects} from '@nrwl/jest';
+import {getJestProjects} from '@nx/jest';
 
 export default {
     projects: getJestProjects(),

diff --git a/jest.preset.js b/jest.preset.js
@@ -1,4 +1,4 @@
-const nxPreset = require('@nrwl/jest/preset').default;
+const nxPreset = require('@nx/jest/preset').default;
 const {resolve} = require('path');
 
 module.exports = {

diff --git a/nx.json b/nx.json
@@ -9,15 +9,15 @@
     },
     "defaultProject": "demo",
     "generators": {
-        "@nrwl/js:library": {
+        "@nx/js:library": {
             "buildable": true,
             "publishable": true,
             "strict": true,
             "linter": "none",
             "unitTestRunner": "jest",
             "config": "project"
         },
-        "@nrwl/angular:library": {
+        "@nx/angular:library": {
             "linter": "none",
             "unitTestRunner": "jest",
             "buildable": true,
@@ -27,15 +27,15 @@
             "skipModule": true,
             "standaloneConfig": true
         },
-        "@nrwl/angular:application": {
+        "@nx/angular:application": {
             "style": "less",
             "linter": "none",
             "unitTestRunner": "jest"
         },
-        "@nrwl/angular:component": {
+        "@nx/angular:component": {
             "style": "less"
         },
-        "@nrwl/react": {
+        "@nx/react": {
             "application": {
                 "babel": true
             },
@@ -73,7 +73,8 @@
             "default",
             "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
             "!{projectRoot}/tsconfig.spec.json",
-            "!{projectRoot}/jest.config.[jt]s"
+            "!{projectRoot}/jest.config.[jt]s",
+            "!{projectRoot}/src/test-setup.[jt]s"
         ]
     },
     "targetDefaults": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -86,21 +86,21 @@
         "@angular/cli": "15.2.10",
         "@angular/compiler-cli": "15.2.10",
         "@angular/language-service": "15.2.10",
+        "@babel/core": "7.23.5",
         "@babel/preset-react": "7.23.3",
         "@commitlint/cli": "18.4.3",
-        "@nrwl/angular": "16.10.0",
-        "@nrwl/cli": "15.9.7",
-        "@nrwl/eslint-plugin-nx": "16.10.0",
-        "@nrwl/jest": "16.10.0",
-        "@nrwl/js": "16.10.0",
-        "@nrwl/linter": "16.10.0",
-        "@nrwl/node": "16.10.0",
-        "@nrwl/react": "16.10.0",
-        "@nrwl/rollup": "16.10.0",
         "@nrwl/tao": "16.10.0",
-        "@nrwl/web": "16.10.0",
-        "@nrwl/webpack": "16.10.0",
-        "@nrwl/workspace": "16.10.0",
+        "@nx/angular": "16.10.0",
+        "@nx/eslint-plugin": "16.10.0",
+        "@nx/jest": "16.10.0",
+        "@nx/js": "16.10.0",
+        "@nx/linter": "16.10.0",
+        "@nx/node": "16.10.0",
+        "@nx/react": "16.10.0",
+        "@nx/rollup": "16.10.0",
+        "@nx/web": "16.10.0",
+        "@nx/webpack": "16.10.0",
+        "@nx/workspace": "16.10.0",
         "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
         "@schematics/angular": "15.2.10",
         "@svgr/webpack": "8.1.0",

diff --git a/projects/angular/project.json b/projects/angular/project.json
@@ -6,10 +6,11 @@
     "prefix": "maskito",
     "targets": {
         "build": {
-            "executor": "@nrwl/angular:package",
+            "executor": "@nx/angular:package",
             "outputs": ["{workspaceRoot}/dist/angular"],
             "options": {
-                "project": "projects/angular/ng-package.json"
+                "project": "projects/angular/ng-package.json",
+                "updateBuildableProjectDepsInPackageJson": true
             },
             "configurations": {
                 "production": {
@@ -23,13 +24,13 @@
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "dependencies",
-                    "params": "forward"
+                    "params": "forward",
+                    "dependencies": true
                 }
             ]
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/angular"],
             "options": {
                 "jestConfig": "projects/angular/jest.config.ts",
@@ -44,7 +45,6 @@
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "self",
                     "params": "ignore"
                 }
             ]

diff --git a/projects/core/project.json b/projects/core/project.json
@@ -5,7 +5,7 @@
     "projectType": "library",
     "targets": {
         "build": {
-            "executor": "@nrwl/rollup:rollup",
+            "executor": "@nx/rollup:rollup",
             "outputs": ["{options.outputPath}"],
             "options": {
                 "project": "projects/core/package.json",
@@ -19,11 +19,13 @@
                         "input": ".",
                         "output": "."
                     }
-                ]
+                ],
+                "babelUpwardRootMode": true,
+                "updateBuildableProjectDepsInPackageJson": true
             }
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/core"],
             "options": {
                 "jestConfig": "projects/core/jest.config.ts",
@@ -38,7 +40,6 @@
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "self",
                     "params": "ignore"
                 }
             ]

diff --git a/projects/demo/project.json b/projects/demo/project.json
@@ -128,7 +128,7 @@
             }
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/demo"],
             "options": {
                 "jestConfig": "projects/demo/jest.config.ts",
@@ -192,7 +192,6 @@
             "dependsOn": [
                 {
                     "target": "generate-routes-file",
-                    "projects": "self",
                     "params": "ignore"
                 }
             ]

diff --git a/projects/kit/project.json b/projects/kit/project.json
@@ -5,7 +5,7 @@
     "projectType": "library",
     "targets": {
         "build": {
-            "executor": "@nrwl/rollup:rollup",
+            "executor": "@nx/rollup:rollup",
             "outputs": ["{options.outputPath}"],
             "options": {
                 "project": "projects/kit/package.json",
@@ -19,18 +19,20 @@
                         "input": ".",
                         "output": "."
                     }
-                ]
+                ],
+                "babelUpwardRootMode": true,
+                "updateBuildableProjectDepsInPackageJson": true
             },
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "dependencies",
-                    "params": "forward"
+                    "params": "forward",
+                    "dependencies": true
                 }
             ]
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/kit"],
             "options": {
                 "jestConfig": "projects/kit/jest.config.ts",
@@ -45,7 +47,6 @@
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "self",
                     "params": "ignore"
                 }
             ]

diff --git a/projects/phone/project.json b/projects/phone/project.json
@@ -5,7 +5,7 @@
     "projectType": "library",
     "targets": {
         "build": {
-            "executor": "@nrwl/rollup:rollup",
+            "executor": "@nx/rollup:rollup",
             "outputs": ["{options.outputPath}"],
             "options": {
                 "project": "projects/phone/package.json",
@@ -19,18 +19,20 @@
                         "input": ".",
                         "output": "."
                     }
-                ]
+                ],
+                "babelUpwardRootMode": true,
+                "updateBuildableProjectDepsInPackageJson": true
             },
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "dependencies",
-                    "params": "forward"
+                    "params": "forward",
+                    "dependencies": true
                 }
             ]
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/phone"],
             "options": {
                 "jestConfig": "projects/phone/jest.config.ts",
@@ -45,7 +47,6 @@
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "self",
                     "params": "ignore"
                 }
             ]

diff --git a/projects/react/.babelrc b/projects/react/.babelrc
@@ -1,7 +1,7 @@
 {
     "presets": [
         [
-            "@nrwl/react/babel",
+            "@nx/react/babel",
             {
                 "runtime": "automatic",
                 "useBuiltIns": "usage"

diff --git a/projects/react/project.json b/projects/react/project.json
@@ -6,40 +6,42 @@
     "tags": [],
     "targets": {
         "build": {
-            "executor": "@nrwl/rollup:rollup",
+            "executor": "@nx/rollup:rollup",
             "outputs": ["{options.outputPath}"],
             "options": {
                 "outputPath": "dist/react",
                 "tsConfig": "projects/react/tsconfig.lib.json",
                 "project": "projects/react/package.json",
                 "entryFile": "projects/react/src/index.ts",
                 "external": ["react/jsx-runtime"],
-                "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
+                "rollupConfig": "@nx/react/plugins/bundle-rollup",
                 "assets": [
                     {
                         "glob": "projects/react/README.md",
                         "input": ".",
                         "output": "."
                     }
-                ]
+                ],
+                "babelUpwardRootMode": true,
+                "updateBuildableProjectDepsInPackageJson": true
             },
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "dependencies",
-                    "params": "forward"
+                    "params": "forward",
+                    "dependencies": true
                 }
             ]
         },
         "lint": {
-            "executor": "@nrwl/linter:eslint",
+            "executor": "@nx/linter:eslint",
             "outputs": ["{options.outputFile}"],
             "options": {
                 "lintFilePatterns": ["projects/react/**/*.{ts,tsx,js,jsx}"]
             }
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/projects/react"],
             "options": {
                 "jestConfig": "projects/react/jest.config.ts",
@@ -54,7 +56,6 @@
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "self",
                     "params": "ignore"
                 }
             ]

diff --git a/projects/react/tsconfig.lib.json b/projects/react/tsconfig.lib.json
@@ -4,10 +4,7 @@
         "outDir": "../../dist/out-tsc",
         "types": ["node"]
     },
-    "files": [
-        "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-        "../../node_modules/@nrwl/react/typings/image.d.ts"
-    ],
+    "files": ["../../node_modules/@nx/react/typings/cssmodule.d.ts", "../../node_modules/@nx/react/typings/image.d.ts"],
     "exclude": [
         "**/*.spec.ts",
         "**/*.test.ts",

diff --git a/projects/vue/project.json b/projects/vue/project.json
@@ -6,7 +6,7 @@
     "tags": [],
     "targets": {
         "build": {
-            "executor": "@nrwl/rollup:rollup",
+            "executor": "@nx/rollup:rollup",
             "outputs": ["{options.outputPath}"],
             "options": {
                 "outputPath": "dist/vue",
@@ -19,25 +19,27 @@
                         "input": ".",
                         "output": "."
                     }
-                ]
+                ],
+                "babelUpwardRootMode": true,
+                "updateBuildableProjectDepsInPackageJson": true
             },
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "dependencies",
-                    "params": "forward"
+                    "params": "forward",
+                    "dependencies": true
                 }
             ]
         },
         "lint": {
-            "executor": "@nrwl/linter:eslint",
+            "executor": "@nx/linter:eslint",
             "outputs": ["{options.outputFile}"],
             "options": {
                 "lintFilePatterns": ["projects/vue/**/*.{ts,js}"]
             }
         },
         "test": {
-            "executor": "@nrwl/jest:jest",
+            "executor": "@nx/jest:jest",
             "outputs": ["{workspaceRoot}/coverage/projects/vue"],
             "options": {
                 "jestConfig": "projects/vue/jest.config.ts",
@@ -52,7 +54,6 @@
             "dependsOn": [
                 {
                     "target": "build",
-                    "projects": "self",
                     "params": "ignore"
                 }
             ]