Skip to content

Commit 4eb839f

Browse files
committed
refactor: extract serialize-javascript to jsoneo project
1 parent 3f3efef commit 4eb839f

File tree

12 files changed

+38
-1167
lines changed

12 files changed

+38
-1167
lines changed

.github/workflows/npm-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish to npm
1+
name: NPM Publish
22

33
on:
44
release:
@@ -93,7 +93,7 @@ jobs:
9393
id: get_next_version_before_publish
9494
continue-on-error: true
9595
run: |
96-
VERSION=$(npm view enum-plus@next version || "0.0.0")
96+
VERSION=$(npm view jsoneo@next version 2>/dev/null || echo 0.0.0)
9797
echo "NEXT_VERSION=$VERSION" >> $GITHUB_OUTPUT
9898
9999
- name: Publish a prerelease version to npm

e2e-global.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
import type * as JSONeo from 'jsoneo';
12
import type * as EnumPlus from './src';
23
import type * as WeekConfig from './test/data/week-config';
34
import type * as WeekData from './test/data/week-data';
4-
import type * as SerializeJavascript from './test/utils/serialize-javascript';
55

66
declare global {
77
interface Window {
88
EnumPlus: typeof EnumPlus;
99
WeekConfig: typeof WeekConfig;
1010
WeekData: typeof WeekData;
11-
SerializeJavascript: typeof SerializeJavascript;
11+
JSONeo: typeof JSONeo;
1212
}
1313
}
1414
export {};

e2e/fixtures/legacy.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html>
3-
43
<head>
5-
<meta charset="UTF-8">
4+
<meta charset="UTF-8" />
65
<title>Enum Plus Legacy Test</title>
76
</head>
87

98
<body>
109
<div id="test-results"></div>
11-
<script src="scripts/serialize-javascript-bundle.js"></script>
10+
<script src="scripts/jsoneo-bundle.js"></script>
1211
<script src="scripts/es-legacy-bundle.js"></script>
1312
<script src="scripts/week-config-bundle.js"></script>
1413
<script src="scripts/week-data-bundle.js"></script>
1514
</body>
16-
17-
</html>
15+
</html>

e2e/fixtures/modern.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html>
3-
43
<head>
5-
<meta charset="UTF-8">
4+
<meta charset="UTF-8" />
65
<title>Enum Plus Modern Test</title>
76
</head>
87

98
<body>
109
<div id="test-results"></div>
11-
<script src="scripts/serialize-javascript-bundle.js"></script>
10+
<script src="scripts/jsoneo-bundle.js"></script>
1211
<script src="scripts/es-modern-bundle.js"></script>
1312
<script src="scripts/week-config-bundle.js"></script>
1413
<script src="scripts/week-data-bundle.js"></script>
1514
</body>
16-
17-
</html>
15+
</html>

package-lock.json

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@
175175
"father": "^4.5.5",
176176
"glob": "^11.0.3",
177177
"jest": "^29.7.0",
178+
"jsoneo": "^1.0.0",
178179
"npm-run-all2": "^8.0.3",
179180
"playwright": "^1.52.0",
180181
"rollup": "^4.41.1",

scripts/generate-version.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const fs = require('fs');
44
const root = path.resolve(__dirname, '..');
55

66
generate(path.join(root, 'src/version.ts'));
7-
generate(path.join(root, 'test/utils/version.ts'));
87

98
/** @param {string} outFile */
109
function generate(outFile) {

scripts/make-e2e-bundle.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ async function build() {
2424
name: 'EnumPlus',
2525
});
2626

27-
// Bundle serialize-javascript
28-
const serializeJavascript = await rollup({
29-
input: 'tses/test/utils/serialize-javascript.js',
27+
// Bundle jsoneo library
28+
const jsoneoLib = await rollup({
29+
input: 'jsoneo/es/index.js',
3030
plugins: [nodeResolve()],
3131
});
32-
await serializeJavascript.write({
33-
file: 'e2e/fixtures/scripts/serialize-javascript-bundle.js',
32+
await jsoneoLib.write({
33+
file: 'e2e/fixtures/scripts/jsoneo-bundle.js',
3434
format: 'iife',
35-
name: 'SerializeJavascript',
35+
name: 'JSONeo',
3636
});
3737

3838
// Bundle week-config

test/engines/base.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type * as EnumPlusNamespace from '@enum-plus';
2+
import type * as JsoneoNamespace from 'jsoneo';
23
import type * as WeekConfigNamespace from '../data/week-config';
34
import type * as WeekDataNamespace from '../data/week-data';
4-
import type * as SerializeJavascriptNamespace from '../utils/serialize-javascript';
55
import type { TestEngine } from './config';
66
import type { MakeMatchers } from './playwright-types';
77

@@ -30,7 +30,7 @@ export interface RuntimeContext {
3030
EnumPlus: typeof EnumPlusNamespace;
3131
WeekConfig: typeof WeekConfigNamespace;
3232
WeekData: typeof WeekDataNamespace;
33-
SerializeJavascript: typeof SerializeJavascriptNamespace;
33+
JSONeo: typeof JsoneoNamespace;
3434
[key: string]: unknown;
3535
}
3636
export default TestEngineBase;

test/engines/jest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as EnumPlus from '@enum-plus';
2+
import * as JSONeo from 'jsoneo';
23
import * as WeekConfig from '../data/week-config';
34
import * as WeekData from '../data/week-data';
4-
import * as SerializeJavascript from '../utils/serialize-javascript';
55
import TestEngineBase, { type RuntimeContext } from './base';
66

77
export class JestEngine extends TestEngineBase {
@@ -38,7 +38,7 @@ export class JestEngine extends TestEngineBase {
3838
EnumPlus,
3939
WeekConfig,
4040
WeekData,
41-
SerializeJavascript,
41+
JSONeo: JSONeo,
4242
};
4343
}
4444
}

0 commit comments

Comments
 (0)