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 .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '18'
node-version: '22'
- uses: ./.github/actions/build
2 changes: 1 addition & 1 deletion .github/workflows/prepare_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: setup node
uses: actions/setup-node@v2
with:
node-version: '18'
node-version: '22'
- name: update changelog
run: |
export NEXT_VERSION_V=${{ needs.check.outputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '18'
node-version: '22'
- uses: ./.github/actions/build

- name: Get version from tag
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]
### Changed
- Updated all dependencies (Angular 17 -> 20)

## [1.8.2] 2025-09-28
### Added
- Added Array Widget
Expand Down
4 changes: 2 additions & 2 deletions common/src/require.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ if (typeof window !== 'undefined' &&
const pathPath = globalThis['doesNotMatter'] ? 'path' : 'path';

// Regular nodejs
fsPromise = import(fsPath);
pathPromise = import(pathPath);
fsPromise = import( /* @vite-ignore */ fsPath);
pathPromise = import( /* @vite-ignore */ pathPath);
} else {
// Not a supported plattform. Return dummy, do not fail on execute of the lambda.
fsPromise = Promise.resolve((() => new Proxy({}, {
Expand Down
74 changes: 51 additions & 23 deletions webapp/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,23 @@
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular/build:application",
"options": {
"allowedCommonJsDependencies": ["earcut", "jsoneditor"],
"outputPath": "distAngular",
"allowedCommonJsDependencies": [
"earcut",
"jsoneditor"
],
"externalDependencies": [
"electron"
],
"outputPath": {
"base": "distAngular"
},
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"polyfills": [
"src/polyfills.ts"
],
"assets": [
"src/assets",
"src/favicon.ico"
Expand All @@ -31,12 +40,11 @@
},
"scripts": [],
"aot": true,
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": true,
"sourceMap": true,
"optimization": false,
"namedChunks": true
"namedChunks": true,
"browser": "src/main.ts"
},
"configurations": {
"production": {
Expand All @@ -46,8 +54,6 @@
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
Expand All @@ -58,24 +64,24 @@
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"buildTarget": "map-editor:build"
"builder": "@angular/build:dev-server",
"options": {
"buildTarget": "map-editor:build"
},
"configurations": {
"production": {
"buildTarget": "map-editor:build:production"
"production": {
"buildTarget": "map-editor:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"buildTarget": "map-editor:build"
"builder": "@angular/build:extract-i18n",
"options": {
"buildTarget": "map-editor:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"builder": "@angular/build:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
Expand All @@ -100,20 +106,42 @@
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["src/**/*.ts"],
"lintFilePatterns": [
"src/**/*.ts"
],
"eslintConfig": "./.eslintrc.json"
}
}
}
}
},
},
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"style": "scss"
"style": "scss",
"type": "component"
},
"@schematics/angular:directive": {
"prefix": "app"
"prefix": "app",
"type": "directive"
},
"@schematics/angular:service": {
"type": "service"
},
"@schematics/angular:guard": {
"typeSeparator": "."
},
"@schematics/angular:interceptor": {
"typeSeparator": "."
},
"@schematics/angular:module": {
"typeSeparator": "."
},
"@schematics/angular:pipe": {
"typeSeparator": "."
},
"@schematics/angular:resolver": {
"typeSeparator": "."
}
},
"cli": {
Expand Down
2 changes: 1 addition & 1 deletion webapp/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = function (config) {
require('karma-phantomjs-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma')

],
client:{
clearContext: false // leave Jasmine Spec Runner output visible in browser
Expand Down
9 changes: 4 additions & 5 deletions webapp/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ const windowStateKeeper = require('electron-window-state');
const path = require('path');
const url = require('url');
const {autoUpdater} = require('electron-updater');
const contextMenu = require('electron-context-menu');
const {IPC} = require('node-ipc');

const contextMenu = require('electron-context-menu').default;
const IPC = require("@achrinza/node-ipc").default;
// Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the JavaScript object is garbage collected.
const args = process.argv.slice(1);
Expand Down Expand Up @@ -110,7 +109,7 @@ app.on('window-all-closed', () => {
});


const sub = new IPC();
const sub = new IPC.IPC();
sub.config.silent = true;
sub.config.maxRetries = 1;
sub.connectTo('crosscode-map-editor', () => {
Expand All @@ -121,7 +120,7 @@ sub.connectTo('crosscode-map-editor', () => {
sub.of['crosscode-map-editor'].on('error', () => {
sub.disconnect('crosscode-map-editor');

const master = new IPC();
const master = new IPC.IPC();
master.config.silent = true;
master.config.id = 'crosscode-map-editor';
master.serve(() => {
Expand Down
Loading
Loading