Skip to content

Commit

Permalink
feat: upgrade deps
Browse files Browse the repository at this point in the history
BREAKING CHANGE: removes Marko 4 support
  • Loading branch information
DylanPiercey committed Mar 27, 2021
1 parent 3043969 commit adaa679
Show file tree
Hide file tree
Showing 15 changed files with 4,612 additions and 3,503 deletions.
7,385 changes: 4,331 additions & 3,054 deletions package-lock.json

Large diffs are not rendered by default.

56 changes: 29 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,39 @@
"author": "Dylan Piercey <dpiercey@ebay.com>",
"bugs": "https://github.com/marko-js/rollup/issues",
"dependencies": {
"@rollup/plugin-commonjs": "^15.0.0",
"@rollup/pluginutils": "^4.0.0",
"@rollup/pluginutils": "^4.1.0",
"concat-with-sourcemaps": "^1.1.0",
"mz": "^2.7.0",
"tslib": "^2.0.1"
"tslib": "^2.1.0"
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^9.0.0",
"@commitlint/cli": "^9.1.2",
"@commitlint/config-conventional": "^9.1.2",
"@types/jest": "^26.0.10",
"@types/mz": "2.7.1",
"@types/node": "^14.6.0",
"@typescript-eslint/eslint-plugin": "^3.10.1",
"@typescript-eslint/parser": "^3.10.1",
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@marko/compiler": "5.0.0-next.76",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.1.0",
"@types/jest": "^26.0.20",
"@types/mz": "2.7.3",
"@types/node": "^14.14.21",
"@typescript-eslint/eslint-plugin": "^4.13.0",
"@typescript-eslint/parser": "^4.13.0",
"coveralls": "^3.1.0",
"escape-string-regexp": "^4.0.0",
"eslint": "^7.7.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-jest": "^23.20.0",
"husky": "^4.2.5",
"jest": "^26.4.2",
"jest-file-snapshot": "^0.3.8",
"lint-staged": "^10.2.13",
"marko": "^4.18.39",
"prettier": "^2.1.0",
"rollup": "^1.31.0",
"rollup-plugin-postcss": "^3.1.6",
"standard-version": "^9.0.0",
"ts-jest": "^26.2.0",
"typescript": "^4.0.2"
"eslint": "^7.18.0",
"eslint-config-prettier": "^7.1.0",
"eslint-plugin-jest": "^24.1.3",
"husky": "^4.3.8",
"jest": "^26.6.3",
"jest-file-snapshot": "^0.5.0",
"lint-staged": "^10.5.3",
"marko": "^5.0.0-next.76",
"postcss": "^8.2.4",
"prettier": "^2.2.1",
"rollup": "^2.36.1",
"rollup-plugin-postcss": "^4.0.0",
"standard-version": "^9.1.0",
"ts-jest": "^26.4.4",
"typescript": "^4.1.3"
},
"files": [
"dist"
Expand All @@ -52,8 +54,8 @@
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
"peerDependencies": {
"marko": "^4 || ^5.0.0-next || ^5",
"rollup": "^1 || ^2"
"@marko/compiler": "^5.0.0-next || ^5",
"rollup": "^2"
},
"repository": {
"type": "git",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
div { color: green }

div { color: green }
163 changes: 61 additions & 102 deletions src/__tests__/fixtures/entry-no-hydrate/__snapshots__/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,118 +2,77 @@

Object.defineProperty(exports, '__esModule', { value: true });

function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }

var require$$0 = _interopDefault(require('marko/dist/vdom'));
var components_registry_browser = _interopDefault(require('marko/dist/runtime/components/registry-browser'));
var marko_renderer = _interopDefault(require('marko/dist/runtime/components/renderer'));
var marko_defineComponent = _interopDefault(require('marko/dist/runtime/components/defineComponent'));
var marko_createElement = _interopDefault(require('marko/dist/runtime/vdom/helpers/v-element'));
var marko_const = _interopDefault(require('marko/dist/runtime/vdom/helpers/const'));
var marko_loadTag = _interopDefault(require('marko/dist/runtime/helpers/load-tag'));

function createCommonjsModule(fn, basedir, module) {
return module = {
path: basedir,
exports: {},
require: function (path, base) {
return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);
}
}, fn(module, module.exports), module.exports;
}

function commonjsRequire () {
throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');
}

var classComponent = createCommonjsModule(function (module) {

var marko_template = module.exports = require$$0.t(),
marko_component = {
onMount: function() {
console.log("mounted");
}
},
marko_registerComponent = components_registry_browser.r,
marko_componentType = marko_registerComponent("/@marko/rollup$latest/src/__tests__/fixtures/entry-no-hydrate/src/components/class-component.marko", function() {
return module.exports;
}),
marko_const_nextId = marko_const("4d364d"),
marko_node0 = marko_createElement("div", {
id: "class"
}, "0", null, 0, 0, {
i: marko_const_nextId()
});

function render(input, out, __component, component, state) {

out.n(marko_node0, component);
}

marko_template._ = marko_renderer(render, {
e_: marko_componentType
}, marko_component);

marko_template.Component = marko_defineComponent(marko_component, marko_template._);
});

var implicitComponent = createCommonjsModule(function (module) {

var marko_template = module.exports = require$$0.t(),
marko_registerComponent = components_registry_browser.r,
marko_componentType = marko_registerComponent("/@marko/rollup$latest/src/__tests__/fixtures/entry-no-hydrate/src/components/implicit-component.marko", function() {
return module.exports;
}),
class_component_tag = marko_loadTag(classComponent),
marko_attrs0 = {
id: "implicit"
};

function render(input, out, __component, component, state) {

out.be("div", marko_attrs0, "0", component);

class_component_tag({}, out, __component, "1");
var _marko_createElement = require('marko/dist/runtime/vdom/helpers/v-element');
var _marko_renderer = require('marko/dist/runtime/components/renderer');
var dom = require('marko/dist/runtime/dom');
var registryBrowser = require('marko/dist/runtime/components/registry-browser');
var _marko_defineComponent = require('marko/dist/runtime/components/defineComponent');
var _marko_tag = require('marko/dist/runtime/helpers/render-tag');

out.ee();
}
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

var _marko_createElement__default = /*#__PURE__*/_interopDefaultLegacy(_marko_createElement);
var _marko_renderer__default = /*#__PURE__*/_interopDefaultLegacy(_marko_renderer);
var _marko_defineComponent__default = /*#__PURE__*/_interopDefaultLegacy(_marko_defineComponent);
var _marko_tag__default = /*#__PURE__*/_interopDefaultLegacy(_marko_tag);

const _marko_template = dom.t();

const _marko_node = _marko_createElement__default['default']("div", {
"id": "class"
}, "0", null, 0, 1);

marko_template._ = marko_renderer(render, {
d_: true,
e_: marko_componentType
});
const _marko_componentType = registryBrowser.r("KA0TDeGH", () => _marko_template),
_marko_component = {
onMount() {
console.log("mounted");
}

marko_template.Component = marko_defineComponent({}, marko_template._);
});
};

var src = createCommonjsModule(function (module) {
_marko_template._ = _marko_renderer__default['default'](function (input, out, _component, component, state) {
out.n(_marko_node, component);
}, {
t: _marko_componentType
}, _marko_component);
_marko_template.Component = _marko_defineComponent__default['default'](_marko_component, _marko_template._);

var marko_template = module.exports = require$$0.t(),
marko_registerComponent = components_registry_browser.r,
marko_componentType = marko_registerComponent("/@marko/rollup$latest/src/__tests__/fixtures/entry-no-hydrate/src/index.marko", function() {
return module.exports;
}),
implicit_component_tag = marko_loadTag(implicitComponent),
marko_attrs0 = {
id: "page"
};
const _marko_template$1 = dom.t();

function render(input, out, __component, component, state) {
const _marko_componentType$1 = registryBrowser.r("7i0iDZmN", () => _marko_template$1),
_marko_component$1 = {};

out.be("div", marko_attrs0, "0", component);
_marko_template$1._ = _marko_renderer__default['default'](function (input, out, _component, component, state) {
out.be("div", {
"id": "implicit"
}, "0", component, null, 1);

implicit_component_tag({}, out, __component, "1");
_marko_tag__default['default'](_marko_template, {}, out, _component, "1");

out.ee();
}
}, {
t: _marko_componentType$1,
i: true
}, _marko_component$1);
_marko_template$1.Component = _marko_defineComponent__default['default'](_marko_component$1, _marko_template$1._);

marko_template._ = marko_renderer(render, {
d_: true,
e_: marko_componentType
});
const _marko_template$2 = dom.t();

marko_template.Component = marko_defineComponent({}, marko_template._);
});
const _marko_componentType$2 = registryBrowser.r("9v2fgbxx", () => _marko_template$2),
_marko_component$2 = {};

_marko_template$2._ = _marko_renderer__default['default'](function (input, out, _component, component, state) {
out.be("div", {
"id": "page"
}, "0", component, null, 1);

_marko_tag__default['default'](_marko_template$1, {}, out, _component, "1");

out.ee();
}, {
t: _marko_componentType$2,
i: true
}, _marko_component$2);
_marko_template$2.Component = _marko_defineComponent__default['default'](_marko_component$2, _marko_template$2._);

exports.__moduleExports = src;
exports.default = src;
exports.default = _marko_template$2;
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
div { color: green }

div { color: green }
Original file line number Diff line number Diff line change
@@ -1,58 +1,37 @@
'use strict';

function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }

var require$$0 = _interopDefault(require('marko/dist/vdom'));
var components_registry_browser = _interopDefault(require('marko/dist/runtime/components/registry-browser'));
var marko_renderer = _interopDefault(require('marko/dist/runtime/components/renderer'));
var marko_defineComponent = _interopDefault(require('marko/dist/runtime/components/defineComponent'));
var marko_createElement = _interopDefault(require('marko/dist/runtime/vdom/helpers/v-element'));
var marko_const = _interopDefault(require('marko/dist/runtime/vdom/helpers/const'));
var _marko_createElement = require('marko/dist/runtime/vdom/helpers/v-element');
var _marko_renderer = require('marko/dist/runtime/components/renderer');
var dom = require('marko/dist/runtime/dom');
var registryBrowser = require('marko/dist/runtime/components/registry-browser');
var _marko_defineComponent = require('marko/dist/runtime/components/defineComponent');
var components = require('marko/components');

function createCommonjsModule(fn, basedir, module) {
return module = {
path: basedir,
exports: {},
require: function (path, base) {
return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);
}
}, fn(module, module.exports), module.exports;
}

function commonjsRequire () {
throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');
}

var classComponent = createCommonjsModule(function (module) {

var marko_template = module.exports = require$$0.t(),
marko_component = {
onMount: function() {
console.log("mounted");
}
},
marko_registerComponent = components_registry_browser.r,
marko_componentType = marko_registerComponent("/@marko/rollup$latest/src/__tests__/fixtures/hydrate-entry-custom-init/src/components/class-component.marko", function() {
return module.exports;
}),
marko_const_nextId = marko_const("4d364d"),
marko_node0 = marko_createElement("div", {
id: "class"
}, "0", null, 0, 0, {
i: marko_const_nextId()
});

function render(input, out, __component, component, state) {

out.n(marko_node0, component);
}

marko_template._ = marko_renderer(render, {
e_: marko_componentType
}, marko_component);

marko_template.Component = marko_defineComponent(marko_component, marko_template._);
});
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

var _marko_createElement__default = /*#__PURE__*/_interopDefaultLegacy(_marko_createElement);
var _marko_renderer__default = /*#__PURE__*/_interopDefaultLegacy(_marko_renderer);
var _marko_defineComponent__default = /*#__PURE__*/_interopDefaultLegacy(_marko_defineComponent);

const _marko_template = dom.t();

const _marko_node = _marko_createElement__default['default']("div", {
"id": "class"
}, "0", null, 0, 1);

const _marko_componentType = registryBrowser.r("VAGN//0e", () => _marko_template),
_marko_component = {
onMount() {
console.log("mounted");
}

};

_marko_template._ = _marko_renderer__default['default'](function (input, out, _component, component, state) {
out.n(_marko_node, component);
}, {
t: _marko_componentType
}, _marko_component);
_marko_template.Component = _marko_defineComponent__default['default'](_marko_component, _marko_template._);

components.init("SOME_COMPONENTS");
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
div { color: green }

div { color: green }

0 comments on commit adaa679

Please sign in to comment.