Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"forwardPorts": [8080],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "yarn install"
"postCreateCommand": "npm install"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After removing the prepare script, this should become npm install && npm run build


// Configure tool-specific properties.
// "customizations": {},
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: '24'
- name: Update npm
run: npm install -g npm@latest

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this necessary? If yes, shall we pin the version number?

- name: Install
run: yarn
run: npm ci
env:
NODE_ENV: development
- name: Build
run: yarn build
run: npm run build
- name: Lint
run: yarn lint
run: npm run lint
- name: Test
run: yarn test
run: npm test
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"eslint.packageManager": "yarn",
"eslint.packageManager": "npm",
"search.exclude": {
"**/node_modules": true,
"**/lib": true,
Expand Down
4 changes: 2 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
"label": "Build Sprotty",
"type": "shell",
"command": "yarn",
"command": "npm install",
"group": "build",
"presentation": {
"focus": false,
Expand All @@ -22,7 +22,7 @@
{
"label": "Watch Sprotty",
"type": "shell",
"command": "yarn watch",
"command": "npm run watch",
"group": "none",
"presentation": {
"focus": false,
Expand Down
7 changes: 1 addition & 6 deletions examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,11 @@
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4"
},
"volta": {
"node": "18.19.0",
"yarn": "1.22.21"
},
"scripts": {
"prepare": "yarn run build",
"clean": "shx rm -fr lib artifacts *.tsbuildinfo",
"compile": "tsc -b tsconfig.json",
"build": "webpack && npm run compile",
"watch": "yarn run watch:browser",
"watch": "npm run watch:browser",
"watch:browser": "webpack --watch",
"watch:server": "tsc -w",
"start": "node ./lib/server/server-app"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "1.4.0",
"npmClient": "yarn",
"npmClient": "npm",
"command": {
"run": {
"stream": true
Expand Down
Loading
Loading