nx

MintPlayer · Oct 17, 2024 · b853d6a · b853d6a
1 parent ffc8579
commit b853d6a
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 37 deletions.
diff --git 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,13 +23,19 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
-      "rules": {}
+      "extends": ["plugin:@nx/typescript"],
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
-      "rules": {}
+      "extends": ["plugin:@nx/javascript"],
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     }
   ]
 }
diff --git a/apps/angular-demo-e2e/project.json b/apps/angular-demo-e2e/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/angular-demo-e2e/cypress.json",
         "devServerTarget": "angular-demo:serve:development"
@@ -17,7 +17,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/angular-demo-e2e/**/*.{js,ts}"]

diff --git a/apps/angular-demo/.eslintrc.json b/apps/angular-demo/.eslintrc.json
@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/apps/angular-demo/project.json b/apps/angular-demo/project.json
@@ -84,13 +84,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": [
-          "apps/angular-demo/src/**/*.ts",
-          "apps/angular-demo/src/**/*.html"
-        ]
-      }
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",

diff --git a/commands.txt b/commands.txt
@@ -4,13 +4,13 @@ npx create-nx-workspace
 > angular-demo
 > scss
 cd mintplayer-ng-bootstrap
-nx g @nrwl/angular:lib mintplayer-ng-youtube-player --buildable --publishable --import-path @mintplayer/ng-youtube-player --directory libs/mintplayer-ng-youtube-player
-nx g @nrwl/angular:lib mintplayer-ng-vimeo-player --buildable --publishable --import-path @mintplayer/ng-vimeo-player --directory libs/mintplayer-ng-vimeo-player
-nx g @nrwl/angular:lib mintplayer-ng-soundcloud-player --buildable --publishable --import-path @mintplayer/ng-soundcloud-player --directory libs/mintplayer-ng-soundcloud-player
-nx g @nrwl/angular:lib mintplayer-ng-soundcloud-player --buildable --publishable --import-path @mintplayer/ng-mixcloud-player --directory libs/mintplayer-ng-mixcloud-player
-nx g @nrwl/angular:lib mintplayer-ng-player-progress --buildable --publishable --import-path @mintplayer/ng-player-progress --directory libs/mintplayer-ng-player-progress
-nx g @nrwl/angular:lib mintplayer-ng-video-player --buildable --publishable --import-path @mintplayer/ng-video-player --directory libs/mintplayer-ng-video-player
-nx g @nrwl/angular:lib mintplayer-ng-playlist-controller --buildable --publishable --import-path @mintplayer/ng-playlist-controller --directory libs/mintplayer-ng-playlist-controller
+nx g @nx/angular:lib mintplayer-ng-youtube-player --buildable --publishable --import-path @mintplayer/ng-youtube-player --directory libs/mintplayer-ng-youtube-player
+nx g @nx/angular:lib mintplayer-ng-vimeo-player --buildable --publishable --import-path @mintplayer/ng-vimeo-player --directory libs/mintplayer-ng-vimeo-player
+nx g @nx/angular:lib mintplayer-ng-soundcloud-player --buildable --publishable --import-path @mintplayer/ng-soundcloud-player --directory libs/mintplayer-ng-soundcloud-player
+nx g @nx/angular:lib mintplayer-ng-soundcloud-player --buildable --publishable --import-path @mintplayer/ng-mixcloud-player --directory libs/mintplayer-ng-mixcloud-player
+nx g @nx/angular:lib mintplayer-ng-player-progress --buildable --publishable --import-path @mintplayer/ng-player-progress --directory libs/mintplayer-ng-player-progress
+nx g @nx/angular:lib mintplayer-ng-video-player --buildable --publishable --import-path @mintplayer/ng-video-player --directory libs/mintplayer-ng-video-player
+nx g @nx/angular:lib mintplayer-ng-playlist-controller --buildable --publishable --import-path @mintplayer/ng-playlist-controller --directory libs/mintplayer-ng-playlist-controller
 nx g @nx/js:library --name=mintplayer-video-player --buildable --publishable --import-path @mintplayer/video-player
 
 npm i -D @nx/react

diff --git a/decorate-angular-cli.js b/decorate-angular-cli.js
@@ -27,7 +27,7 @@ const cp = require('child_process');
 const isWindows = os.platform() === 'win32';
 let output;
 try {
-  output = require('@nrwl/workspace').output;
+  output = require('@nx/workspace').output;
 } catch (e) {
   console.warn('Angular CLI could not be decorated to enable computation caching. Please ensure @nrwl/workspace is installed.');
   process.exit(0);
@@ -62,7 +62,7 @@ function symlinkNgCLItoNxCLI() {
 
 try {
   symlinkNgCLItoNxCLI();
-  require('@nrwl/cli/lib/decorate-cli').decorateCli();
+  require('nx/src/adapter/decorate-cli').decorateCli();
   output.log({ title: 'Angular CLI has been decorated to enable computation caching.' });
 } catch(e) {
   output.error({ title: 'Decoration of the Angular CLI did not complete successfully' });

diff --git a/jest.config.ts b/jest.config.ts
@@ -1,4 +1,4 @@
-const { getJestProjects } = require('@nrwl/jest');
+const { getJestProjects } = require('@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;
 
 
 module.exports = { ...nxPreset };
diff --git a/libs/frameworks/ng-video-player/.eslintrc.json b/libs/frameworks/ng-video-player/.eslintrc.json
@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     },
     {

diff --git a/libs/frameworks/ng-video-player/project.json b/libs/frameworks/ng-video-player/project.json
@@ -33,13 +33,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": [
-          "libs/frameworks/ng-video-player/src/**/*.ts",
-          "libs/frameworks/ng-video-player/src/**/*.html"
-        ]
-      }
+      "executor": "@nx/eslint:lint"
     }
   },
   "tags": []