Skip to content

Commit b5cda49

Browse files
INT-3274: Upgrade to Angular 17 (#367)
* INT-3274: Updated bug_report template * INT-3274: Updated deps to Angular 17 and fixed tests * INT-3274: Added new storybook dependencies * INT-3274: Added angular.json for storybook compat * INT-3274: Added .browserslistrc * INT-3274: Migrated stories to new v7 storybook format * INT-3274: Added `preinstall` back * INT-3274: Eslint fix * INT-3274: Moved target change to storybook specific tsconfig, and put back comment * INT-3274: Reverted unnecessary format * INT-3274: Edited comment * INT-3274: Trimmed out unnecessary builds and props from `angular.json` * INT-3274: Add gh-pages for storybook deployment * INT-3274: Patch angular update * INT-3274: Removed old tslint ignore * INT-3274: Fix rxjs deprecated usage * INT-3274: Recreated yarn.lock * INT:3274: Use node v20 for Jenkins CI * INT-3274: Disable storybook telemetry * INT-3274: Removed react dev dependencies * INT-3274: Added react and react-dom back as they're peer dependencies of storybook addons * INT-3274: Fixed storybook warnings about included unused imports * INT-3274: Upgrade dependencies * INT-3274: Added changelog entries * INT-3274: Updated issue template code sandbox * INT-3274: Remove zone.js-11 dependency * INT-3274: Use waluigi v7 * INT-3274: Bumb minor version * INT-3274: Added publish step back again * INT-3274: Add testContainer arg * INT-3274: Add "yarn build" step * INT-2974: Support OnPush change detection (#368) * INT-2974: Now uses OnPush change detection * INT-2974: Added a story to show support for OnPush change detection form/parent element * INT-2974: Added changelog entry * INT-3274: Bumb patch version As feature/INT-2974 used 7.1.0-rc tag already * INT-3274: rc.2 * INT-3274: Change `6-dev` loading test to use `6` instead * INT-3274: Refactored to `isObserved` fn * INT-3274: Simplified the ScriptLoader to use plain rxjs --------- Co-authored-by: Andrew Herron <[email protected]>
1 parent 20c1991 commit b5cda49

32 files changed

+9446
-11191
lines changed

.browserslistrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
>0.2%
2+
not dead
3+
not ie > 0
4+
not op_mini all

.eslintrc.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,8 @@
4343
"semi": "error"
4444
}
4545
}
46+
],
47+
"extends": [
48+
"plugin:storybook/recommended"
4649
]
47-
}
50+
}

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ assignees: ''
99

1010
**What is the current behavior?**
1111

12-
**Please provide the steps to reproduce and if possible a minimal demo of the problem via [codesandbox.io](https://codesandbox.io/s/6zlmmkkk1n?fontsize=14) or similar.**
12+
**Please provide the steps to reproduce and if possible a minimal demo of the problem via [codesandbox.io](https://codesandbox.io/p/sandbox/elegant-pare-6sxwqz?file=src/app/app.component.ts) or similar.**
1313

1414
**What is the expected behavior?**
1515

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
/node_modules
1010
/out*
1111
/.angular/cache
12+
storybook-static

.storybook/main.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

.storybook/main.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import type { StorybookConfig } from "@storybook/angular";
2+
3+
const config: StorybookConfig = {
4+
stories: [
5+
"../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)",
6+
],
7+
addons: [
8+
"@storybook/addon-links",
9+
"@storybook/addon-essentials",
10+
"@storybook/addon-interactions",
11+
],
12+
framework: {
13+
name: "@storybook/angular",
14+
options: {},
15+
},
16+
docs: {
17+
autodocs: "tag",
18+
},
19+
core: {
20+
disableTelemetry: true
21+
}
22+
};
23+
export default config;

.storybook/preview.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import type { Preview } from "@storybook/angular";
2+
3+
const preview: Preview = {
4+
parameters: {
5+
actions: { argTypesRegex: "^on[A-Z].*" },
6+
controls: {
7+
matchers: {
8+
color: /(background|color)$/i,
9+
date: /Date$/i,
10+
},
11+
},
12+
},
13+
};
14+
15+
export default preview;

.storybook/tsconfig.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
// Since it throws an error:
66
// ERROR TS2536: Type 'K' cannot be used to index type 'HTMLElementTagNameMap'.
77
// ERROR in @ephox/sugar/lib/main/ts/ephox/sugar/api/dom/Replication.d.ts
8-
"skipLibCheck": true
9-
}
8+
"skipLibCheck": true,
9+
"types": ["node"],
10+
"allowSyntheticDefaultImports": true,
11+
"resolveJsonModule": true,
12+
"target": "ES2022"
13+
},
14+
"include": ["../stories/**/*.ts", "./preview.ts"]
1015
}

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## Unreleased
8+
9+
## 7.1.1 - 2024-04-04
810
### Fixed
911
- Updated CI library to latest
12+
- Updated dependencies. #INT-3274
13+
- Usage of RxJS deprecated operators. #INT-3274
14+
### Added
15+
- Support for Angular 15, 16 & 17. #INT-3274
16+
- Support for the OnPush change detection strategy. #INT-2974
17+
### Improved
18+
- Updated Storybook to v8, as well as now using CSFv3 components. #INT-3274
1019

1120
## 7.0.0 - 2022-06-27
1221
### Added

Jenkinsfile

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
11
#!groovy
22
@Library('waluigi@release/7') _
33

4-
beehiveFlowBuild(
5-
container: [
6-
tag: '18',
7-
resourceRequestMemory: '4Gi',
8-
resourceLimitCpu: '4',
9-
resourceLimitMemory: '4Gi'
10-
],
11-
test: {
12-
bedrockBrowsers(testDirs: [ "tinymce-angular-component/src/test/ts/browser" ])
13-
},
14-
customSteps: {
15-
stage("storybook") {
16-
def status = beehiveFlowStatus();
17-
if (status.branchState == 'releaseReady' && status.isLatest) {
18-
sshagent (credentials: ['ccde5b3d-cf13-4d70-88cf-ae1e6dfd4ef4']) {
19-
sh 'yarn storybook-to-ghpages'
20-
}
21-
} else {
22-
echo "Skipping publish as is not latest release"
23-
sh 'yarn storybook-to-ghpages --dry-run'
4+
mixedBeehiveFlow(
5+
testPrefix: 'Tiny-Angular',
6+
testDirs: [ "tinymce-angular-component/src/test/ts/browser" ],
7+
platforms: [
8+
[ browser: 'chrome', headless: true ],
9+
[ browser: 'firefox', provider: 'aws', buckets: 1 ],
10+
[ browser: 'safari', provider: 'lambdatest', os: 'macOS Sonoma', buckets: 1 ]
11+
],
12+
testContainer: [
13+
tag: '20',
14+
resourceRequestMemory: '4Gi',
15+
resourceLimitCpu: '4',
16+
resourceLimitMemory: '4Gi'
17+
],
18+
customSteps: {
19+
stage("storybook") {
20+
def status = beehiveFlowStatus()
21+
if (status.branchState == 'releaseReady' && status.isLatest) {
22+
sshagent (credentials: ['3e856116-029e-4c8d-b57d-593b2fba3cb2']) {
23+
exec('yarn storybook-to-ghpages')
2424
}
25+
} else {
26+
echo "Skipping as is not latest release"
2527
}
26-
},
27-
publish: {
28-
tinyNpm.withNpmPublishCredentials('dist/tinymce-angular') {
29-
sh "yarn beehive-flow publish --working-dir dist/tinymce-angular"
30-
}
3128
}
29+
},
30+
publish: {
31+
sh "yarn build"
32+
tinyNpm.withNpmPublishCredentials('dist/tinymce-angular') {
33+
sh "yarn beehive-flow publish --working-dir dist/tinymce-angular"
34+
}
35+
}
3236
)

0 commit comments

Comments
 (0)