From 0e0935a9a873a97b80ec21b31ef9f5dc52858d13 Mon Sep 17 00:00:00 2001 From: zizifn <1803942+zizifn@users.noreply.github.com> Date: Fri, 12 May 2023 22:42:22 +0800 Subject: [PATCH] update to nx 16 --- .eslintrc.json | 8 +- apps/cf-page/.eslintrc.json | 2 +- apps/cf-page/project.json | 8 +- apps/cf-page/src/app/nx-welcome.tsx | 820 -- apps/cf-page/tailwind.config.js | 2 +- apps/cf-page/tsconfig.app.json | 4 +- apps/cf-page/tsconfig.spec.json | 4 +- apps/node-vless/project.json | 8 +- apps/node-vless/webpack.config.js | 2 +- jest.config.ts | 2 +- jest.preset.js | 2 +- libs/edge-ui/.eslintrc.json | 2 +- libs/edge-ui/project.json | 4 +- libs/edge-ui/tailwind.config.js | 2 +- libs/edge-ui/tsconfig.lib.json | 4 +- libs/vless-js/project.json | 6 +- migrations.json | 152 +- nx.json | 4 +- package-lock.json | 17017 ++++++++------------------ package.json | 48 +- tools/generators/.gitkeep | 0 21 files changed, 5575 insertions(+), 12526 deletions(-) delete mode 100644 apps/cf-page/src/app/nx-welcome.tsx delete mode 100644 tools/generators/.gitkeep diff --git a/.eslintrc.json b/.eslintrc.json index 7c52faa..0be733b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -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, @@ -23,12 +23,12 @@ }, { "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": {} }, { diff --git a/apps/cf-page/.eslintrc.json b/apps/cf-page/.eslintrc.json index 734ddac..a39ac5d 100644 --- a/apps/cf-page/.eslintrc.json +++ b/apps/cf-page/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "overrides": [ { diff --git a/apps/cf-page/project.json b/apps/cf-page/project.json index 83a6469..26ebd28 100644 --- a/apps/cf-page/project.json +++ b/apps/cf-page/project.json @@ -5,7 +5,7 @@ "projectType": "application", "targets": { "build": { - "executor": "@nrwl/vite:build", + "executor": "@nx/vite:build", "outputs": ["{options.outputPath}"], "defaultConfiguration": "production", "options": { @@ -21,7 +21,7 @@ } }, "serve": { - "executor": "@nrwl/vite:dev-server", + "executor": "@nx/vite:dev-server", "defaultConfiguration": "development", "options": { "buildTarget": "cf-page:build" @@ -45,14 +45,14 @@ "dependsOn": ["^build"] }, "test": { - "executor": "@nrwl/vite:test", + "executor": "@nx/vite:test", "outputs": ["{projectRoot}/coverage"], "options": { "passWithNoTests": true } }, "lint": { - "executor": "@nrwl/linter:eslint", + "executor": "@nx/linter:eslint", "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": ["apps/cf-page/**/*.{ts,tsx,js,jsx}"] diff --git a/apps/cf-page/src/app/nx-welcome.tsx b/apps/cf-page/src/app/nx-welcome.tsx deleted file mode 100644 index 3c1a440..0000000 --- a/apps/cf-page/src/app/nx-welcome.tsx +++ /dev/null @@ -1,820 +0,0 @@ -/* - * * * * * * * * * * * * * * * * * * * * * * * * * * * * - This is a starter component and can be deleted. - * * * * * * * * * * * * * * * * * * * * * * * * * * * * - Delete this file and get started with your project! - * * * * * * * * * * * * * * * * * * * * * * * * * * * * - */ -export function NxWelcome({ title }: { title: string }) { - return ( - <> -