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

most sourcemap tests working

Browse Source
pull/3539/head
Richard Harris 6 years ago
parent ff3501fe8f
commit f3064f13f2
6 changed files with 81 additions and 27 deletions
Show Stats Download Patch File Download Diff File

56
package-lock.json generated
Unescape View File

@ -331,7 +331,7 @@
"dev": true "dev": true
}, },
"astring": { "astring": {
"version": "github:Rich-Harris/astring#00fa527b66cc1b57efb2a4b9052dd4e190ae3590", "version": "github:Rich-Harris/astring#9f675d470d1c758de5ec42724aa5dd2e1dabf919",
"from": "github:Rich-Harris/astring#generic-handler", "from": "github:Rich-Harris/astring#generic-handler",
"dev": true "dev": true
}, },
@ -507,24 +507,16 @@
"dev": true "dev": true
}, },
"code-red": { "code-red": {
"version": "0.0.12", "version": "0.0.13",
"resolved": "https://registry.npmjs.org/code-red/-/code-red-0.0.12.tgz", "resolved": "https://registry.npmjs.org/code-red/-/code-red-0.0.13.tgz",
"integrity": "sha512-5R8zbm2z5CmHp2iSmV/kSDhXcdISJwBr898jIPeASEdsGrjFpT4Jhky0J659jLsZL9gzDBGn32rvR0YWDXzAvw==", "integrity": "sha512-cBYTCCcEuxdkIvK7LnDlZslan3NoYCV4YAH0xVkePuCD7/TOKg/vWXug7TNjKePLJEnc9isgeK76RzsBy1pShA==",
"dev": true, "dev": true,
"requires": { "requires": {
"acorn": "^7.0.0", "acorn": "^7.0.0",
"astring": "github:Rich-Harris/astring#00fa527b66cc1b57efb2a4b9052dd4e190ae3590", "astring": "github:Rich-Harris/astring#9f675d470d1c758de5ec42724aa5dd2e1dabf919",
"is-reference": "^1.1.3", "is-reference": "^1.1.3",
"periscopic": "^1.0.0", "periscopic": "^1.0.0",
"source-map": "^0.7.3" "source-map": "^0.7.3"
},
"dependencies": {
"source-map": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
"dev": true
}
} }
}, },
"codecov": { "codecov": {
@ -830,6 +822,13 @@
"resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
"integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
"dev": true "dev": true
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"optional": true
} }
} }
}, },
@ -1522,6 +1521,14 @@
"optimist": "^0.6.1", "optimist": "^0.6.1",
"source-map": "^0.6.1", "source-map": "^0.6.1",
"uglify-js": "^3.1.4" "uglify-js": "^3.1.4"
},
"dependencies": {
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
}
} }
}, },
"har-schema": { "har-schema": {
@ -3271,9 +3278,9 @@
} }
}, },
"source-map": { "source-map": {
"version": "0.6.1", "version": "0.7.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
"dev": true "dev": true
}, },
"source-map-support": { "source-map-support": {
@ -3284,6 +3291,14 @@
"requires": { "requires": {
"buffer-from": "^1.0.0", "buffer-from": "^1.0.0",
"source-map": "^0.6.0" "source-map": "^0.6.0"
},
"dependencies": {
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
}
} }
}, },
"sourcemap-codec": { "sourcemap-codec": {
@ -3591,6 +3606,15 @@
"requires": { "requires": {
"commander": "~2.20.0", "commander": "~2.20.0",
"source-map": "~0.6.1" "source-map": "~0.6.1"
},
"dependencies": {
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"optional": true
}
} }
}, },
"uri-js": { "uri-js": {

4
package.json
Unescape View File

@ -63,7 +63,7 @@
"acorn": "^7.0.0", "acorn": "^7.0.0",
"agadoo": "^1.0.1", "agadoo": "^1.0.1",
"c8": "^5.0.1", "c8": "^5.0.1",
"code-red": "0.0.12", "code-red": "0.0.13",
"codecov": "^3.5.0", "codecov": "^3.5.0",
"css-tree": "1.0.0-alpha22", "css-tree": "1.0.0-alpha22",
"eslint": "^6.3.0", "eslint": "^6.3.0",
@ -85,7 +85,7 @@
"rollup-plugin-sucrase": "^2.1.0", "rollup-plugin-sucrase": "^2.1.0",
"rollup-plugin-typescript": "^1.0.1", "rollup-plugin-typescript": "^1.0.1",
"rollup-plugin-virtual": "^1.0.1", "rollup-plugin-virtual": "^1.0.1",
"source-map": "^0.6.1", "source-map": "^0.7.3",
"source-map-support": "^0.5.13", "source-map-support": "^0.5.13",
"tiny-glob": "^0.2.6", "tiny-glob": "^0.2.6",
"tslib": "^1.10.0", "tslib": "^1.10.0",

32
src/compiler/compile/Component.ts
Unescape View File

@ -1,4 +1,3 @@
// @ts-ignore
import { walk, childKeys } from 'estree-walker'; import { walk, childKeys } from 'estree-walker';
import { getLocator } from 'locate-character'; import { getLocator } from 'locate-character';
import Stats from '../Stats'; import Stats from '../Stats';
@ -368,7 +367,17 @@ export default class Component {
? { code: null, map: null } ? { code: null, map: null }
: this.stylesheet.render(compile_options.cssOutputFilename, true); : this.stylesheet.render(compile_options.cssOutputFilename, true);
js = print(program); js = print(program, {
sourceMapSource: compile_options.filename
});
js.map.sources = [
compile_options.filename ? get_relative_path(compile_options.outputFilename || '', compile_options.filename) : null
];
js.map.sourcesContent = [
this.source
];
} }
return { return {
@ -1404,3 +1413,22 @@ function process_component_options(component: Component, nodes) {
return component_options; return component_options;
} }
function get_relative_path(from: string, to: string) {
const from_parts = from.split(/[/\\]/);
const to_parts = to.split(/[/\\]/);
from_parts.pop(); // get dirname
while (from_parts[0] === to_parts[0]) {
from_parts.shift();
to_parts.shift();
}
if (from_parts.length) {
let i = from_parts.length;
while (i--) from_parts[i] = '..';
}
return from_parts.concat(to_parts).join('/');
}

6
src/compiler/parse/acorn.ts
Unescape View File

@ -5,10 +5,12 @@ const Parser = acorn.Parser;
export const parse = (source: string) => Parser.parse(source, { export const parse = (source: string) => Parser.parse(source, {
sourceType: 'module', sourceType: 'module',
// @ts-ignore TODO pending release of fixed types // @ts-ignore TODO pending release of fixed types
ecmaVersion: 11 ecmaVersion: 11,
locations: true
}); });
export const parse_expression_at = (source: string, index: number) => Parser.parseExpressionAt(source, index, { export const parse_expression_at = (source: string, index: number) => Parser.parseExpressionAt(source, index, {
// @ts-ignore TODO pending release of fixed types // @ts-ignore TODO pending release of fixed types
ecmaVersion: 11 ecmaVersion: 11,
locations: true
}); });

8
test/sourcemaps/index.js
Unescape View File

@ -5,7 +5,7 @@ import { svelte } from "../helpers.js";
import { SourceMapConsumer } from "source-map"; import { SourceMapConsumer } from "source-map";
import { getLocator } from "locate-character"; import { getLocator } from "locate-character";
describe("sourcemaps", () => { describe.only("sourcemaps", () => {
fs.readdirSync("test/sourcemaps/samples").forEach(dir => { fs.readdirSync("test/sourcemaps/samples").forEach(dir => {
if (dir[0] === ".") return; if (dir[0] === ".") return;
@ -17,7 +17,7 @@ describe("sourcemaps", () => {
throw new Error("Forgot to remove `solo: true` from test"); throw new Error("Forgot to remove `solo: true` from test");
} }
(solo ? it.only : skip ? it.skip : it)(dir, () => { (solo ? it.only : skip ? it.skip : it)(dir, async () => {
const filename = path.resolve( const filename = path.resolve(
`test/sourcemaps/samples/${dir}/input.svelte` `test/sourcemaps/samples/${dir}/input.svelte`
); );
@ -61,10 +61,10 @@ describe("sourcemaps", () => {
const locateInSource = getLocator(input); const locateInSource = getLocator(input);
const smc = new SourceMapConsumer(js.map); const smc = await new SourceMapConsumer(js.map);
const locateInGenerated = getLocator(_code); const locateInGenerated = getLocator(_code);
const smcCss = css.map && new SourceMapConsumer(css.map); const smcCss = css.map && await new SourceMapConsumer(css.map);
const locateInGeneratedCss = getLocator(css.code || ''); const locateInGeneratedCss = getLocator(css.code || '');
test({ assert, code: _code, map: js.map, smc, smcCss, locateInSource, locateInGenerated, locateInGeneratedCss }); test({ assert, code: _code, map: js.map, smc, smcCss, locateInSource, locateInGenerated, locateInGeneratedCss });

Write Preview
Loading…
Cancel
Save