Skip to content

Commit

Permalink
upgrade to Angular v15 ang GrapesJS v0.20.4
Browse files Browse the repository at this point in the history
  • Loading branch information
iklimisdev committed Mar 30, 2023
1 parent fa45d8d commit 39e1ff7
Show file tree
Hide file tree
Showing 9 changed files with 10,674 additions and 10,174 deletions.
8 changes: 8 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,13 @@
}
}
}
},
"schematics": {
"@angular-eslint/schematics:application": {
"setParserOptionsProject": true
},
"@angular-eslint/schematics:library": {
"setParserOptionsProject": true
}
}
}
20,755 changes: 10,635 additions & 10,120 deletions package-lock.json

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,37 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^14.2.1",
"@angular/common": "^14.2.1",
"@angular/compiler": "^14.2.1",
"@angular/core": "^14.2.1",
"@angular/forms": "^14.2.1",
"@angular/platform-browser": "^14.2.1",
"@angular/platform-browser-dynamic": "^14.2.1",
"@angular/router": "^14.2.1",
"grapesjs": "^0.17.29",
"@angular/animations": "^15.2.5",
"@angular/common": "^15.2.5",
"@angular/compiler": "^15.2.5",
"@angular/core": "^15.2.5",
"@angular/forms": "^15.2.5",
"@angular/platform-browser": "^15.2.5",
"@angular/platform-browser-dynamic": "^15.2.5",
"@angular/router": "^15.2.5",
"grapesjs": "^0.20.4",
"grapesjs-preset-newsletter": "^0.2.21",
"grapesjs-preset-webpage": "^0.1.11",
"rxjs": "~7.4.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^14.2.2",
"@angular-eslint/builder": "14.0.4",
"@angular-eslint/eslint-plugin": "14.0.4",
"@angular-eslint/eslint-plugin-template": "14.0.4",
"@angular-eslint/schematics": "14.0.4",
"@angular-eslint/template-parser": "14.0.4",
"@angular/cli": "^14.2.2",
"@angular/compiler-cli": "^14.2.1",
"@angular-devkit/build-angular": "^15.2.4",
"@angular-eslint/builder": "15.2.1",
"@angular-eslint/eslint-plugin": "15.2.1",
"@angular-eslint/eslint-plugin-template": "15.2.1",
"@angular-eslint/schematics": "15.2.1",
"@angular-eslint/template-parser": "15.2.1",
"@angular/cli": "^15.2.4",
"@angular/compiler-cli": "^15.2.5",
"@babel/eslint-plugin": "^7.16.5",
"@types/jasmine": "~3.10.0",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "^5.36.2",
"@typescript-eslint/parser": "^5.36.2",
"@typescript-eslint/eslint-plugin": "^5.43.0",
"@typescript-eslint/parser": "^5.43.0",
"copyfiles": "^2.4.1",
"eslint": "^8.23.0",
"eslint": "^8.28.0",
"eslint-plugin-deprecation": "^1.3.2",
"eslint-plugin-import": "^2.25.3",
"husky": "^7.0.4",
Expand All @@ -52,7 +52,7 @@
"karma-coverage": "~2.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"ng-packagr": "^14.2.1",
"ng-packagr": "^15.2.2",
"typescript": "~4.8.3"
}
}
12 changes: 0 additions & 12 deletions projects/demo-editor/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,8 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
<T>(id: string): T;
keys(): string[];
};
};

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting(),
);

// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
6 changes: 3 additions & 3 deletions projects/ngx-grapesjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"release:major": "standard-version --release-as major --tag-prefix="
},
"peerDependencies": {
"@angular/common": "^14.0.0",
"@angular/core": "^14.0.0",
"grapesjs": "^0.17.29",
"@angular/common": "^15.0.0",
"@angular/core": "^15.0.0",
"grapesjs": "^0.20.4",
"grapesjs-preset-newsletter": "^0.2.21",
"grapesjs-preset-webpage": "^0.1.11"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ export class NgxNewsletterEditorComponent extends NgxEditorComponent implements
private editor: NewsletterEditor | undefined;
private newsletterConfig: Partial<NewsletterConfig> = {
container: '#gjs',
plugins: ['gjs-preset-newsletter'],
plugins: ['grapesjs-preset-newsletter'],
pluginsOpts: {
'gjs-preset-newsletter': {
'grapesjs-preset-newsletter': {
modalTitleImport: 'Import template'
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ export class NgxWebpageEditorComponent extends NgxEditorComponent implements OnI

private webpageConfig: Partial<Config> = {
container: '#gjs',
plugins: ['gjs-preset-webpage'],
plugins: ['grapesjs-preset-webpage'],
pluginsOpts: {
'gjs-preset-webpage': {
'grapesjs-preset-webpage': {
modalTitleImport: 'Import template'
}
}
Expand Down
12 changes: 0 additions & 12 deletions projects/ngx-grapesjs/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,8 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';

declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
<T>(id: string): T;
keys(): string[];
};
};

// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting()
);

// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);
5 changes: 3 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2020",
"target": "ES2022",
"module": "es2020",
"lib": [
"es2020",
"dom"
]
],
"useDefineForClassFields": false
},
"angularCompilerOptions": {
"enableI18nLegacyMessageIdFormat": false,
Expand Down

0 comments on commit 39e1ff7

Please sign in to comment.