diff --git a/package.json b/package.json index 847ae110f6..bf2ce974cb 100644 --- a/package.json +++ b/package.json @@ -186,8 +186,7 @@ "ngrx-store-freeze": "0.2.4", "node-watch": "0.7.0", "npm-run-all": "^4.1.5", - "open": "6.4.0", - "opn": "^5.3.0", + "open": "^7.4.2", "parse-markdown-links": "^1.0.4", "parse5": "4.0.0", "postcss": "8.2.4", diff --git a/packages/web/package.json b/packages/web/package.json index 540ffab481..ef0069545c 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -77,8 +77,7 @@ "mini-css-extract-plugin": "0.8.0", "minimatch": "3.0.4", "parse5": "4.0.0", - "open": "6.4.0", - "opn": "^5.3.0", + "open": "^7.4.2", "postcss": "8.2.4", "postcss-import": "14.0.0", "postcss-loader": "4.2.0", diff --git a/packages/web/src/utils/devserver.config.spec.ts b/packages/web/src/utils/devserver.config.spec.ts index e663e1fa95..d9e54ddc2a 100644 --- a/packages/web/src/utils/devserver.config.spec.ts +++ b/packages/web/src/utils/devserver.config.spec.ts @@ -9,8 +9,9 @@ import { join } from 'path'; jest.mock('tsconfig-paths-webpack-plugin'); import ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); import { logger } from '@nrwl/devkit'; -jest.mock('opn'); -import * as opn from 'opn'; +import open = require('open'); + +jest.mock('open'); describe('getDevServerConfig', () => { let buildInput: WebBuildBuilderOptions; @@ -135,7 +136,6 @@ describe('getDevServerConfig', () => { }; spyOn(logger, 'info'); - opn.mockImplementation(() => {}); }); it('should print out the URL of the server', () => { @@ -163,7 +163,7 @@ describe('getDevServerConfig', () => { result.onListening(mockServer); - expect(opn).not.toHaveBeenCalled(); + expect(open).not.toHaveBeenCalled(); }); it('should open the url if --open is passed', () => { @@ -177,9 +177,7 @@ describe('getDevServerConfig', () => { result.onListening(mockServer); - expect(opn).toHaveBeenCalledWith('http://example.com:9999/', { - wait: false, - }); + expect(open).toHaveBeenCalledWith('http://example.com:9999/'); }); }); }); diff --git a/packages/web/src/utils/devserver.config.ts b/packages/web/src/utils/devserver.config.ts index 3ec224403c..5807ad49a3 100644 --- a/packages/web/src/utils/devserver.config.ts +++ b/packages/web/src/utils/devserver.config.ts @@ -1,7 +1,7 @@ import { logger } from '@nrwl/devkit'; import { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server'; -import * as opn from 'opn'; +import * as open from 'open'; import * as url from 'url'; import { readFileSync } from 'fs'; import * as path from 'path'; @@ -68,9 +68,7 @@ function getDevServerPartial( logger.info(`NX Web Development Server is listening at ${serverUrl}`); if (options.open) { - opn(serverUrl, { - wait: false, - }); + open(serverUrl); } }, stats: false, diff --git a/packages/workspace/package.json b/packages/workspace/package.json index c20560d1ca..829ff4577e 100644 --- a/packages/workspace/package.json +++ b/packages/workspace/package.json @@ -63,7 +63,7 @@ "dotenv": "8.2.0", "ignore": "^5.0.4", "npm-run-all": "^4.1.5", - "opn": "^5.3.0", + "open": "^7.4.2", "rxjs": "^6.5.4", "semver": "7.3.4", "strip-json-comments": "2.0.1", diff --git a/packages/workspace/src/command-line/dep-graph.ts b/packages/workspace/src/command-line/dep-graph.ts index 135f3b2b71..a9b7f29500 100644 --- a/packages/workspace/src/command-line/dep-graph.ts +++ b/packages/workspace/src/command-line/dep-graph.ts @@ -1,7 +1,7 @@ import { exists, readFile, readFileSync, statSync, writeFileSync } from 'fs'; import { copySync } from 'fs-extra'; import * as http from 'http'; -import * as opn from 'opn'; +import * as open from 'open'; import { join, normalize, parse, dirname } from 'path'; import { ensureDirSync } from 'fs-extra'; import * as url from 'url'; @@ -331,7 +331,5 @@ function startServer(html: string, host: string, port = 4211) { title: `Dep graph started at http://${host}:${port}`, }); - opn(`http://${host}:${port}`, { - wait: false, - }); + open(`http://${host}:${port}`); } diff --git a/yarn.lock b/yarn.lock index a336dc5dcc..50e225df88 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16196,7 +16196,7 @@ open@7.4.0: is-docker "^2.0.0" is-wsl "^2.1.1" -open@^7.0.2, open@^7.0.3: +open@^7.0.2, open@^7.0.3, open@^7.4.2: version "7.4.2" resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==