diff --git a/package.json b/package.json index e3d6c73115eb3..e3a6e3073cd66 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nrwl/nx-source", - "version": "13.8.8", + "version": "13.9.0-beta.1", "description": "Smart, Fast and Extensible Build System", "homepage": "https://nx.dev", "private": true, @@ -60,19 +60,18 @@ "@ngrx/schematics": "~13.0.0", "@ngrx/store": "~13.0.0", "@ngrx/store-devtools": "~13.0.0", - "@nrwl/cli": "13.8.8-beta.1", - "@nrwl/cypress": "13.8.8-beta.1", - "@nrwl/eslint-plugin-nx": "13.8.8-beta.1", - "@nrwl/jest": "13.8.8-beta.1", - "@nrwl/js": "13.8.8-beta.1", - "@nrwl/linter": "13.8.8-beta.1", - "@nrwl/next": "13.8.8-beta.1", - "@nrwl/node": "13.8.8-beta.1", + "@nrwl/cypress": "13.9.0-beta.1", + "@nrwl/eslint-plugin-nx": "13.9.0-beta.1", + "@nrwl/jest": "13.9.0-beta.1", + "@nrwl/js": "13.9.0-beta.1", + "@nrwl/linter": "13.9.0-beta.1", + "@nrwl/next": "13.9.0-beta.1", + "@nrwl/node": "13.9.0-beta.1", "@nrwl/nx-cloud": "13.1.6", - "@nrwl/react": "13.8.8-beta.1", - "@nrwl/tao": "13.8.8-beta.1", - "@nrwl/web": "13.8.8-beta.1", - "@nrwl/workspace": "13.8.8-beta.1", + "@nrwl/react": "13.9.0-beta.1", + "@nrwl/web": "13.9.0-beta.1", + "@nrwl/workspace": "13.9.0-beta.1", + "nx": "13.9.0-beta.1", "@parcel/watcher": "2.0.4", "@phenomnomnominal/tsquery": "4.1.1", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1", @@ -142,7 +141,7 @@ "ejs": "^3.1.5", "enhanced-resolve": "^5.8.3", "eslint": "8.7.0", - "eslint-config-next": "^12.1.0", + "eslint-config-next": "12.1.0", "eslint-config-prettier": "^8.1.0", "eslint-plugin-cypress": "^2.10.3", "eslint-plugin-import": "2.25.2", @@ -188,7 +187,7 @@ "mime": "2.4.4", "mini-css-extract-plugin": "~2.4.7", "minimatch": "3.0.4", - "next": "^12.1.0", + "next": "12.1.0", "next-sitemap": "^1.6.108", "ng-packagr": "~13.2.0", "ngrx-store-freeze": "0.2.4", diff --git a/packages/nx/bin/nx.ts b/packages/nx/bin/nx.ts index 455f3bdc759ac..0916e4e1905e4 100644 --- a/packages/nx/bin/nx.ts +++ b/packages/nx/bin/nx.ts @@ -4,6 +4,7 @@ import * as chalk from 'chalk'; import { initLocal } from '../src/cli/init-local'; import { output } from '../src/cli/output'; import { detectPackageManager } from '../src/shared/package-manager'; +import { Workspace } from '../src/cli/workspace'; if (process.argv[2] === 'new' || process.argv[2] === '_migrate') { require('../src/cli/index'); @@ -35,9 +36,7 @@ if (process.argv[2] === 'new' || process.argv[2] === '_migrate') { // Make sure that a local copy of Nx exists in workspace let localNx: string; try { - localNx = require.resolve('nx/bin/nx.js', { - paths: [workspace.dir], - }); + localNx = resolveNx(workspace); } catch { output.error({ title: `Could not find Nx modules in this workspace.`, @@ -46,7 +45,7 @@ if (process.argv[2] === 'new' || process.argv[2] === '_migrate') { process.exit(1); } - if (localNx === require.resolve('nx/bin/nx.js')) { + if (localNx === resolveNx(null)) { initLocal(workspace); } else { const packageManager = detectPackageManager(); @@ -71,3 +70,15 @@ if (process.argv[2] === 'new' || process.argv[2] === '_migrate') { require(localNx); } } + +function resolveNx(workspace: Workspace | null) { + try { + return require.resolve('nx/bin/nx.js', { + paths: workspace ? [workspace.dir] : undefined, + }); + } catch { + return require.resolve('@nrwl/cli/bin/nx.js', { + paths: workspace ? [workspace.dir] : undefined, + }); + } +} diff --git a/packages/nx/project.json b/packages/nx/project.json index 498351f51d290..ebf22b972cbe4 100644 --- a/packages/nx/project.json +++ b/packages/nx/project.json @@ -53,6 +53,12 @@ }, { "command": "node ./scripts/copy-readme.js nx" + }, + { + "command": "node ./scripts/add-dependency-to-build.js nx @nrwl/cli" + }, + { + "command": "node ./scripts/add-dependency-to-build.js nx @nrwl/tao" } ], "parallel": false diff --git a/packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.spec.ts b/packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.spec.ts deleted file mode 100644 index cd5c9753948f6..0000000000000 --- a/packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.spec.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { addProjectConfiguration, formatFiles, Tree } from '@nrwl/devkit'; -import update from './update-jest-for-react-native'; -import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing'; -import { format } from 'prettier'; - -jest.mock('@nrwl/jest/src/migrations/update-10-0-0/require-jest-config', () => { - return { - getJestObject: () => { - return { - preset: 'react-native', - }; - }, - }; -}); - -describe('update jest for react native 12.5.0', () => { - let tree: Tree; - - beforeEach(() => { - tree = createTreeWithEmptyWorkspace(); - - tree.write( - '/apps/products/jest.config.js', - `const workspacePreset = require('../../jest.preset'); -module.exports = { - ...workspacePreset, - preset: 'react-native' -};` - ); - tree.write('/apps/products-2/jest.config.js', `{preset: 'other'}`); - tree.write( - 'apps/products/test-setup.ts', - `import { jest } from '@jest/globals'; -import '@testing-library/jest-native/extend-expect'; -jest.useFakeTimers();` - ); - - addProjectConfiguration(tree, 'products', { - root: 'apps/products', - sourceRoot: 'apps/products/src', - targets: { - test: { - executor: '@nrwl/jest:jest', - options: { - jestConfig: 'apps/products/jest.config.js', - passWithNoTests: true, - }, - }, - }, - }); - - addProjectConfiguration(tree, 'products-2', { - root: 'apps/products-2', - sourceRoot: 'apps/products-2/src', - targets: { - test: { - executor: '@nrwl/jest:jest', - options: { - jestConfig: 'apps/products-2/jest.config.js', - passWithNoTests: true, - }, - }, - }, - }); - }); - - it('should update the jest.config files by removing ...workspacePreset for react-native apps', async () => { - await update(tree); - await formatFiles(tree); - - const jestConfig = tree.read('apps/products/jest.config.js', 'utf-8'); - expect( - format(jestConfig, { - singleQuote: true, - parser: 'typescript', - }) - ).toEqual( - `module.exports = { - resolver: '@nrwl/jest/plugins/resolver', - preset: 'react-native', -}; -` - ); - const testSetup = tree.read('apps/products/test-setup.ts', 'utf-8'); - expect( - format(testSetup, { - singleQuote: true, - parser: 'typescript', - }) - ).toEqual(`import '@testing-library/jest-native/extend-expect'; -`); - }); - - it('should not update the jest.config files ', async () => { - await update(tree); - - const jestConfig = tree.read('apps/products-2/jest.config.js', 'utf-8'); - expect(jestConfig).toEqual(`{preset: 'other'}`); - }); -}); diff --git a/packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.ts b/packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.ts index 506a98f6c57fb..d23d22b7bc67a 100644 --- a/packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.ts +++ b/packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.ts @@ -8,7 +8,6 @@ import { import { join } from 'path'; import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils'; import { JestExecutorOptions } from '@nrwl/jest/src/executors/jest/schema'; -import { getJestObject } from '@nrwl/jest/src/migrations/update-10-0-0/require-jest-config'; /** * This function update jest.config.js and test.setup.ts for react native project for Jest 27. @@ -26,7 +25,7 @@ function updateJestConfig(tree: Tree) { } const jestConfigPath = options.jestConfig; - const jestConfig = getJestObject(join(tree.root, jestConfigPath)); + const jestConfig = require(join(tree.root, jestConfigPath)); const testEnvironment = jestConfig.testEnvironment; const preset = jestConfig.preset; diff --git a/packages/workspace/migrations.json b/packages/workspace/migrations.json index 6520785a9ef2a..d0a1c1cacafa5 100644 --- a/packages/workspace/migrations.json +++ b/packages/workspace/migrations.json @@ -41,6 +41,12 @@ "description": "Update the decorate-angular-cli script to require nx instead of @nrwl/cli", "cli": "nx", "implementation": "./src/migrations/update-13-9-0/update-decorate-cli" + }, + "13-9-0-replace-tao-and-cli-with-nx": { + "version": "13.9.0-beta.0", + "description": "Replace @nrwl/tao and @nrwl/cli with nx", + "cli": "nx", + "implementation": "./src/migrations/update-13-9-0/replace-tao-and-cli-with-nx" } }, "packageJsonUpdates": { diff --git a/packages/workspace/src/migrations/update-13-9-0/replace-tao-and-cli-with-nx.ts b/packages/workspace/src/migrations/update-13-9-0/replace-tao-and-cli-with-nx.ts new file mode 100644 index 0000000000000..a97ae97276afa --- /dev/null +++ b/packages/workspace/src/migrations/update-13-9-0/replace-tao-and-cli-with-nx.ts @@ -0,0 +1,22 @@ +import { Tree, updateJson } from '@nrwl/devkit'; + +export function replaceTaoAndCLIWithNx(host: Tree) { + updateJson(host, 'package.json', (json: any) => { + if (json.dependencies['@nrwl/workspace']) { + json.dependencies['nx'] = json.dependencies['@nrwl/workspace']; + } else if (json.devDependencices['@nrwl/workspace']) { + json.dependencies['nx'] = json.devDependencices['@nrwl/workspace']; + } + removeTaoAndCLI(json.dependencies); + removeTaoAndCLI(json.devDependencices); + return json; + }); +} + +function removeTaoAndCLI(json: any) { + if (!json) return; + json['@nrwl/tao'] = undefined; + json['@nrwl/cli1'] = undefined; +} + +export default replaceTaoAndCLIWithNx; diff --git a/packages/workspace/src/migrations/update-13-9-0/update-decorate-cli.ts b/packages/workspace/src/migrations/update-13-9-0/update-decorate-cli.ts index d5fca075a9213..eae7efc8c2562 100644 --- a/packages/workspace/src/migrations/update-13-9-0/update-decorate-cli.ts +++ b/packages/workspace/src/migrations/update-13-9-0/update-decorate-cli.ts @@ -1,7 +1,7 @@ import { Tree } from '@nrwl/devkit'; export function updateDecorateAngularCLI(host: Tree) { - const decorate = host.read('decorate-angular-cli.js').toString(); + const decorate = host.read('decorate-angular-cli.js')?.toString(); if (decorate) { host.write( 'decorate-angular-cli.js', diff --git a/scripts/depcheck/discrepancies.ts b/scripts/depcheck/discrepancies.ts index b41cd6a93c9df..a53a3a87766cc 100644 --- a/scripts/depcheck/discrepancies.ts +++ b/scripts/depcheck/discrepancies.ts @@ -13,7 +13,7 @@ export default function getDiscrepancies( devDependencies: JSON ) { return Object.keys(projectDependencies) - .filter((p) => !p.startsWith('@nrwl/')) + .filter((p) => !p.startsWith('@nrwl/') && p !== 'nx') .filter((p) => !IGNORE_MATCHES['*'].includes(p) && IGNORE_MATCHES[name] ? !IGNORE_MATCHES[name].includes(p) diff --git a/scripts/depcheck/missing.ts b/scripts/depcheck/missing.ts index dfa0d461de732..80a13c7c83603 100644 --- a/scripts/depcheck/missing.ts +++ b/scripts/depcheck/missing.ts @@ -2,7 +2,14 @@ import * as depcheck from 'depcheck'; // Ignore packages that are defined here per package const IGNORE_MATCHES = { - '*': ['nx', '@nrwl/workspace', 'prettier', 'typescript', 'dotenv'], + '*': [ + 'nx', + '@nrwl/cli', + '@nrwl/workspace', + 'prettier', + 'typescript', + 'dotenv', + ], angular: [ '@angular-devkit/architect', '@angular-devkit/build-angular', @@ -36,7 +43,7 @@ const IGNORE_MATCHES = { 'stylus', 'tailwindcss', ], - cli: ['@nrwl/cli'], + cli: ['nx'], cypress: ['cypress', '@angular-devkit/schematics', '@nrwl/cypress'], devkit: ['@angular-devkit/architect', 'rxjs'], 'eslint-plugin-nx': ['@angular-eslint/eslint-plugin'], diff --git a/yarn.lock b/yarn.lock index faef0f3e5d6ba..ba3d71311b969 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3864,26 +3864,22 @@ node-gyp "^8.2.0" read-package-json-fast "^2.0.1" -"@nrwl/cli@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-13.8.8-beta.1.tgz#4b7cf79248a6172ba153eec7e8e06435270d184e" - integrity sha512-DI1/b5vrErVZCynWOb5GGCXWovEd9givbMPuKkRs5gRkW6UFH4Dz3/MBdKuD3KWP9sRgh8cFvnmyy6kWL2kMJg== +"@nrwl/cli@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-13.9.0-beta.1.tgz#db859272cda0493a39e76121a0a202bbc43064f7" + integrity sha512-cn9SQpPqmVsY45XTkNEVTIZALHormkSTR2N8h2evi91cOdMcYdjCIA4kXX5l5JA+Ifzjipvk6q9pl3b4qBw3rg== dependencies: - "@nrwl/tao" "13.8.8-beta.1" - chalk "4.1.0" - enquirer "~2.3.6" - v8-compile-cache "2.3.0" - yargs-parser "20.0.0" + nx "13.9.0-beta.1" -"@nrwl/cypress@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-13.8.8-beta.1.tgz#112a4c72fc470daff66c6c12d81d40baf067bf56" - integrity sha512-mGZeZNi/nwNxCsyY5r+ByacFr1qwTbr9dnyXjrnk8rzJT8hqVm5J7xq298QR7sARtk9pnFV4Xk2eCd8mxNFXvg== +"@nrwl/cypress@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/cypress/-/cypress-13.9.0-beta.1.tgz#adcbcf9a8a13fb8e56b951bf2c27cf3fd0c91cbc" + integrity sha512-PDLuStrb5+hm5Yg89UTZaPU9r3UlqBe6PQVxlHOIGtpwYmOaoMyNpMck2bbq34AuWNJmRhUunh4BlaNd1RcdzA== dependencies: "@cypress/webpack-preprocessor" "^5.9.1" - "@nrwl/devkit" "13.8.8-beta.1" - "@nrwl/linter" "13.8.8-beta.1" - "@nrwl/workspace" "13.8.8-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" + "@nrwl/linter" "13.9.0-beta.1" + "@nrwl/workspace" "13.9.0-beta.1" chalk "4.1.0" enhanced-resolve "^5.8.3" fork-ts-checker-webpack-plugin "6.2.10" @@ -3894,37 +3890,37 @@ tslib "^2.3.0" webpack-node-externals "^3.0.0" -"@nrwl/devkit@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-13.8.8-beta.1.tgz#618634cf7ed1e747618e23b80efa46929f71c0bb" - integrity sha512-kYykZ91HkOyMv7AP+Qkbrm1457XBf+FyAZ0mr3p/Ljs1a7VVOauCTx5pD58Yt7CFKoQO2oVKGh7eZiJc6BBiOA== +"@nrwl/devkit@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-13.9.0-beta.1.tgz#b5923c78450e16b323427c8e6e96c53f1f927773" + integrity sha512-Y9uJjLmqIfF7E5O4fjZ2aNlFOJMzW5/FwrMhwaGry1lnk1RjCJJuztJL6bXkKjS8oKkGc90tVKBpWtrYJeXHiw== dependencies: - "@nrwl/tao" "13.8.8-beta.1" ejs "^3.1.5" ignore "^5.0.4" + nx "13.9.0-beta.1" rxjs "^6.5.4" semver "7.3.4" tslib "^2.3.0" -"@nrwl/eslint-plugin-nx@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-13.8.8-beta.1.tgz#c0858fc779ba963315842452d84000a862ff2e81" - integrity sha512-2WqJ1i36ssFqB3lNB+ZA0so3ftbR1Mvb3lqqmuDM/vw2satYK26S8WVv7qya/YrXsa8KDBsNfWyT8pqTf2GB3g== +"@nrwl/eslint-plugin-nx@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/eslint-plugin-nx/-/eslint-plugin-nx-13.9.0-beta.1.tgz#d8c12b5f293a7ab76a569e941567168cfdb7280b" + integrity sha512-3CeBVEM7otMM28YP3dDvsG24tzBfe4zMeQ5CJhRJ241+A7tv2/GYnrpJE3Ae9Stk+MGc1UQERXGFrSpkyAzpkg== dependencies: - "@nrwl/devkit" "13.8.8-beta.1" - "@nrwl/workspace" "13.8.8-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" + "@nrwl/workspace" "13.9.0-beta.1" "@typescript-eslint/experimental-utils" "~5.10.0" chalk "4.1.0" confusing-browser-globals "^1.0.9" -"@nrwl/jest@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-13.8.8-beta.1.tgz#7eecd85f6912a28b788439987f5d95ebe72e3e84" - integrity sha512-3uRVFgoYLLnTBFhkz5E2UxV10dGbpAV9HQX2uypt8Bqpkv+XsPaXcrVm105SNhOhW7gv9DLls9LUc//n8J2c4g== +"@nrwl/jest@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/jest/-/jest-13.9.0-beta.1.tgz#06723b8f2e3a3997efabce788148a21e198f4c83" + integrity sha512-ykdUxlR6vn2yQcJtgBNbYCWJGz33kX5QZxxMdOqlMzvAKH4E1yOT6D2H+vPkQVX4jZYrv25kyUmu/OvI8eV23A== dependencies: "@jest/reporters" "27.2.2" "@jest/test-result" "27.2.2" - "@nrwl/devkit" "13.8.8-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" chalk "4.1.0" identity-obj-proxy "3.0.0" jest-config "27.2.2" @@ -3934,15 +3930,15 @@ rxjs "^6.5.4" tslib "^2.3.0" -"@nrwl/js@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-13.8.8-beta.1.tgz#02fb7442a427ea7775469ea5d3188478ef396506" - integrity sha512-c0X2ovOgW7OqujC8otOA3lqLUapfvUVfnYnHNaDi6M7v/0q8ANJss0GV7whzuvHL67QsQG2Vhr0ijVTk1toE7Q== +"@nrwl/js@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/js/-/js-13.9.0-beta.1.tgz#f1907b1fadb77ecd3e28dcf5ece9e36d44817608" + integrity sha512-7gGs5pux1YTOux2MG6tbdwGhomwvGVp3yFdlWU383mH91Hg1bVq+P/Npz965Yu+yTzA4UySJ6DDbcxKUDqttTg== dependencies: - "@nrwl/devkit" "13.8.8-beta.1" - "@nrwl/jest" "13.8.8-beta.1" - "@nrwl/linter" "13.8.8-beta.1" - "@nrwl/workspace" "13.8.8-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" + "@nrwl/jest" "13.9.0-beta.1" + "@nrwl/linter" "13.9.0-beta.1" + "@nrwl/workspace" "13.9.0-beta.1" "@parcel/watcher" "2.0.4" chalk "4.1.0" fast-glob "^3.2.7" @@ -3953,30 +3949,30 @@ source-map-support "0.5.19" tree-kill "1.2.2" -"@nrwl/linter@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-13.8.8-beta.1.tgz#327b33d7ecdedb2c99911343f27f4a947343a8f5" - integrity sha512-DcNZH73xg4Njfl3oiw1YL2SUVTeQWQSytZBUIqluWkBjfQj5kAb4mq3JpJx5t/jZQvFcGdJIkwLhTO+H+EGLGg== +"@nrwl/linter@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/linter/-/linter-13.9.0-beta.1.tgz#342252716ccadd8e45afcf2473605f3f3dd58dfa" + integrity sha512-PYQ4Rm/9G6giiRAL6R7uz3vUwQYkAibpmyhZX6IQSil/ZFkaTHHBcp0a1TahmdJMlb//SNwu6A6OpR3UCo6FOw== dependencies: - "@nrwl/devkit" "13.8.8-beta.1" - "@nrwl/jest" "13.8.8-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" + "@nrwl/jest" "13.9.0-beta.1" "@phenomnomnominal/tsquery" "4.1.1" tmp "~0.2.1" tslib "^2.3.0" -"@nrwl/next@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/next/-/next-13.8.8-beta.1.tgz#4906f6838f10b1e2356b692825eec815984b142c" - integrity sha512-0j6p4UhGOMEarnaKyC0UiY9EOEX9/loEYihW0OPLJzlVTGQ2kBUeYIOkQJwl9oIGl+cMRO/76cR/mikUfyS9iQ== +"@nrwl/next@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/next/-/next-13.9.0-beta.1.tgz#cffb69d19d78523c43902b890a13aceef47e654c" + integrity sha512-FhdAlA4/qQzNaCyY4aE9+RngCPyyae+FJ3FYOILo3pToj7S/qgTmureRN2AAU5kaJlzXFTDs1vfOg0Bauabafg== dependencies: "@babel/plugin-proposal-decorators" "^7.14.5" - "@nrwl/cypress" "13.8.8-beta.1" - "@nrwl/devkit" "13.8.8-beta.1" - "@nrwl/jest" "13.8.8-beta.1" - "@nrwl/linter" "13.8.8-beta.1" - "@nrwl/react" "13.8.8-beta.1" - "@nrwl/web" "13.8.8-beta.1" - "@nrwl/workspace" "13.8.8-beta.1" + "@nrwl/cypress" "13.9.0-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" + "@nrwl/jest" "13.9.0-beta.1" + "@nrwl/linter" "13.9.0-beta.1" + "@nrwl/react" "13.9.0-beta.1" + "@nrwl/web" "13.9.0-beta.1" + "@nrwl/workspace" "13.9.0-beta.1" "@svgr/webpack" "^6.1.2" chalk "4.1.0" eslint-config-next "^12.1.0" @@ -3986,16 +3982,16 @@ url-loader "^4.1.1" webpack-merge "^5.8.0" -"@nrwl/node@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-13.8.8-beta.1.tgz#6ab9d614885a2e62329d7e82833c98395d4a7346" - integrity sha512-A0zdsSQWtwmX40ZfGUAQrjF4GF2NWwESct9Q5wXx3+BtfwLdeobPlGrEhwi9mJNgWUkk9ZcMOoPW1acaA5ozgQ== +"@nrwl/node@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/node/-/node-13.9.0-beta.1.tgz#00ff0319412ad7b6d34cae0e3602d50b374320c9" + integrity sha512-zDwZPV3rIrmOiYXozZunqM7e+H7ZWlt6x8P+PezsyLGyMVwPY701HW/T/XTcDyQdwL5DOI/TUBEEeX9ITL0FnA== dependencies: - "@nrwl/devkit" "13.8.8-beta.1" - "@nrwl/jest" "13.8.8-beta.1" - "@nrwl/js" "13.8.8-beta.1" - "@nrwl/linter" "13.8.8-beta.1" - "@nrwl/workspace" "13.8.8-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" + "@nrwl/jest" "13.9.0-beta.1" + "@nrwl/js" "13.9.0-beta.1" + "@nrwl/linter" "13.9.0-beta.1" + "@nrwl/workspace" "13.9.0-beta.1" chalk "4.1.0" copy-webpack-plugin "^9.0.1" enhanced-resolve "^5.8.3" @@ -4029,21 +4025,21 @@ strip-json-comments "^3.1.1" tar "6.1.11" -"@nrwl/react@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/react/-/react-13.8.8-beta.1.tgz#1ca5fc83fb91c80673eb50476d51ddbbbe09ba53" - integrity sha512-t5DHueOwoD6z+wRy+sez3Sc27ghu6yNVx5U+aUt2TMdKDW1KFdyVrygg7sYkrviSCmgdBA5BWZ0J9lfYgIrR9A== +"@nrwl/react@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/react/-/react-13.9.0-beta.1.tgz#b3872a29787db1f4ee76c3615b7624f6e4a1bdeb" + integrity sha512-FupE2KE71x0h7RUDfT0IHDWYapyL4KW/Wfk6uMWRInPLS9f8OYLUkJpo1KZg33aikbGAIBZxOPSsJUseRAe9FQ== dependencies: "@babel/core" "^7.15.0" "@babel/preset-react" "^7.14.5" - "@nrwl/cypress" "13.8.8-beta.1" - "@nrwl/devkit" "13.8.8-beta.1" - "@nrwl/jest" "13.8.8-beta.1" - "@nrwl/js" "13.8.8-beta.1" - "@nrwl/linter" "13.8.8-beta.1" - "@nrwl/storybook" "13.8.8-beta.1" - "@nrwl/web" "13.8.8-beta.1" - "@nrwl/workspace" "13.8.8-beta.1" + "@nrwl/cypress" "13.9.0-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" + "@nrwl/jest" "13.9.0-beta.1" + "@nrwl/js" "13.9.0-beta.1" + "@nrwl/linter" "13.9.0-beta.1" + "@nrwl/storybook" "13.9.0-beta.1" + "@nrwl/web" "13.9.0-beta.1" + "@nrwl/workspace" "13.9.0-beta.1" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.1" "@storybook/node-logger" "6.1.20" "@svgr/webpack" "^6.1.2" @@ -4058,46 +4054,31 @@ webpack "^5.58.1" webpack-merge "^5.8.0" -"@nrwl/storybook@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/storybook/-/storybook-13.8.8-beta.1.tgz#de143e723908e0fd620188cb8dbbf59e82958bee" - integrity sha512-ooE7g0fiuf+PEUQeRng3+cqPvVdxU+H6fMdoiq7jSmk57xFxp+bjpaneb+g204WvsVETQzogGk1R7Fr4yRQWcw== +"@nrwl/storybook@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/storybook/-/storybook-13.9.0-beta.1.tgz#82e98cebfdbc78c7b7425e92316589d74df7e6bf" + integrity sha512-R8tBdXQmgExBPosFUpPJxMQ79syeeTz72H5JfdGiPP05RLYkpVigvS4J1j93F2RJq9zoBkBciQB4S0bNUtdpeA== dependencies: - "@nrwl/cypress" "13.8.8-beta.1" - "@nrwl/devkit" "13.8.8-beta.1" - "@nrwl/linter" "13.8.8-beta.1" - "@nrwl/workspace" "13.8.8-beta.1" + "@nrwl/cypress" "13.9.0-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" + "@nrwl/linter" "13.9.0-beta.1" + "@nrwl/workspace" "13.9.0-beta.1" core-js "^3.6.5" semver "7.3.4" ts-loader "^9.2.6" tsconfig-paths-webpack-plugin "3.5.2" -"@nrwl/tao@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-13.8.8-beta.1.tgz#854880e687b103acfcd55425a1212d67ce9d0342" - integrity sha512-s1RZ0Yohve1pZjEXAeDz++dxy9vz2TMViKwA2Dsn6E7YJUwO4SGOnihDpTcs60uOLrhwDxg+wyM8dz4sSRiepA== +"@nrwl/tao@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-13.9.0-beta.1.tgz#c7667a73a5bc586dd485b32173d4a5fd0bccf55e" + integrity sha512-0/5u9QYg8e31J7cUt/PTD4VBD3tGHSGBQ0SuzuatWRIioSgMdwRIuw/aJPTaSNa994cxgit6Qif70/LIg4Nk1w== dependencies: - "@swc-node/register" "^1.4.2" - "@swc/core" "^1.2.146" - chalk "4.1.0" - enquirer "~2.3.6" - fast-glob "3.2.7" - fs-extra "^9.1.0" - ignore "^5.0.4" - jsonc-parser "3.0.0" - nx "13.8.8-beta.1" - rxjs "^6.5.4" - rxjs-for-await "0.0.2" - semver "7.3.4" - tmp "~0.2.1" - tsconfig-paths "^3.9.0" - tslib "^2.3.0" - yargs-parser "20.0.0" + nx "13.9.0-beta.1" -"@nrwl/web@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/web/-/web-13.8.8-beta.1.tgz#b0d713abcfc4bc9f52a596dc2726eb5feb239d0f" - integrity sha512-ME4Kc4NxfZpkLY8WwtU4n1TIaWVccGbKKPMdiibtkC0/HUl06OVSiKagsYfIVJig3OjmD/MoGzpBtuIVdhX1/w== +"@nrwl/web@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/web/-/web-13.9.0-beta.1.tgz#cafea2ea73fba65242a42d766c5888c53e5afde5" + integrity sha512-B1NvMGbSqcYiviLCvS53UxleCytE8g5msqEM0NYJHRsE52YTstRZetokqWV3ibPXD3X9Y4g1gxlBilYveAozLA== dependencies: "@babel/core" "^7.15.0" "@babel/plugin-proposal-class-properties" "^7.14.5" @@ -4107,12 +4088,12 @@ "@babel/preset-env" "^7.15.0" "@babel/preset-typescript" "^7.15.0" "@babel/runtime" "^7.14.8" - "@nrwl/cypress" "13.8.8-beta.1" - "@nrwl/devkit" "13.8.8-beta.1" - "@nrwl/jest" "13.8.8-beta.1" - "@nrwl/js" "13.8.8-beta.1" - "@nrwl/linter" "13.8.8-beta.1" - "@nrwl/workspace" "13.8.8-beta.1" + "@nrwl/cypress" "13.9.0-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" + "@nrwl/jest" "13.9.0-beta.1" + "@nrwl/js" "13.9.0-beta.1" + "@nrwl/linter" "13.9.0-beta.1" + "@nrwl/workspace" "13.9.0-beta.1" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.1" "@rollup/plugin-babel" "^5.3.0" "@rollup/plugin-commonjs" "^20.0.0" @@ -4180,15 +4161,14 @@ webpack-sources "^3.0.2" webpack-subresource-integrity "^5.1.0" -"@nrwl/workspace@13.8.8-beta.1": - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-13.8.8-beta.1.tgz#9f379479d16aec67b9da51fa56c50a509b5a8c0d" - integrity sha512-dnZQ6w/jCYz73gX6ok0s9gy+yzo9qMfLr5gK3SnKSaNR6Mg1ljwhJSLhsN7X2qF4WERNe7MKUn/AoSoQdX0aww== +"@nrwl/workspace@13.9.0-beta.1": + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-13.9.0-beta.1.tgz#1bd411755f54e116301ee8aac7ac7656b40b5154" + integrity sha512-oPQTdm0NTzn65KXwhUtHy2KliOdFDfEKW1Q0FfZ4tpsFhYwKSC1lvy1WypB4r47vnDzCU+k/sTvDC6zPlxUxsQ== dependencies: - "@nrwl/cli" "13.8.8-beta.1" - "@nrwl/devkit" "13.8.8-beta.1" - "@nrwl/jest" "13.8.8-beta.1" - "@nrwl/linter" "13.8.8-beta.1" + "@nrwl/devkit" "13.9.0-beta.1" + "@nrwl/jest" "13.9.0-beta.1" + "@nrwl/linter" "13.9.0-beta.1" "@parcel/watcher" "2.0.4" chalk "4.1.0" chokidar "^3.5.1" @@ -4203,6 +4183,7 @@ ignore "^5.0.4" minimatch "3.0.4" npm-run-path "^4.0.1" + nx "13.9.0-beta.1" open "^8.4.0" rxjs "^6.5.4" semver "7.3.4" @@ -11678,7 +11659,7 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-config-next@^12.1.0: +eslint-config-next@12.1.0, eslint-config-next@^12.1.0: version "12.1.0" resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-12.1.0.tgz#8ace680dc5207e6ab6c915f3989adec122f582e7" integrity sha512-tBhuUgoDITcdcM7xFvensi9I5WTI4dnvH4ETGRg1U8ZKpXrZsWQFdOKIDzR3RLP5HR3xXrLviaMM4c3zVoE/pA== @@ -17561,7 +17542,7 @@ next-tick@~1.0.0: resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz" integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= -next@^12.1.0: +next@12.1.0: version "12.1.0" resolved "https://registry.yarnpkg.com/next/-/next-12.1.0.tgz#c33d753b644be92fc58e06e5a214f143da61dd5d" integrity sha512-s885kWvnIlxsUFHq9UGyIyLiuD0G3BUC/xrH0CEnH5lHEWkwQcHOORgbDF0hbrW9vr/7am4ETfX4A7M6DjrE7Q== @@ -17942,12 +17923,29 @@ nwsapi@^2.2.0: resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz" integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== -nx@13.8.8-beta.1: - version "13.8.8-beta.1" - resolved "https://registry.yarnpkg.com/nx/-/nx-13.8.8-beta.1.tgz#2e989050cf6a5e9cb6b87bcd781a60550a68cbca" - integrity sha512-C7Julni4I7MbOrC6qDyRbMZs1MsMNf4gqznEgFON1SJkQ+/xlemEBVb+HpNLrjMQv97t0KYt1r9QLEi0oB/zGg== +nx@13.9.0-beta.1: + version "13.9.0-beta.1" + resolved "https://registry.yarnpkg.com/nx/-/nx-13.9.0-beta.1.tgz#f4f8edf3fe7591100218422e186876ae9f65ac14" + integrity sha512-P1YKCaP1Hbaia19XNRqE9jde4jMagQtst5BWv9olPRyp1UdNsKuJ7eAKO4/kbygmrNXa/FruD1aiUdjEv/T1Vg== dependencies: - "@nrwl/cli" "13.8.8-beta.1" + "@nrwl/cli" "13.9.0-beta.1" + "@nrwl/tao" "13.9.0-beta.1" + "@swc-node/register" "^1.4.2" + "@swc/core" "^1.2.146" + chalk "4.1.0" + enquirer "~2.3.6" + fast-glob "3.2.7" + fs-extra "^9.1.0" + ignore "^5.0.4" + jsonc-parser "3.0.0" + rxjs "^6.5.4" + rxjs-for-await "0.0.2" + semver "7.3.4" + tmp "~0.2.1" + tsconfig-paths "^3.9.0" + tslib "^2.3.0" + v8-compile-cache "2.3.0" + yargs-parser "20.0.0" oauth-sign@~0.9.0: version "0.9.0"