Skip to content

Commit 43159f1

Browse files
INT-3396: Maintenance (#466)
* Remove unnecessary dependencies for storybook * Fix tests * Upgrade storybook to v10 * reorder properties in package.json * Format eslint config
1 parent 346c355 commit 43159f1

4 files changed

Lines changed: 518 additions & 698 deletions

File tree

.storybook/main.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,14 @@ const config: StorybookConfig = {
44
stories: [
55
"../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)",
66
],
7-
addons: [
8-
"@storybook/addon-links",
9-
"@storybook/addon-essentials",
10-
"@storybook/addon-interactions",
11-
],
7+
8+
addons: ["@storybook/addon-links", "@storybook/addon-docs"],
9+
1210
framework: {
1311
name: "@storybook/angular",
1412
options: {},
1513
},
16-
docs: {
17-
autodocs: "tag",
18-
},
14+
1915
core: {
2016
disableTelemetry: true
2117
}

eslint.config.mjs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import storybook from 'eslint-plugin-storybook';
2+
13
// eslint.config.js
24
import { defineConfig } from 'eslint/config';
35
import tinymceEslintPlugin from '@tinymce/eslint-plugin';
@@ -6,11 +8,11 @@ import js from '@eslint/js';
68
import pluginChaiFriendly from 'eslint-plugin-chai-friendly';
79

810
export default defineConfig([
9-
{
11+
{
1012
plugins: {
11-
'@tinymce': tinymceEslintPlugin
13+
'@tinymce': tinymceEslintPlugin
1214
},
13-
extends: [ '@tinymce/standard' ],
15+
extends: ['@tinymce/standard'],
1416
files: [
1517
'tinymce-angular-component/src/**/*.ts',
1618
'stories/**/*.ts'
@@ -22,7 +24,7 @@ export default defineConfig([
2224
parserOptions: {
2325
sourceType: 'module',
2426
project: [
25-
'./tsconfig.json'
27+
'./tsconfig.json'
2628
]
2729
},
2830
},
@@ -42,7 +44,7 @@ export default defineConfig([
4244
browser: true
4345
},
4446
plugins: { js },
45-
extends: [ 'js/recommended' ],
47+
extends: ['js/recommended'],
4648
parser: 'espree',
4749
languageOptions: {
4850
parserOptions: {
@@ -51,11 +53,11 @@ export default defineConfig([
5153
},
5254
},
5355
rules: {
54-
'indent': [ 'error', 2, { 'SwitchCase': 1 } ],
56+
'indent': ['error', 2, { 'SwitchCase': 1 }],
5557
'no-shadow': 'error',
56-
'no-unused-vars': [ 'error', { 'argsIgnorePattern': '^_' } ],
57-
'object-curly-spacing': [ 'error', 'always', { 'arraysInObjects': false, 'objectsInObjects': false } ],
58-
'quotes': [ 'error', 'single' ],
58+
'no-unused-vars': ['error', { 'argsIgnorePattern': '^_' }],
59+
'object-curly-spacing': ['error', 'always', { 'arraysInObjects': false, 'objectsInObjects': false }],
60+
'quotes': ['error', 'single'],
5961
'semi': 'error'
6062
}
6163
},
@@ -73,5 +75,6 @@ export default defineConfig([
7375
'max-classes-per-file': 'off',
7476
'@typescript-eslint/no-non-null-assertion': 'off'
7577
}
76-
}
78+
},
79+
...storybook.configs['flat/recommended']
7780
]);

package.json

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
{
2+
"name": "@tinymce/tinymce-angular",
3+
"version": "9.1.2-rc",
4+
"private": true,
25
"description": "Official TinyMCE Angular Component",
3-
"author": "Ephox Corporation DBA Tiny Technologies, Inc.",
46
"license": "MIT",
7+
"author": "Ephox Corporation DBA Tiny Technologies, Inc.",
58
"scripts": {
6-
"preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('You must use Yarn to install, not NPM')\"",
7-
"test": "yarn bedrock-auto -b chrome-headless -f tinymce-angular-component/src/test/ts/browser/*Test.ts",
8-
"test-manual": "bedrock -f tinymce-angular-component/src/test/ts/**/*Test.ts",
9+
"build": "yarn run clean && ng-packagr -p tinymce-angular-component/ng-package.json && json -I -f dist/tinymce-angular/package.json -e 'this.version=process.env.npm_package_version' && copyfiles README.md dist/tinymce-angular/",
10+
"build-storybook": "ng run angular:build-storybook",
911
"clean": "yarn rimraf dist",
12+
"deploy-storybook": "yarn build-storybook && gh-pages -d ./storybook-static -u 'tiny-bot <no-reply@tiny.cloud>'",
13+
"preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('You must use Yarn to install, not NPM')\"",
1014
"lint": "eslint tinymce-angular-component/src/**/*.ts stories/**/*.ts",
11-
"build": "yarn run clean && ng-packagr -p tinymce-angular-component/ng-package.json && json -I -f dist/tinymce-angular/package.json -e 'this.version=process.env.npm_package_version' && copyfiles README.md dist/tinymce-angular/",
1215
"storybook": "ng run angular:storybook",
13-
"build-storybook": "ng run angular:build-storybook",
14-
"deploy-storybook": "yarn build-storybook && gh-pages -d ./storybook-static -u 'tiny-bot <no-reply@tiny.cloud>'"
16+
"test": "yarn bedrock-auto -b chrome-headless -f tinymce-angular-component/src/test/ts/browser/*Test.ts",
17+
"test-manual": "bedrock -f tinymce-angular-component/src/test/ts/**/*Test.ts"
1518
},
16-
"private": true,
1719
"devDependencies": {
1820
"@angular-devkit/build-angular": "^21.0.5",
19-
"@angular-devkit/core": "^21.0.5",
2021
"@angular/animations": "^21.0.8",
2122
"@angular/cdk": "^21.0.6",
2223
"@angular/cli": "^21.0.5",
@@ -28,53 +29,35 @@
2829
"@angular/language-service": "^21.0.8",
2930
"@angular/material": "^21.0.6",
3031
"@angular/platform-browser": "^21.0.8",
31-
"@babel/core": "^7.24.9",
3232
"@ephox/agar": "^8.0.1",
3333
"@ephox/bedrock-client": "^14.1.1",
3434
"@ephox/bedrock-server": "^14.1.3",
3535
"@ephox/sugar": "^9.3.1",
36-
"@storybook/addon-essentials": "9.0.0-alpha.12",
37-
"@storybook/addon-interactions": "^9.0.0-alpha.10",
38-
"@storybook/addon-links": "^9",
39-
"@storybook/angular": "^9",
40-
"@storybook/blocks": "^9.0.0-alpha.17",
41-
"@storybook/test": "^9.0.0-alpha.2",
36+
"@storybook/addon-docs": "^10.3.6",
37+
"@storybook/addon-links": "^10.3.6",
38+
"@storybook/angular": "^10.3.6",
4239
"@tinymce/beehive-flow": "^0.19.0",
4340
"@tinymce/eslint-plugin": "^3.0.0",
4441
"@tinymce/miniature": "^6.0.0",
45-
"@types/chai": "^4.3.16",
4642
"@types/node": "^20.14.12",
47-
"autoprefixer": "^10.4.19",
48-
"babel-loader": "^9.1.3",
49-
"chai": "^5.1.1",
50-
"codelyzer": "^6.0.2",
5143
"copyfiles": "^2.4.1",
52-
"core-js": "^3.36.1",
5344
"eslint-plugin-chai-friendly": "^1.0.0",
54-
"eslint-plugin-storybook": "^0.8.0",
45+
"eslint-plugin-storybook": "10.3.6",
5546
"gh-pages": "^6.1.0",
5647
"json": "11.0.0",
5748
"ng-packagr": "^18.1.0",
58-
"react": "^18.2.0",
59-
"react-dom": "^18.2.0",
60-
"regenerator-runtime": "^0.14.1",
6149
"rimraf": "^6.0.1",
6250
"rxjs": "^7.8.1",
63-
"storybook": "^9",
51+
"storybook": "^10.3.6",
6452
"tinymce": "^8.0.0",
6553
"tinymce-4": "npm:tinymce@^4",
6654
"tinymce-5": "npm:tinymce@^5",
6755
"tinymce-6": "npm:tinymce@^6",
6856
"tinymce-7": "npm:tinymce@^7",
6957
"tinymce-7.5.0": "npm:tinymce@7.5.0",
7058
"tinymce-8": "npm:tinymce@^8",
71-
"to-string-loader": "^1.1.5",
7259
"tslib": "^2.6.2",
7360
"typescript": "^5.9.3",
74-
"webpack": "^5.95.0",
7561
"zone.js": "~0.16.0"
76-
},
77-
"version": "9.1.2-rc",
78-
"name": "@tinymce/tinymce-angular",
79-
"dependencies": {}
62+
}
8063
}

0 commit comments

Comments
 (0)