Skip to content

Commit 38afc12

Browse files
committed
fix: deps upgrades and improve support for loading as esm
1 parent 25132b1 commit 38afc12

File tree

9 files changed

+1098
-1066
lines changed

9 files changed

+1098
-1066
lines changed

.lintstagedrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"*.ts": ["eslint -f visualstudio --fix", "prettier --write"],
2+
"*.ts": ["eslint --fix", "prettier --write"],
33
"*{.js,.json,.md,.yml,rc}": ["prettier --write"],
44
"./package.json": ["fixpack"]
55
}

.nycrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "@istanbuljs/nyc-config-typescript",
2+
"parserPlugins": ["objectRestSpread", "typescript"],
33
"reporter": ["text", "lcov"],
44
"include": ["src/**/*.{ts,marko}"],
55
"exclude": ["**/__tests__"]

build.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,23 @@ import { build, BuildOptions } from "esbuild";
3838
build({
3939
...opts,
4040
format: "esm",
41+
bundle: true,
42+
splitting: true,
4143
outExtension: { ".js": ".mjs" },
44+
plugins: [
45+
{
46+
name: "external-modules",
47+
setup(build) {
48+
build.onResolve(
49+
{ filter: /^[^./]|^\.[^./]|^\.\.[^/]/ },
50+
({ path }) => ({
51+
path,
52+
external: true,
53+
})
54+
);
55+
},
56+
},
57+
],
4258
}),
4359
]);
44-
})().catch((err) => {
45-
console.error(err);
46-
process.exit(1);
47-
});
60+
})();

package-lock.json

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

package.json

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,35 @@
1111
"htmlparser2": "^7.2.0"
1212
},
1313
"devDependencies": {
14-
"@commitlint/cli": "^15.0.0",
15-
"@commitlint/config-conventional": "^15.0.0",
16-
"@istanbuljs/nyc-config-typescript": "^1.0.2",
17-
"@marko/compiler": "^5.17.4",
14+
"@commitlint/cli": "^16.0.1",
15+
"@commitlint/config-conventional": "^16.0.0",
16+
"@marko/compiler": "^5.17.6",
1817
"@types/mocha": "^9.0.0",
19-
"@types/node": "^16.11.11",
20-
"@typescript-eslint/eslint-plugin": "^5.5.0",
21-
"@typescript-eslint/parser": "^5.5.0",
22-
"esbuild": "^0.14.2",
23-
"esbuild-register": "^3.2.0",
24-
"eslint": "^8.4.0",
18+
"@types/node": "^17.0.6",
19+
"@typescript-eslint/eslint-plugin": "^5.8.1",
20+
"@typescript-eslint/parser": "^5.8.1",
21+
"esbuild": "^0.14.10",
22+
"esbuild-register": "^3.3.1",
23+
"eslint": "^8.6.0",
2524
"eslint-config-prettier": "^8.3.0",
2625
"fast-glob": "^3.2.7",
2726
"fixpack": "^4.0.0",
2827
"husky": "^7.0.4",
29-
"lint-staged": "^12.1.2",
30-
"marko": "^5.17.5",
28+
"lint-staged": "^12.1.4",
29+
"marko": "^5.17.6",
3130
"mocha": "^9.1.3",
3231
"mocha-snap": "^4.2.1",
3332
"nyc": "^15.1.0",
3433
"prettier": "^2.5.1",
3534
"semantic-release": "^18.0.1",
36-
"typescript": "^4.5.2",
37-
"vite": "^2.6.14"
35+
"typescript": "^4.5.4",
36+
"vite": "^2.7.10"
37+
},
38+
"exports": {
39+
".": {
40+
"import": "./dist/index.mjs",
41+
"default": "./dist/index.js"
42+
}
3843
},
3944
"files": [
4045
"dist",
@@ -50,8 +55,8 @@
5055
"vite"
5156
],
5257
"license": "MIT",
53-
"main": "dist/index.js",
54-
"module": "dist/index.mjs",
58+
"main": "./dist/index.js",
59+
"module": "./dist/index.mjs",
5560
"peerDependencies": {
5661
"@marko/compiler": "^5",
5762
"vite": "^2"

src/__tests__/fixtures/isomorphic-basic/__snapshots__/isomorphic-basic.expected/index.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
"use strict";
22
var http = require("http");
3-
var html = require("marko/dist/runtime/html");
4-
var _marko_renderer = require("marko/dist/runtime/components/renderer");
5-
var _marko_tag = require("marko/dist/runtime/helpers/render-tag");
6-
var _marko_dynamic_tag = require("marko/dist/runtime/helpers/dynamic-tag");
3+
var index_js = require("marko/dist/runtime/html/index.js");
4+
var _marko_renderer = require("marko/dist/runtime/components/renderer.js");
5+
var _marko_tag = require("marko/dist/runtime/helpers/render-tag.js");
6+
var _marko_dynamic_tag = require("marko/dist/runtime/helpers/dynamic-tag.js");
77
var _initComponents = require("marko/dist/core-tags/components/init-components-tag.js");
88
var _awaitReorderer = require("marko/dist/core-tags/core/await/reorderer-renderer.js");
99
var _preferredScriptLocation = require("marko/dist/core-tags/components/preferred-script-location-tag.js");
@@ -19,7 +19,7 @@ var _initComponents__default = /* @__PURE__ */ _interopDefaultLegacy(_initCompon
1919
var _awaitReorderer__default = /* @__PURE__ */ _interopDefaultLegacy(_awaitReorderer);
2020
var _preferredScriptLocation__default = /* @__PURE__ */ _interopDefaultLegacy(_preferredScriptLocation);
2121
var _flush_here_and_after____default = /* @__PURE__ */ _interopDefaultLegacy(_flush_here_and_after__);
22-
const _marko_componentType$5 = "1BSUdNzk", _marko_template$5 = html.t(_marko_componentType$5);
22+
const _marko_componentType$5 = "1BSUdNzk", _marko_template$5 = index_js.t(_marko_componentType$5);
2323
const _marko_component$5 = {
2424
onMount() {
2525
console.log("mounted");
@@ -30,7 +30,7 @@ _marko_template$5._ = _marko_renderer__default["default"](function(input, out, _
3030
}, {
3131
t: _marko_componentType$5
3232
}, _marko_component$5);
33-
const _marko_componentType$4 = "9/pH0cjn", _marko_template$4 = html.t(_marko_componentType$4);
33+
const _marko_componentType$4 = "9/pH0cjn", _marko_template$4 = index_js.t(_marko_componentType$4);
3434
const _marko_component$4 = {};
3535
_marko_template$4._ = _marko_renderer__default["default"](function(input, out, _componentDef, _component, state) {
3636
out.w("<div id=implicit>");
@@ -40,7 +40,7 @@ _marko_template$4._ = _marko_renderer__default["default"](function(input, out, _
4040
t: _marko_componentType$4,
4141
i: true
4242
}, _marko_component$4);
43-
const _marko_componentType$3 = "EBjOWFdJ", _marko_template$3 = html.t(_marko_componentType$3);
43+
const _marko_componentType$3 = "EBjOWFdJ", _marko_template$3 = index_js.t(_marko_componentType$3);
4444
const _marko_component$3 = {};
4545
_marko_template$3._ = _marko_renderer__default["default"](function(input, out, _componentDef, _component, state) {
4646
out.w("<!DOCTYPE html><html lang=en><head>");
@@ -59,7 +59,7 @@ _marko_template$3._ = _marko_renderer__default["default"](function(input, out, _
5959
t: _marko_componentType$3,
6060
i: true
6161
}, _marko_component$3);
62-
const _marko_componentType$2 = "NgVTgNMO", _marko_template$2 = html.t(_marko_componentType$2);
62+
const _marko_componentType$2 = "NgVTgNMO", _marko_template$2 = index_js.t(_marko_componentType$2);
6363
const _marko_component$2 = {};
6464
_marko_template$2._ = _marko_renderer__default["default"](function(input, out, _componentDef, _component, state) {
6565
_marko_tag__default["default"](_marko_template$3, {
@@ -73,22 +73,22 @@ _marko_template$2._ = _marko_renderer__default["default"](function(input, out, _
7373
t: _marko_componentType$2,
7474
i: true
7575
}, _marko_component$2);
76-
const _marko_componentType$1 = "BnY0HwdC", _marko_template$1 = html.t(_marko_componentType$1);
76+
const _marko_componentType$1 = "BnY0HwdC", _marko_template$1 = index_js.t(_marko_componentType$1);
7777
function renderAssets(out, slot) {
7878
const entries = this.___viteEntries;
7979
if (entries) {
8080
const slotWrittenEntriesKey = `___viteWrittenEntries-${slot}`;
8181
const lastWrittenEntry = this[slotWrittenEntriesKey] || 0;
8282
const writtenEntries = this[slotWrittenEntriesKey] = entries.length;
83-
let html2 = "";
83+
let html = "";
8484
for (let i = lastWrittenEntry; i < writtenEntries; i++) {
8585
const manifest = __MARKO_MANIFEST__[entries[i]];
8686
const slotHtml = manifest && manifest[slot] && manifest[slot].join(this.___viteInjectAttrs);
8787
if (slotHtml) {
88-
html2 += slotHtml;
88+
html += slotHtml;
8989
}
9090
}
91-
out.write(html2);
91+
out.write(html);
9292
}
9393
}
9494
const _marko_component$1 = {};
@@ -107,7 +107,7 @@ _marko_template$1._ = _marko_renderer__default["default"](function(input, out, _
107107
t: _marko_componentType$1,
108108
i: true
109109
}, _marko_component$1);
110-
const _marko_componentType = "Nbn24J39", _marko_template = html.t(_marko_componentType);
110+
const _marko_componentType = "Nbn24J39", _marko_template = index_js.t(_marko_componentType);
111111
const _marko_component = {};
112112
_marko_template._ = _marko_renderer__default["default"](function(input, out, _componentDef, _component, state) {
113113
const $global = out.global;

src/__tests__/fixtures/server-basic/__snapshots__/server-basic.expected/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"use strict";
22
var http = require("http");
3-
var html = require("marko/dist/runtime/html");
4-
var _marko_renderer = require("marko/dist/runtime/components/renderer");
5-
var _marko_tag = require("marko/dist/runtime/helpers/render-tag");
3+
var index_js = require("marko/dist/runtime/html/index.js");
4+
var _marko_renderer = require("marko/dist/runtime/components/renderer.js");
5+
var _marko_tag = require("marko/dist/runtime/helpers/render-tag.js");
66
function _interopDefaultLegacy(e) {
77
return e && typeof e === "object" && "default" in e ? e : { "default": e };
88
}
99
var http__default = /* @__PURE__ */ _interopDefaultLegacy(http);
1010
var _marko_renderer__default = /* @__PURE__ */ _interopDefaultLegacy(_marko_renderer);
1111
var _marko_tag__default = /* @__PURE__ */ _interopDefaultLegacy(_marko_tag);
12-
const _marko_componentType$2 = "71MAcDxK", _marko_template$2 = html.t(_marko_componentType$2);
12+
const _marko_componentType$2 = "71MAcDxK", _marko_template$2 = index_js.t(_marko_componentType$2);
1313
const _marko_component$2 = {
1414
onMount() {
1515
console.log("mounted");
@@ -20,7 +20,7 @@ _marko_template$2._ = _marko_renderer__default["default"](function(input, out, _
2020
}, {
2121
t: _marko_componentType$2
2222
}, _marko_component$2);
23-
const _marko_componentType$1 = "c1uTHRl3", _marko_template$1 = html.t(_marko_componentType$1);
23+
const _marko_componentType$1 = "c1uTHRl3", _marko_template$1 = index_js.t(_marko_componentType$1);
2424
const _marko_component$1 = {};
2525
_marko_template$1._ = _marko_renderer__default["default"](function(input, out, _componentDef, _component, state) {
2626
out.w("<div id=implicit>");
@@ -30,7 +30,7 @@ _marko_template$1._ = _marko_renderer__default["default"](function(input, out, _
3030
t: _marko_componentType$1,
3131
i: true
3232
}, _marko_component$1);
33-
const _marko_componentType = "gaG2ehQw", _marko_template = html.t(_marko_componentType);
33+
const _marko_componentType = "gaG2ehQw", _marko_template = index_js.t(_marko_componentType);
3434
const _marko_component = {};
3535
_marko_template._ = _marko_renderer__default["default"](function(input, out, _componentDef, _component, state) {
3636
out.w("<div id=page>");

src/index.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
import type * as vite from "vite";
2+
import type * as Compiler from "@marko/compiler";
3+
14
import os from "os";
25
import fs from "fs";
36
import path from "path";
47
import crypto from "crypto";
58
import { pathToFileURL } from "url";
6-
import * as vite from "vite";
79
import anyMatch from "anymatch";
8-
import type * as Compiler from "@marko/compiler";
910
import getServerEntryTemplate from "./server-entry-template";
1011
import {
1112
generateInputDoc,
@@ -272,7 +273,7 @@ export default function markoPlugin(opts: Options = {}): vite.Plugin[] {
272273
isBuild &&
273274
importer &&
274275
isMarkoFile(importee) &&
275-
this.getModuleInfo(importer)!.isEntry
276+
this.getModuleInfo(importer)?.isEntry
276277
) {
277278
importeeQuery = browserEntryQuery;
278279
}

tsconfig.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
11
{
22
"include": ["src/**/*"],
33
"compilerOptions": {
4-
"lib": ["dom", "ESNext", "scripthost"],
4+
"lib": ["dom", "ESNext"],
55
"strict": true,
66
"outDir": "dist",
77
"target": "ESNext",
8+
"module": "ESNext",
89
"sourceMap": false,
910
"declaration": true,
1011
"incremental": true,
11-
"module": "ESNext",
1212
"stripInternal": true,
13+
"noUnusedLocals": true,
14+
"isolatedModules": true,
1315
"esModuleInterop": true,
1416
"resolveJsonModule": true,
1517
"moduleResolution": "node",
16-
"preserveConstEnums": true,
18+
"noUnusedParameters": true,
19+
"allowUnusedLabels": false,
20+
"noImplicitReturns": false,
21+
"noImplicitOverride": true,
1722
"emitDeclarationOnly": true,
23+
"allowUnreachableCode": false,
24+
"importsNotUsedAsValues": "error",
25+
"noFallthroughCasesInSwitch": true,
1826
"allowSyntheticDefaultImports": true,
1927
"forceConsistentCasingInFileNames": true
2028
}

0 commit comments

Comments
 (0)