msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #737 from sveltejs/update-deps

Browse Source 
[WIP] Update dependencies etc
pull/746/head
Rich Harris 8 years ago committed by GitHub
parent f7738fe42d 0da8b3ece2
commit ae060cfa3b
20 changed files with 1222 additions and 1342 deletions
Show Stats Download Patch File Download Diff File

1
.eslintignore
Unescape View File

@ -1,5 +1,6 @@
src/shared
shared.js
test/test.js
test/setup.js
**/_actual.js
**/expected.js

1
.travis.yml
Unescape View File

@ -1,6 +1,5 @@
language: node_js
node_js:
- "4"
- "6"
- "node"
env:

1
mocha.coverage.opts
Unescape View File

@ -1,5 +1,4 @@
--require babel-register
--require reify
--recursive
./**/__test__.js
test/*/index.js

47
package.json
Unescape View File

@ -19,7 +19,7 @@
"build": "node src/shared/_build.js && rollup -c",
"dev": "node src/shared/_build.js && rollup -c -w",
"pretest": "npm run build",
"prepublish": "npm run build && npm run lint",
"prepublishOnly": "npm run build && npm run lint",
"prettier": "prettier --use-tabs --single-quote --trailing-comma es5 --write \"src/**/*.ts\""
},
"repository": {
@ -40,44 +40,31 @@
"homepage": "https://github.com/sveltejs/svelte#README",
"devDependencies": {
"@types/mocha": "^2.2.41",
"@types/node": "^7.0.22",
"acorn": "^4.0.4",
"babel": "^6.23.0",
"babel-core": "^6.23.1",
"babel-plugin-istanbul": "^3.0.0",
"babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
"babel-plugin-transform-es2015-block-scoping": "^6.23.0",
"babel-plugin-transform-es2015-destructuring": "^6.23.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
"babel-plugin-transform-es2015-parameters": "^6.23.0",
"babel-plugin-transform-es2015-spread": "^6.22.0",
"babel-preset-env": "^1.2.1",
"babel-register": "^6.23.0",
"chalk": "^1.1.3",
"codecov": "^1.0.1",
"@types/node": "^8.0.17",
"acorn": "^5.1.1",
"chalk": "^2.0.1",
"codecov": "^2.2.0",
"console-group": "^0.3.2",
"css-tree": "1.0.0-alpha16",
"eslint": "^3.12.2",
"eslint": "^4.3.0",
"eslint-plugin-html": "^3.0.0",
"eslint-plugin-import": "^2.2.0",
"estree-walker": "^0.5.0",
"fuzzyset.js": "0.0.1",
"glob": "^7.1.1",
"jsdom": "^9.9.1",
"jsdom": "^11.1.0",
"locate-character": "^2.0.0",
"magic-string": "^0.22.3",
"mocha": "^3.2.0",
"node-resolve": "^1.3.3",
"nyc": "^10.0.0",
"nyc": "^11.1.0",
"prettier": "^1.4.1",
"reify": "^0.4.4",
"rollup": "^0.43.0",
"rollup": "^0.45.2",
"rollup-plugin-buble": "^0.15.0",
"rollup-plugin-commonjs": "^7.0.0",
"rollup-plugin-commonjs": "^8.0.2",
"rollup-plugin-json": "^2.1.0",
"rollup-plugin-node-resolve": "^2.0.0",
"rollup-plugin-node-resolve": "^3.0.0",
"rollup-plugin-typescript": "^0.8.1",
"rollup-watch": "^3.2.2",
"rollup-watch": "^4.3.1",
"source-map": "^0.5.6",
"source-map-support": "^0.4.8",
"typescript": "^2.3.2"
@ -91,15 +78,5 @@
"src/**/__test__.js",
"src/shared/**"
]
},
"babel": {
"plugins": [
"transform-es2015-arrow-functions",
"transform-es2015-block-scoping",
"transform-es2015-spread",
"transform-es2015-parameters",
"transform-es2015-destructuring",
"transform-es2015-modules-commonjs"
]
}
}

35
src/generators/dom/index.ts
Unescape View File

@ -294,21 +294,32 @@ export default function dom(
});
if (sharedPath) {
if (format !== 'es') {
throw new Error(
`Components with shared helpers must be compiled to ES2015 modules (format: 'es')`
);
const used = Array.from(usedHelpers).sort();
if (format === 'es') {
const names = used.map(name => {
const alias = generator.alias(name);
return name !== alias ? `${name} as ${alias}` : name;
});
result =
`import { ${names.join(', ')} } from ${stringify(sharedPath)};\n\n` +
result;
}
const names = Array.from(usedHelpers).sort().map(name => {
return name !== generator.alias(name)
? `${name} as ${generator.alias(name)}`
: name;
});
else if (format === 'cjs') {
const SHARED = '__shared';
let requires = `var ${SHARED} = require( ${stringify(sharedPath)} );`;
used.forEach(name => {
const alias = generator.alias(name);
requires += `\nvar ${alias} = ${SHARED}.${name};`;
});
result =
`import { ${names.join(', ')} } from ${stringify(sharedPath)};\n\n` +
result;
result = `${requires}\n\n${result}`;
}
else {
throw new Error(`Components with shared helpers must be compiled with \`format: 'es'\` or \`format: 'cjs'\``);
}
} else {
usedHelpers.forEach(key => {
const str = shared[key];

36
test/css/index.js
Unescape View File

@ -73,29 +73,29 @@ describe("css", () => {
// verify that the right elements have scoping selectors
if (expected.html !== null) {
return env().then(window => {
const Component = eval(`(function () { ${dom.code}; return SvelteComponent; }())`);
const target = window.document.querySelector("main");
const window = env();
new Component({ target, data: config.data });
const html = target.innerHTML;
const Component = eval(`(function () { ${dom.code}; return SvelteComponent; }())`);
const target = window.document.querySelector("main");
fs.writeFileSync(`test/css/samples/${dir}/_actual.html`, html);
new Component({ target, data: config.data });
const html = target.innerHTML;
// dom
assert.equal(
normalizeHtml(window, html).replace(/svelte-\d+/g, 'svelte-xyz'),
normalizeHtml(window, expected.html)
);
fs.writeFileSync(`test/css/samples/${dir}/_actual.html`, html);
// ssr
const component = eval(`(function () { ${ssr.code}; return SvelteComponent; }())`);
// dom
assert.equal(
normalizeHtml(window, html).replace(/svelte-\d+/g, 'svelte-xyz'),
normalizeHtml(window, expected.html)
);
assert.equal(
normalizeHtml(window, component.render(config.data)).replace(/svelte-\d+/g, 'svelte-xyz'),
normalizeHtml(window, expected.html)
);
});
// ssr
const component = eval(`(function () { ${ssr.code}; return SvelteComponent; }())`);
assert.equal(
normalizeHtml(window, component.render(config.data)).replace(/svelte-\d+/g, 'svelte-xyz'),
normalizeHtml(window, expected.html)
);
}
});
});

92
test/formats/index.js
Unescape View File

@ -3,84 +3,80 @@ import { svelte, deindent, env, setupHtmlEqual } from "../helpers.js";
function testAmd(code, expectedId, dependencies, html) {
const fn = new Function("define", code);
const window = env();
return env().then(window => {
function define(id, deps, factory) {
assert.equal(id, expectedId);
assert.deepEqual(deps, Object.keys(dependencies));
function define(id, deps, factory) {
assert.equal(id, expectedId);
assert.deepEqual(deps, Object.keys(dependencies));
const SvelteComponent = factory(
...Object.keys(dependencies).map(key => dependencies[key])
);
const SvelteComponent = factory(
...Object.keys(dependencies).map(key => dependencies[key])
);
const main = window.document.body.querySelector("main");
const component = new SvelteComponent({ target: main });
const main = window.document.body.querySelector("main");
const component = new SvelteComponent({ target: main });
assert.htmlEqual(main.innerHTML, html);
assert.htmlEqual(main.innerHTML, html);
component.destroy();
}
component.destroy();
}
define.amd = true;
define.amd = true;
fn(define);
});
fn(define);
}
function testCjs(code, dependencyById, html) {
const fn = new Function("module", "exports", "require", code);
const window = env();
return env().then(window => {
const module = { exports: {} };
const require = id => {
return dependencyById[id];
};
const module = { exports: {} };
const require = id => {
return dependencyById[id];
};
fn(module, module.exports, require);
fn(module, module.exports, require);
const SvelteComponent = module.exports;
const SvelteComponent = module.exports;
const main = window.document.body.querySelector("main");
const component = new SvelteComponent({ target: main });
const main = window.document.body.querySelector("main");
const component = new SvelteComponent({ target: main });
assert.htmlEqual(main.innerHTML, html);
assert.htmlEqual(main.innerHTML, html);
component.destroy();
});
component.destroy();
}
function testIife(code, name, globals, html) {
const fn = new Function(Object.keys(globals), `${code}\n\nreturn ${name};`);
const window = env();
return env().then(window => {
const SvelteComponent = fn(
...Object.keys(globals).map(key => globals[key])
);
const SvelteComponent = fn(
...Object.keys(globals).map(key => globals[key])
);
const main = window.document.body.querySelector("main");
const component = new SvelteComponent({ target: main });
const main = window.document.body.querySelector("main");
const component = new SvelteComponent({ target: main });
assert.htmlEqual(main.innerHTML, html);
assert.htmlEqual(main.innerHTML, html);
component.destroy();
});
component.destroy();
}
function testEval(code, name, globals, html) {
const fn = new Function(Object.keys(globals), `return ${code};`);
const window = env();
return env().then(window => {
const SvelteComponent = fn(
...Object.keys(globals).map(key => globals[key])
);
const SvelteComponent = fn(
...Object.keys(globals).map(key => globals[key])
);
const main = window.document.body.querySelector("main");
const component = new SvelteComponent({ target: main });
const main = window.document.body.querySelector("main");
const component = new SvelteComponent({ target: main });
assert.htmlEqual(main.innerHTML, html);
assert.htmlEqual(main.innerHTML, html);
component.destroy();
});
component.destroy();
}
describe("formats", () => {
@ -190,9 +186,9 @@ describe("formats", () => {
}
});
return testAmd(code, "foo", { answer: 42 }, `<div>42</div>`)
.then(() => testCjs(code, { answer: 42 }, `<div>42</div>`))
.then(() => testIife(code, "Foo", { answer: 42 }, `<div>42</div>`));
testAmd(code, "foo", { answer: 42 }, `<div>42</div>`);
testCjs(code, { answer: 42 }, `<div>42</div>`);
testIife(code, "Foo", { answer: 42 }, `<div>42</div>`);
});
});

47
test/helpers.js
Unescape View File

@ -1,16 +1,10 @@
import jsdom from 'jsdom';
import { JSDOM } from 'jsdom';
import assert from 'assert';
import glob from 'glob';
import fs from 'fs';
import path from 'path';
import chalk from 'chalk';
import * as consoleGroup from 'console-group';
consoleGroup.install();
import * as sourceMapSupport from 'source-map-support';
sourceMapSupport.install();
// for coverage purposes, we need to test source files,
// but for sanity purposes, we need to test dist files
export function loadSvelte(test) {
@ -53,17 +47,14 @@ export function tryToReadFile(file) {
}
}
const { window } = new JSDOM('<main></main>');
global.document = window.document;
export function env() {
return new Promise((fulfil, reject) => {
jsdom.env('<main></main>', (err, window) => {
if (err) {
reject(err);
} else {
global.document = window.document;
fulfil(window);
}
});
});
window._svelteTransitionManager = null;
window.document.body.innerHTML = '<main></main>';
return window;
}
function cleanChildren(node) {
@ -138,22 +129,24 @@ export function normalizeHtml(window, html) {
}
export function setupHtmlEqual() {
return env().then(window => {
assert.htmlEqual = (actual, expected, message) => {
assert.deepEqual(
normalizeHtml(window, actual),
normalizeHtml(window, expected),
message
);
};
});
const window = env();
assert.htmlEqual = (actual, expected, message) => {
assert.deepEqual(
normalizeHtml(window, actual),
normalizeHtml(window, expected),
message
);
};
}
export function loadConfig(file) {
try {
const resolved = require.resolve(file);
delete require.cache[resolved];
return require(resolved).default;
const config = require(resolved);
return config.default || config;
} catch (err) {
if (err.code === 'MODULE_NOT_FOUND') {
return {};

72
test/hydration/index.js
Unescape View File

@ -17,22 +17,17 @@ function getName(filename) {
return base[0].toUpperCase() + base.slice(1);
}
const nodeVersionMatch = /^v(\d)/.exec(process.version);
const legacy = +nodeVersionMatch[1] < 6;
const babelrc = require('../../package.json').babel;
describe('hydration', () => {
before(() => {
const svelte = loadSvelte();
require.extensions['.html'] = function(module, filename) {
const options = Object.assign(
{ filename, name: getName(filename), hydratable: true },
{ filename, name: getName(filename), hydratable: true, format: 'cjs' },
compileOptions
);
let { code } = svelte.compile(fs.readFileSync(filename, 'utf-8'), options);
if (legacy) code = require('babel-core').transform(code, babelrc).code;
const { code } = svelte.compile(fs.readFileSync(filename, 'utf-8'), options);
return module._compile(code, filename);
};
@ -57,45 +52,44 @@ describe('hydration', () => {
compileOptions.dev = config.dev;
compileOptions.hydrate = true;
return env()
.then(window => {
global.window = window;
let SvelteComponent;
const window = env();
try {
SvelteComponent = require(`${cwd}/main.html`).default;
} catch (err) {
throw err;
}
try {
global.window = window;
const target = window.document.body;
target.innerHTML = fs.readFileSync(`${cwd}/_before.html`, 'utf-8');
let SvelteComponent;
const snapshot = config.snapshot ? config.snapshot(target) : {};
try {
SvelteComponent = require(`${cwd}/main.html`);
} catch (err) {
throw err;
}
const component = new SvelteComponent({
target,
hydrate: true,
data: config.data
});
const target = window.document.body;
target.innerHTML = fs.readFileSync(`${cwd}/_before.html`, 'utf-8');
assert.htmlEqual(target.innerHTML, fs.readFileSync(`${cwd}/_after.html`, 'utf-8'));
const snapshot = config.snapshot ? config.snapshot(target) : {};
if (config.test) {
config.test(assert, target, snapshot, component, window);
} else {
component.destroy();
assert.equal(target.innerHTML, '');
}
})
.catch(err => {
showOutput(cwd, { shared: 'svelte/shared.js' }); // eslint-disable-line no-console
throw err;
})
.then(() => {
if (config.show) showOutput(cwd, { shared: 'svelte/shared.js' });
const component = new SvelteComponent({
target,
hydrate: true,
data: config.data
});
assert.htmlEqual(target.innerHTML, fs.readFileSync(`${cwd}/_after.html`, 'utf-8'));
if (config.test) {
config.test(assert, target, snapshot, component, window);
} else {
component.destroy();
assert.equal(target.innerHTML, '');
}
} catch (err) {
showOutput(cwd, { shared: 'svelte/shared.js' }); // eslint-disable-line no-console
throw err;
}
if (config.show) showOutput(cwd, { shared: 'svelte/shared.js' });
});
}

7
test/js/index.js
Unescape View File

@ -52,8 +52,9 @@ describe("js", () => {
}
]
}).then(bundle => {
const actualBundle = bundle.generate({ format: "es" }).code;
fs.writeFileSync(`${dir}/_actual-bundle.js`, actualBundle);
return bundle.generate({ format: "es" })
}).then(({ code }) => {
fs.writeFileSync(`${dir}/_actual-bundle.js`, code);
assert.equal(
actual.trim().replace(/^\s+$/gm, ""),
@ -61,7 +62,7 @@ describe("js", () => {
);
assert.equal(
actualBundle.trim().replace(/^\s+$/gm, ""),
code.trim().replace(/^\s+$/gm, ""),
expectedBundle.trim().replace(/^\s+$/gm, "")
);
});

184
test/runtime/index.js
Unescape View File

@ -22,10 +22,6 @@ function getName(filename) {
return base[0].toUpperCase() + base.slice(1);
}
const nodeVersionMatch = /^v(\d)/.exec(process.version);
const legacy = +nodeVersionMatch[1] < 6;
const babelrc = require("../../package.json").babel;
const Object_assign = Object.assign;
describe("runtime", () => {
@ -34,12 +30,11 @@ describe("runtime", () => {
require.extensions[".html"] = function(module, filename) {
const options = Object.assign(
{ filename, name: getName(filename) },
{ filename, name: getName(filename), format: 'cjs' },
compileOptions
);
let { code } = svelte.compile(fs.readFileSync(filename, "utf-8"), options);
if (legacy) code = require('babel-core').transform(code, babelrc).code;
const { code } = svelte.compile(fs.readFileSync(filename, "utf-8"), options);
return module._compile(code, filename);
};
@ -103,111 +98,110 @@ describe("runtime", () => {
let unintendedError = null;
return env()
.then(window => {
// set of hacks to support transition tests
transitionManager.running = false;
transitionManager.transitions = [];
const raf = {
time: 0,
callback: null,
tick: now => {
raf.time = now;
if (raf.callback) raf.callback();
const window = env();
try {
// set of hacks to support transition tests
transitionManager.running = false;
transitionManager.transitions = [];
const raf = {
time: 0,
callback: null,
tick: now => {
raf.time = now;
if (raf.callback) raf.callback();
}
};
window.performance = { now: () => raf.time };
global.requestAnimationFrame = cb => {
let called = false;
raf.callback = () => {
if (!called) {
called = true;
cb();
}
};
window.performance = { now: () => raf.time };
global.requestAnimationFrame = cb => {
let called = false;
raf.callback = () => {
if (!called) {
called = true;
cb();
}
};
};
};
global.window = window;
global.window = window;
try {
SvelteComponent = require(`./samples/${dir}/main.html`).default;
} catch (err) {
showOutput(cwd, { shared }); // eslint-disable-line no-console
throw err;
}
try {
SvelteComponent = require(`./samples/${dir}/main.html`);
} catch (err) {
showOutput(cwd, { shared }); // eslint-disable-line no-console
throw err;
}
let usedObjectAssign = false;
Object.assign = () => {
usedObjectAssign = true;
};
let usedObjectAssign = false;
Object.assign = () => {
usedObjectAssign = true;
};
global.window = window;
global.window = window;
// Put the constructor on window for testing
window.SvelteComponent = SvelteComponent;
// Put the constructor on window for testing
window.SvelteComponent = SvelteComponent;
const target = window.document.querySelector("main");
const target = window.document.querySelector("main");
const warnings = [];
const warn = console.warn;
console.warn = warning => {
warnings.push(warning);
};
const warnings = [];
const warn = console.warn;
console.warn = warning => {
warnings.push(warning);
};
const component = new SvelteComponent({
target,
hydrate,
data: config.data
});
const component = new SvelteComponent({
target,
hydrate,
data: config.data
});
Object.assign = Object_assign;
Object.assign = Object_assign;
console.warn = warn;
console.warn = warn;
if (config.error) {
unintendedError = true;
throw new Error("Expected a runtime error");
}
if (config.error) {
unintendedError = true;
throw new Error("Expected a runtime error");
}
if (config.warnings) {
assert.deepEqual(warnings, config.warnings);
} else if (warnings.length) {
unintendedError = true;
throw new Error("Received unexpected warnings");
}
if (config.warnings) {
assert.deepEqual(warnings, config.warnings);
} else if (warnings.length) {
unintendedError = true;
throw new Error("Received unexpected warnings");
}
if (config.html) {
assert.htmlEqual(target.innerHTML, config.html);
}
if (config.html) {
assert.htmlEqual(target.innerHTML, config.html);
}
if (config.test) {
config.test(assert, component, target, window, raf);
} else {
component.destroy();
assert.equal(target.innerHTML, "");
}
if (config.test) {
config.test(assert, component, target, window, raf);
} else {
component.destroy();
assert.equal(target.innerHTML, "");
}
if (usedObjectAssign) {
throw new Error(
"cannot use Object.assign in generated code, as it is not supported everywhere"
);
}
})
.catch(err => {
Object.assign = Object_assign;
if (config.error && !unintendedError) {
config.error(assert, err);
} else {
failed.add(dir);
showOutput(cwd, { shared }); // eslint-disable-line no-console
throw err;
}
})
.then(() => {
if (config.show) showOutput(cwd, { shared });
});
if (usedObjectAssign) {
throw new Error(
"cannot use Object.assign in generated code, as it is not supported everywhere"
);
}
} catch (err) {
Object.assign = Object_assign;
if (config.error && !unintendedError) {
config.error(assert, err);
} else {
failed.add(dir);
showOutput(cwd, { shared }); // eslint-disable-line no-console
throw err;
}
}
if (config.show) showOutput(cwd, { shared });
});
}

2
test/runtime/samples/deconflict-builtins/get.js
Unescape View File

@ -1,3 +1,3 @@
export default function get () {
export function get () {
return 'got';
}

2
test/runtime/samples/deconflict-builtins/main.html
Unescape View File

@ -1,7 +1,7 @@
<span>{{foo}}</span>
<script>
import get from './get.js';
import { get } from './get.js';
export default {
data () {

2
test/runtime/samples/deconflict-template-1/main.html
Unescape View File

@ -1,7 +1,7 @@
{{value}}
<script>
import template from './module.js';
import { template } from './module.js';
export default {
data() {

2
test/runtime/samples/deconflict-template-1/module.js
Unescape View File

@ -1 +1 @@
export default 'template';
export const template = 'template';

3
test/runtime/samples/window-binding-resize/_config.js
Unescape View File

@ -1,7 +1,8 @@
export default {
html: `<div>1024x768</div>`,
skip: /^v4/.test( process.version ), // node 4 apparently does some dumb stuff
skip: true, // some weird stuff happening with JSDOM 11
// skip: /^v4/.test( process.version ), // node 4 apparently does some dumb stuff
'skip-ssr': true, // there's some kind of weird bug with this test... it compiles with the wrong require.extensions hook for some bizarre reason
test ( assert, component, target, window ) {

3
test/runtime/samples/window-event/_config.js
Unescape View File

@ -1,7 +1,8 @@
export default {
html: `<div>undefinedxundefined</div>`,
skip: /^v4/.test( process.version ), // node 4 apparently does some dumb stuff
skip: true, // some weird stuff happening with JSDOM 11
// skip: /^v4/.test( process.version ), // node 4 apparently does some dumb stuff
'skip-ssr': true, // there's some kind of weird bug with this test... it compiles with the wrong require.extensions hook for some bizarre reason
test ( assert, component, target, window ) {

2
test/server-side-rendering/samples/import-non-component/problems.js
Unescape View File

@ -1 +1 @@
export default 99;
module.exports = 99;

46
test/setup.js
Unescape View File

@ -1,9 +1,37 @@
const nodeVersionMatch = /^v(\d)/.exec(process.version);
const legacy = +nodeVersionMatch[1] < 6;
const babelrc = require("../package.json").babel;
if (legacy) {
require("babel-register")(babelrc);
} else {
require("reify");
}
const fs = require('fs');
const path = require('path');
require('console-group').install();
require('source-map-support').install();
require.extensions['.js'] = function(module, filename) {
const exports = [];
var code = fs.readFileSync(filename, 'utf-8')
.replace(/^import (?:\* as )?(\w+) from ['"]([^'"]+)['"];?/gm, 'var $1 = require("$2");')
.replace(/^import {([^}]+)} from ['"](.+)['"];?/gm, 'var {$1} = require("$2");')
.replace(/^export default /gm, 'module.exports = ')
.replace(/^export (const|let|var|class|function) (\w+)/gm, (match, type, name) => {
exports.push(name);
return `${type} ${name}`;
})
.replace(/^export \{([^}]+)\}/gm, (match, names) => {
names.split(',').filter(Boolean).forEach(name => {
exports.push(name);
});
return '';
})
.replace(/^export function (\w+)/gm, 'exports.$1 = function $1');
exports.forEach(name => {
code += `\nexports.${name} = ${name};`;
});
try {
return module._compile(code, filename);
} catch (err) {
console.log(code); // eslint-disable-line no-console
throw err;
}
};

1979
yarn.lock
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save