Skip to content

Commit

Permalink
chore: update nx
Browse files Browse the repository at this point in the history
  • Loading branch information
FrozenPandaz committed Apr 20, 2021
1 parent b6f3156 commit 884f889
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 105 deletions.
2 changes: 1 addition & 1 deletion app/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"@angular/forms": "^11.2.0",
"@angular/platform-browser": "^11.2.0",
"@angular/platform-browser-dynamic": "^11.2.0",
"@nrwl/workspace": "^11.1.5",
"@nrwl/workspace": "^11.6.3",
"@types/autoprefixer": "^9.7.2",
"@types/jest": "^26.0.16",
"@webcomponents/custom-elements": "^1.4.3",
Expand Down
1 change: 1 addition & 0 deletions app/angular/src/server/angular-read-workspace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const readAngularWorkspaceConfig = async (

const nxWorkspace = require('@nrwl/workspace').readWorkspaceConfig({
format: 'angularCli',
path: dirToSearch,
});

// Use the workspace version of nx when angular looks for the angular.json file
Expand Down
4 changes: 4 additions & 0 deletions lib/core-server/src/core-presets.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@ import { executor as managerExecutor } from './manager/builder';
import { buildDevStandalone } from './build-dev';
import { buildStaticStandalone } from './build-static';

// nx-ignore-next-line
import reactOptions from '../../../app/react/src/server/options';
// nx-ignore-next-line
import vue3Options from '../../../app/vue3/src/server/options';
// nx-ignore-next-line
import htmlOptions from '../../../app/html/src/server/options';
// nx-ignore-next-line
import webComponentsOptions from '../../../app/web-components/src/server/options';
import { outputStats } from './utils/output-stats';

Expand Down
6 changes: 2 additions & 4 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
{
"npmScope": "storybook",
"implicitDependencies": {
"workspace.json": "*",
"package.json": {
"dependencies": "*",
"devDependencies": "*"
},
"nx.json": "*"
}
},
"tasksRunnerOptions": {
"default": {
Expand Down Expand Up @@ -302,4 +300,4 @@
"affected": {
"defaultBase": "next"
}
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@
"@compodoc/compodoc": "^1.1.11",
"@emotion/snapshot-serializer": "^0.8.2",
"@nicolo-ribaudo/chokidar-2": "^2.1.8",
"@nrwl/cli": "^11.6.1",
"@nrwl/nx-cloud": "^11.2.0",
"@nrwl/tao": "^11.6.1",
"@nrwl/workspace": "^11.6.1",
"@nrwl/cli": "12.0.7",
"@nrwl/nx-cloud": "11.2.0",
"@nrwl/tao": "12.0.7",
"@nrwl/workspace": "12.0.7",
"@storybook/addon-a11y": "workspace:*",
"@storybook/addon-actions": "workspace:*",
"@storybook/addon-backgrounds": "workspace:*",
Expand Down
Loading

0 comments on commit 884f889

Please sign in to comment.