mirrors/svelte
mirrors/svelte
0
0
Fork 0
mirror of https://github.com/sveltejs/svelte.git synced 2024-12-01 17:30:59 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/puppeteer' into examples

Browse Source
This commit is contained in:
Richard Harris 2019-03-10 16:06:38 -04:00
commit 86aba6a2aa
4 changed files with 107 additions and 783 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

815
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "svelte",
"version": "3.0.0-beta.13",
"version": "3.0.0-beta.14",
"description": "The magical disappearing UI framework",
"module": "index.mjs",
"main": "index",
@ -67,7 +67,7 @@
"locate-character": "^2.0.5",
"magic-string": "^0.25.2",
"mocha": "^5.2.0",
"nightmare": "^3.0.1",
"puppeteer": "^1.13.0",
"rollup": "^1.1.2",
"rollup-plugin-commonjs": "^9.1.0",
"rollup-plugin-json": "^3.0.0",

4
src/compile/render-dom/wrappers/InlineComponent/index.ts
View File

@ -63,7 +63,7 @@ export default class InlineComponentWrapper extends Wrapper {
});
this.var = (
this.node.name === 'svelte:self' ? '__svelte:self__' : // TODO conflict-proof this
this.node.name === 'svelte:self' ? renderer.component.name :
this.node.name === 'svelte:component' ? 'switch_instance' :
this.node.name
).toLowerCase();
@ -452,7 +452,7 @@ export default class InlineComponentWrapper extends Wrapper {
block.builders.destroy.addLine(`if (${name}) ${name}.$destroy(${parentNode ? '' : 'detach'});`);
} else {
const expression = this.node.name === 'svelte:self'
? component.name
? '__svelte:self__' // TODO conflict-proof this
: component.qualify(this.node.name);
block.builders.init.addBlock(deindent`

67
test/custom-elements/index.js
View File

@ -3,7 +3,7 @@ import * as path from 'path';
import * as http from 'http';
import { rollup } from 'rollup';
import * as virtual from 'rollup-plugin-virtual';
import * as Nightmare from 'nightmare';
import * as puppeteer from 'puppeteer';
import { addLineNumbers, loadConfig, loadSvelte } from "../helpers.js";
const page = `
@ -20,30 +20,36 @@ describe('custom-elements', function() {
let svelte;
let server;
let bundle;
before(() => {
svelte = loadSvelte();
let browser;
let code;
function create_server() {
return new Promise((fulfil) => {
server = http.createServer((req, res) => {
const server = http.createServer((req, res) => {
if (req.url === '/') {
res.end(page);
}
if (req.url === '/bundle.js') {
res.end(bundle);
res.end(code);
}
});
server.listen('6789', () => {
fulfil();
fulfil(server);
});
});
}
before(async () => {
svelte = loadSvelte();
server = await create_server();
browser = await puppeteer.launch();
});
after(() => {
after(async () => {
server.close();
await browser.close();
});
fs.readdirSync('test/custom-elements/samples').forEach(dir => {
@ -54,10 +60,10 @@ describe('custom-elements', function() {
const internal = path.resolve('internal.mjs');
const index = path.resolve('index.mjs');
(solo ? it.only : skip ? it.skip : it)(dir, () => {
(solo ? it.only : skip ? it.skip : it)(dir, async () => {
const config = loadConfig(`./custom-elements/samples/${dir}/_config.js`);
return rollup({
const bundle = await rollup({
input: `test/custom-elements/samples/${dir}/test.js`,
plugins: [
{
@ -87,35 +93,26 @@ describe('custom-elements', function() {
assert
})
]
})
.then(bundle => bundle.generate({ format: 'iife', name: 'test' }))
.then(result => {
bundle = result.output[0].code;
});
const nightmare = new Nightmare({ show: false });
const result = await bundle.generate({ format: 'iife', name: 'test' });
code = result.output[0].code;
nightmare.on('console', (type, ...args) => {
console[type](...args);
});
const page = await browser.newPage();
return nightmare
.goto('http://localhost:6789')
.evaluate(() => {
return test(document.querySelector('main'));
})
.then(result => {
if (result) console.log(result);
return nightmare.end();
})
.catch(message => {
console.log(addLineNumbers(bundle));
return nightmare.end().then(() => {
throw new Error(message);
});
});
});
page.on('console', (type, ...args) => {
console[type](...args);
});
try {
await page.goto('http://localhost:6789');
const result = await page.evaluate(() => test(document.querySelector('main')));
if (result) console.log(result);
} catch (err) {
console.log(addLineNumbers(code));
throw err;
}
});
});
});