Skip to content

Commit a0b7e3b

Browse files
committed
build: switch to webpack bundles for client and server
Remove leading `package/` from project names Update `eslintrc.json` files across all projects to only apply tslint settings to ts files. Formatting changes Replace builders for `client` and `server` projects with nx webpack executor, including webpack config. update `.vscodeignore` to use bundled files instead of whole `node_modules` folder.
1 parent 7081398 commit a0b7e3b

19 files changed

+9265
-252
lines changed

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
66
"https://json.schemastore.org/github-workflow.json": "file:///d%3A/stuart/Documents/Cortex%20Command%20Community%20Project/Cortex-Command-Community-Project-VSCode-Extension/%2Cgithub/workflows/release.yaml"
77
},
8+
"editor.defaultFormatter": "esbenp.prettier-vscode"
89
}

.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"tasks": [
44
{
55
"type": "shell",
6-
"command": "npx nx build packages/syntaxes",
6+
"command": "npx nx build syntaxes",
77
"label": "build_syntaxes",
88
"problemMatcher": ["$tsc"]
99
},
1010
{
1111
"type": "shell",
1212
"label": "watch",
1313
"isBackground": true,
14-
"command": "npx nx affected --target=build --exclude=packages/syntaxes -- --watch",
14+
"command": "npx nx affected --target=build --exclude=syntaxes -- --watch",
1515
"group": {
1616
"kind": "build",
1717
"isDefault": true

.vscodeignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
*
22
**/*
33

4-
!node_modules
4+
!node_modules/vscode-languageserver-types
55
!dist
66
!docs
77
!CHANGELOG.md

babel.config.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"babelrcRoots": ["*"]
3+
}

nx.json

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,37 @@
44
"default": {
55
"runner": "@nrwl/nx-cloud",
66
"options": {
7-
"cacheableOperations": [
8-
"build",
9-
"lint",
10-
"test",
11-
"e2e"
12-
],
7+
"cacheableOperations": ["build", "lint", "test", "e2e"],
138
"accessToken": "MzZlZTRmZGMtYTI3Ny00NmIxLThlNjctMmZhM2E3MGM4ZDcwfHJlYWQtd3JpdGU="
149
}
1510
}
1611
},
1712
"defaultBase": "main",
1813
"targetDefaults": {
1914
"test": {
20-
"inputs": [
21-
"default",
22-
"^default",
23-
"{workspaceRoot}/jest.preset.js"
24-
]
15+
"inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"]
2516
},
2617
"lint": {
27-
"inputs": [
28-
"default",
29-
"{workspaceRoot}/.eslintrc.json"
30-
]
18+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
3119
},
3220
"build": {
33-
"dependsOn": [
34-
"^build"
35-
]
21+
"dependsOn": ["^build"]
3622
}
3723
},
3824
"workspaceLayout": {
3925
"libsDir": "packages"
26+
},
27+
"generators": {
28+
"@nrwl/web:application": {
29+
"style": "scss",
30+
"linter": "eslint",
31+
"unitTestRunner": "jest",
32+
"e2eTestRunner": "cypress"
33+
},
34+
"@nrwl/web:library": {
35+
"style": "scss",
36+
"linter": "eslint",
37+
"unitTestRunner": "jest"
38+
}
4039
}
41-
}
40+
}

0 commit comments

Comments
 (0)