chore(repo): update to nx 12

nx-dev/ui-common/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "jsx": "react",
+    "jsx": "react-jsx",
     "allowJs": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true

package.json

@@ -67,18 +67,18 @@
     "@ngrx/store": "11.0.0",
     "@ngrx/store-devtools": "11.0.0",
     "@ngtools/webpack": "~10.1.3",
-    "@nrwl/cli": "11.6.0-beta.2",
+    "@nrwl/cli": "12.0.0-rc.1",
-    "@nrwl/cypress": "11.6.0-beta.2",
+    "@nrwl/cypress": "12.0.0-rc.1",
-    "@nrwl/eslint-plugin-nx": "11.6.0-beta.2",
+    "@nrwl/eslint-plugin-nx": "12.0.0-rc.1",
-    "@nrwl/jest": "11.6.0-beta.2",
+    "@nrwl/jest": "12.0.0-rc.1",
-    "@nrwl/linter": "11.6.0-beta.2",
+    "@nrwl/linter": "12.0.0-rc.1",
-    "@nrwl/next": "11.6.0-beta.2",
+    "@nrwl/next": "12.0.0-rc.1",
-    "@nrwl/node": "11.6.0-beta.2",
+    "@nrwl/node": "12.0.0-rc.1",
     "@nrwl/nx-cloud": "11.2.0",
-    "@nrwl/tao": "11.6.0-beta.2",
+    "@nrwl/tao": "12.0.0-rc.1",
-    "@nrwl/web": "11.6.0-beta.2",
+    "@nrwl/web": "12.0.0-rc.1",
-    "@nrwl/workspace": "11.6.0-beta.2",
+    "@nrwl/workspace": "12.0.0-rc.1",
-    "@reduxjs/toolkit": "1.3.2",
+    "@reduxjs/toolkit": "1.5.0",
     "@rollup/plugin-babel": "5.0.2",
     "@rollup/plugin-commonjs": "11.0.2",
     "@rollup/plugin-image": "2.0.4",
@@ -90,7 +90,7 @@
     "@storybook/core": "^6.0.21",
     "@storybook/react": "^6.0.21",
     "@svgr/webpack": "^5.4.0",
-    "@testing-library/react": "9.4.0",
+    "@testing-library/react": "11.2.5",
     "@types/copy-webpack-plugin": "6.0.0",
     "@types/cytoscape": "^3.14.7",
     "@types/eslint": "^7.2.2",
@@ -103,10 +103,9 @@
     "@types/marked": "^2.0.0",
     "@types/node": "14.14.33",
     "@types/prettier": "2.0.0",
-    "@types/react": "16.9.17",
+    "@types/react": "17.0.3",
-    "@types/react-dom": "16.9.4",
+    "@types/react-dom": "17.0.3",
-    "@types/react-redux": "7.1.5",
+    "@types/react-router-dom": "5.1.7",
-    "@types/react-router-dom": "5.1.3",
     "@types/webpack": "^4.4.24",
     "@types/webpack-dev-server": "^3.11.1",
     "@types/yargs": "^15.0.5",
@@ -156,7 +155,7 @@
     "eslint-plugin-cypress": "^2.10.3",
     "eslint-plugin-import": "2.22.1",
     "eslint-plugin-jsx-a11y": "6.4.1",
-    "eslint-plugin-react": "^7.23.1",
+    "eslint-plugin-react": "7.23.1",
     "eslint-plugin-react-hooks": "4.2.0",
     "express": "4.17.1",
     "file-loader": "4.2.0",
@@ -213,7 +212,7 @@
     "pretty-quick": "^2.0.1",
     "protractor": "5.4.3",
     "raw-loader": "3.1.0",
-    "react-redux": "7.1.3",
+    "react-redux": "7.2.3",
     "react-router-dom": "5.1.2",
     "regenerator-runtime": "0.13.7",
     "release-it": "^7.4.0",
@@ -268,7 +267,8 @@
     "worker-plugin": "3.2.0",
     "yargs": "15.4.1",
     "yargs-parser": "20.0.0",
-    "zone.js": "^0.10.0"
+    "zone.js": "^0.10.0",
+    "levenary": "^1.1.1"
   },
   "author": "Victor Savkin",
   "license": "MIT",
@@ -287,10 +287,10 @@
     "document-register-element": "^1.13.1",
     "gray-matter": "^4.0.2",
     "marked": "^2.0.1",
-    "react": "17.0.1",
+    "react": "17.0.2",
-    "react-dom": "17.0.1"
+    "react-dom": "17.0.2"
   },
   "resolutions": {
     "ng-packagr/rxjs": "6.6.3"
   }
-}
+}

packages/angular/package.json

@@ -16,8 +16,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "bundles/nrwl-angular.umd.js",
+  "main": "./bundles/nrwl-angular.umd.js",
-  "types": "nrwl-angular.d.ts",
+  "types": "./nrwl-angular.d.ts",
   "module": "esm5/nrwl-angular.js",
   "es2015": "esm2015/nrwl-angular.js",
   "author": "Victor Savkin",

packages/cypress/package.json

@@ -17,8 +17,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/devkit/package.json

@@ -17,8 +17,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/eslint-plugin-nx/package.json

@@ -19,8 +19,8 @@
     "README.md",
     "LICENSE"
   ],
-  "main": "src/index.js",
+  "main": "./src/index.js",
-  "types": "src/index.d.ts",
+  "typings": "./src/index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/express/package.json

@@ -14,8 +14,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/gatsby/package.json

@@ -14,8 +14,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/jest/package.json

@@ -17,8 +17,8 @@
     "Unit Testing",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/jest/src/utils/versions.ts

@@ -3,8 +3,8 @@ export const jestVersion = '26.2.2';
 export const jestTypesVersion = '26.0.8';
 export const tsJestVersion = '26.4.0';
 
-export const babelCoreVersion = '7.9.6';
+export const babelCoreVersion = '7.12.13';
-export const babelPresetEnvVersion = '7.9.6';
+export const babelPresetEnvVersion = '7.12.13';
-export const babelPresetTypescriptVersion = '7.9.0';
+export const babelPresetTypescriptVersion = '7.12.13';
-export const babelPresetReactVersion = '7.9.4';
+export const babelPresetReactVersion = '7.12.13';
 export const babelJestVersion = '26.2.2';

packages/linter/package.json

@@ -14,8 +14,8 @@
     "ESLint",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/nest/package.json

@@ -14,8 +14,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/next/package.json

@@ -14,8 +14,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/node/package.json

@@ -14,8 +14,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/node/src/executors/package/utils/normalize-options.ts

@@ -59,9 +59,9 @@ export default function normalizeOptions(
   const mainFileDir = dirname(options.main);
 
   // Always include a preceding dot to match format used for entry points
-  const relativeMainFileOutput = `./${normalizePath(
+  const relativeDir = normalizePath(relative(rootDir, mainFileDir));
-    relative(rootDir, mainFileDir)
+  const relativeMainFileOutput =
-  )}`;
+    relativeDir === '' ? `./` : `./${relativeDir}/`;
 
   if (options.buildableProjectDepsInPackageJsonType == undefined) {
     options.buildableProjectDepsInPackageJsonType = 'dependencies';

packages/node/src/executors/package/utils/update-package-json.ts

@@ -16,7 +16,7 @@ export default function updatePackageJson(
   const mainJsFile = `${mainFile}.js`;
   const packageJson = readJsonFile(join(context.root, options.packageJson));
 
-  packageJson.main = `${options.relativeMainFileOutput}/${mainJsFile}`;
+  packageJson.main = `${options.relativeMainFileOutput}${mainJsFile}`;
-  packageJson.typings = `${options.relativeMainFileOutput}/${typingsFile}`;
+  packageJson.typings = `${options.relativeMainFileOutput}${typingsFile}`;
   writeJsonFile(`${options.outputPath}/package.json`, packageJson);
 }

packages/react/package.json

@@ -14,8 +14,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/storybook/package.json

@@ -13,8 +13,8 @@
     "Storybook",
     "Cypress"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Isaac Mann",
   "license": "MIT",
   "bugs": {

packages/storybook/src/utils/versions.ts

@@ -1,8 +1,8 @@
 export const nxVersion = '*';
 export const storybookVersion = '^6.1.11';
-export const babelCoreVersion = '7.9.6';
+export const babelCoreVersion = '7.12.13';
 export const babelLoaderVersion = '8.1.0';
-export const babelPresetTypescriptVersion = '7.9.0';
+export const babelPresetTypescriptVersion = '7.12.13';
 export const webpackTypesVersion = '4.41.21';
 export const svgrVersion = '^5.4.0';
 export const urlLoaderVersion = '^3.0.0';

packages/tao/package.json

@@ -17,8 +17,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/web/package.json

@@ -13,8 +13,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

packages/workspace/package.json

@@ -17,8 +17,8 @@
     "Cypress",
     "CLI"
   ],
-  "main": "index.js",
+  "main": "./index.js",
-  "types": "index.d.ts",
+  "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {

scripts/e2e.ts

@@ -96,12 +96,13 @@ async function runTest() {
             .join(',');
   }
 
-  build(process.env.PUBLISHED_VERSION, '~10.0.0', '3.9.3', '2.1.2');
-
   if (process.argv[5] != '--rerun') {
+    removeSync('./build');
     removeSync(e2eRoot);
   }
 
+  build(process.env.PUBLISHED_VERSION, '~10.0.0', '3.9.3', '2.1.2');
+
   try {
     setup();
     if (selectedProjects === '') {