Skip to content
Merged
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
23 changes: 18 additions & 5 deletions docs/docs/merkur-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ The full merkur config can be look like:
export default function ({ cliConfig, emitter, }) {
return {
extends: [ '@merkur/preact/cli' ], // Merkur predefined extender
task: { // defined tasks to building your widget, default are node, es13 and es9
task: { // defined tasks to building your widget, default are node, es15 and es9
node: {
name: 'node',
build: ESBuildConfiguration, // https://esbuild.github.io/api/#build
}
es13: {
name: 'es13',
folder: 'es13',
es15: {
name: 'es15',
folder: 'es15',
build: ESBuildConfiguration, // https://esbuild.github.io/api/#build
}
es9: {
Expand Down Expand Up @@ -132,13 +132,26 @@ export default function () {
onMerkurConfig({ cliConfig, merkurConfig }) {
const { projectFolder, isProduction, staticFolder } = cliConfig;

merkurConfig.task.es15Asset = {
name: 'es15Asset',
folder: 'es15',
build: {
entryPoints: [`${projectFolder}/src/customAsset.js`],
entryNames: !isProduction ? 'customAsset' : 'customAsset.[hash]',
platform: 'browser',
outdir: `${staticFolder}/es15`,
plugins: merkurConfig.task['es15'].build.plugins,
},
};

merkurConfig.task.es13Asset = {
name: 'es13Asset',
folder: 'es13',
build: {
entryPoints: [`${projectFolder}/src/customAsset.js`],
entryNames: !isProduction ? 'customAsset' : 'customAsset.[hash]',
platform: 'browser',
target: 'es2022',
outdir: `${staticFolder}/es13`,
plugins: merkurConfig.task['es13'].build.plugins,
},
Expand All @@ -162,7 +175,7 @@ export default function () {
onCliConfig({ cliConfig }) {
// add es13Asset task to be run for `merkur dev`
if (cliConfig.command === 'dev') {
cliConfig.runTasks.push('es13Asset');
cliConfig.runTasks.push('es15Asset');
}
},
};
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/bin/merkur.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ program.command(COMMAND_NAME.DEV)
...{
writeToDisk: false,
watch: true,
runTasks: ['node', 'es13'],
runTasks: ['node', 'es15'],
hasRunDevServer: true,
hasRunWidgetServer: true,
},
Expand Down
11 changes: 10 additions & 1 deletion packages/cli/src/merkurConfig.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,22 @@ emitter.on(
metafile: false,
},
},
es15: {
name: 'es15',
folder: 'es15',
build: {
platform: 'browser',
outdir: path.resolve(`${staticFolder}/es15`),
plugins: [devPlugin],
},
},
es13: {
name: 'es13',
folder: 'es13',
build: {
platform: 'browser',
outdir: path.resolve(`${staticFolder}/es13`),
plugins: [devPlugin],
target: 'es2022',
},
},
es9: {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/runBuild.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export async function runBuild({ cliConfig, build, config }) {
const logger = createLogger(undefined, cliConfig);
const { watch } = cliConfig;

//es6 === es2015, es9 === es2018, es11 === es2020 es13 ===es2022
//es6 === es2015, es9 === es2018, es11 === es2020, es13 ===es2022, es15 === es2024
try {
const result = await (watch
? esbuild.context(build)
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/templates/head.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<script src='<%= asset.source %>' <%- asset.module ? 'type="module"' : 'defer="true"' %> data-merkur-asset-name="<%= asset.name %>"></script>
<% } %>
<%if (typeof asset.source==='object' ) { %>
<script src='<%= asset.source.es13 %>' <%- asset.module ? 'type="module"' : 'defer="true"' %> data-merkur-asset-name="<%= asset.name %>"></script>
<script src='<%= asset.source.es15 %>' <%- asset.module ? 'type="module"' : 'defer="true"' %> data-merkur-asset-name="<%= asset.name %>"></script>
<% } %>
<% } %>

Expand Down
4 changes: 2 additions & 2 deletions packages/cli/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export type Extend =
| undefined;

export interface Task {
name: 'es13' | 'es9' | 'node' | string;
folder: 'es13' | 'es9' | string;
name: 'es15' | 'es13' | 'es9' | 'node' | string;
folder: 'es15' | 'es13' | 'es9' | string;
build: BuildOptions;
[key: string]: any;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/create-widget/views/preact/template.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@merkur/preact": "0.38.0"
"@merkur/preact": "0.39.0"
},
"devDependencies": {
"@testing-library/jest-dom": "^6.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-widget/views/svelte/template.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@merkur/svelte": "0.38.0"
"@merkur/svelte": "0.39.0"
},
"devDependencies": {}
}
2 changes: 1 addition & 1 deletion packages/create-widget/views/uhtml/template.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@merkur/uhtml": "0.38.0"
"@merkur/uhtml": "0.39.0"
},
"devDependencies": {}
}
2 changes: 1 addition & 1 deletion packages/integration-custom-element/cli/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default function ({ emitter, EMITTER_EVENTS }) {

emitter.on(EMITTER_EVENTS.CLI_CONFIG, function removeNodeTask({ cliConfig }) {
if (cliConfig.runTasks.length === 0) {
cliConfig.runTasks = ['es13', 'es9'];
cliConfig.runTasks = ['es15', 'es9'];
}

cliConfig.runTasks = cliConfig.runTasks.filter((task) => task !== 'node');
Expand Down
24 changes: 24 additions & 0 deletions packages/integration/src/__tests__/testScriptSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,30 @@ describe('Merkur component', () => {
});
});

describe('isES15Supported() function', () => {
beforeEach(() => {
jest.spyOn(testScript, 'test');
});

afterEach(() => {
jest.restoreAllMocks();
});

it('should return true', () => {
const isES15Supported = testScript.isES15Supported();

expect(isES15Supported).toEqual(true);
expect(testScript.test).toHaveBeenCalledTimes(2);
});

it('should return true but not test again', () => {
const isES15Supported = testScript.isES15Supported();

expect(isES15Supported).toEqual(true);
expect(testScript.test).toHaveBeenCalledTimes(0);
});
});

describe('test() function', () => {
it('should return true', () => {
expect(testScript.test('return typeof window !== "undefined"')).toEqual(
Expand Down
12 changes: 12 additions & 0 deletions packages/integration/src/testScript.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
let _isES9Supported;
let _isES11Supported;
let _isES13Supported;
let _isES15Supported;

function isES9Supported() {
if (_isES9Supported === undefined) {
Expand Down Expand Up @@ -37,6 +38,16 @@ function isES13Supported() {
return _isES13Supported;
}

function isES15Supported() {
if (_isES15Supported === undefined) {
_isES15Supported =
exported.test('return typeof Promise.withResolvers === "function"') &&
exported.test('return typeof Object.groupBy === "function"');
}

return _isES15Supported;
}

function test(snippet) {
try {
const fn = new Function(snippet);
Expand All @@ -52,6 +63,7 @@ const exported = {
isES9Supported,
isES11Supported,
isES13Supported,
isES15Supported,
test,
};

Expand Down
27 changes: 16 additions & 11 deletions website/docs/merkur-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,26 @@ The full merkur config can be look like:
export default function ({ cliConfig, emitter, }) {
return {
extends: [ '@merkur/preact/cli' ], // Merkur predefined extender
task: { // defined tasks to building your widget, default are node, es13 and es9
task: { // defined tasks to building your widget, default are node, es15 and es9
node: {
name: 'node',
build: ESBuildConfiguration, // https://esbuild.github.io/api/#build
}
},
es15: {
name: 'es15',
folder: 'es15',
build: ESBuildConfiguration, // https://esbuild.github.io/api/#build
},
es13: {
name: 'es13',
folder: 'es13',
build: ESBuildConfiguration, // https://esbuild.github.io/api/#build
}
},
es9: {
name: 'es9',
folder: 'es9',
build: ESBuildConfiguration, // https://esbuild.github.io/api/#build
}
},
},
devServer: { // configuration for Merkur dev server
protocol: 'http:',
Expand Down Expand Up @@ -133,15 +138,15 @@ export default function () {
onMerkurConfig({ cliConfig, merkurConfig }) {
const { projectFolder, isProduction, staticFolder } = cliConfig;

merkurConfig.task.es13Asset = {
name: 'es13Asset',
folder: 'es13',
merkurConfig.task.es15Asset = {
name: 'es15Asset',
folder: 'es15',
build: {
entryPoints: [`${projectFolder}/src/customAsset.js`],
entryNames: !isProduction ? 'customAsset' : 'customAsset.[hash]',
platform: 'browser',
outdir: `${staticFolder}/es13`,
plugins: merkurConfig.task['es13'].build.plugins,
outdir: `${staticFolder}/es15`,
plugins: merkurConfig.task['es15'].build.plugins,
},
};

Expand All @@ -161,9 +166,9 @@ export default function () {
return merkurConfig;
},
onCliConfig({ cliConfig }) {
// add es13Asset task to be run for `merkur dev`
// add es15Asset task to be run for `merkur dev`
if (cliConfig.command === 'dev') {
cliConfig.runTasks.push('es13Asset');
cliConfig.runTasks.push('es15Asset');
}
},
};
Expand Down