sourcemaps.patch 7.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112
  1. diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
  2. index 7826f48..eca4a1d 100644
  3. --- a/build/gulpfile.extensions.js
  4. +++ b/build/gulpfile.extensions.js
  5. @@ -23,2 +23,3 @@ const plumber = require('gulp-plumber');
  6. const ext = require('./lib/extensions');
  7. +const product = require('../product.json');
  8. @@ -74,3 +75,3 @@ const compilations = [
  9. -const getBaseUrl = out => `https://main.vscode-cdn.net/sourcemaps/${commit}/${out}`;
  10. +const getBaseUrl = out => `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}/${out.replaceAll('/', '-')}`;
  11. diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
  12. index 10b7b44..79861bf 100644
  13. --- a/build/gulpfile.reh.js
  14. +++ b/build/gulpfile.reh.js
  15. @@ -454,3 +454,3 @@ function tweakProductForServerWeb(product) {
  16. util.rimraf(`out-vscode-${type}-min`),
  17. - optimize.minifyTask(`out-vscode-${type}`, `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
  18. + optimize.minifyTask(`out-vscode-${type}`, `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}/core`)
  19. ));
  20. diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
  21. index ed06b6a..9488983 100644
  22. --- a/build/gulpfile.vscode.js
  23. +++ b/build/gulpfile.vscode.js
  24. @@ -147,3 +147,3 @@ gulp.task(bundleVSCodeTask);
  25. -const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
  26. +const sourceMappingURLBase = `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}`;
  27. const minifyVSCodeTask = task.define('minify-vscode', task.series(
  28. diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js
  29. index 295a977..318ce92 100644
  30. --- a/build/gulpfile.vscode.web.js
  31. +++ b/build/gulpfile.vscode.web.js
  32. @@ -140,3 +140,3 @@ const minifyVSCodeWebTask = task.define('minify-vscode-web', task.series(
  33. util.rimraf('out-vscode-web-min'),
  34. - optimize.minifyTask('out-vscode-web', `https://main.vscode-cdn.net/sourcemaps/${commit}/core`)
  35. + optimize.minifyTask('out-vscode-web', `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}/core`)
  36. ));
  37. diff --git a/build/lib/extensions.js b/build/lib/extensions.js
  38. index e373688..efa26c9 100644
  39. --- a/build/lib/extensions.js
  40. +++ b/build/lib/extensions.js
  41. @@ -75,4 +75,5 @@ const vzip = require('gulp-vinyl-zip');
  42. const root = path_1.default.dirname(path_1.default.dirname(__dirname));
  43. +const product = JSON.parse(fs_1.default.readFileSync(path_1.default.join(root, 'product.json'), 'utf8'));
  44. const commit = (0, getVersion_1.getVersion)(root);
  45. -const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
  46. +const sourceMappingURLBase = `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}`;
  47. function minifyExtensionResources(input) {
  48. @@ -205,3 +206,3 @@ function fromLocalWebpack(extensionPath, webpackConfigFileName, disableMangle) {
  49. data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
  50. - return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path_1.default.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
  51. + return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions-${path_1.default.basename(extensionPath).replaceAll('/', '-')}-${relativeOutputPath.replaceAll('/', '-')}-${g1.replaceAll('/', '-')}`;
  52. }), 'utf8');
  53. diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
  54. index 4779ddb..e19fc36 100644
  55. --- a/build/lib/extensions.ts
  56. +++ b/build/lib/extensions.ts
  57. @@ -30,4 +30,5 @@ const vzip = require('gulp-vinyl-zip');
  58. const root = path.dirname(path.dirname(__dirname));
  59. +const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
  60. const commit = getVersion(root);
  61. -const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
  62. +const sourceMappingURLBase = `https://github.com/VSCodium/sourcemaps/releases/download/${product.quality}-${commit}`;
  63. @@ -179,3 +180,3 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string,
  64. data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
  65. - return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
  66. + return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions-${path.basename(extensionPath).replaceAll('/', '-')}-${relativeOutputPath.replaceAll('/', '-')}-${g1.replaceAll('/', '-')}`;
  67. }), 'utf8');
  68. diff --git a/build/lib/optimize.js b/build/lib/optimize.js
  69. index 2ba72a9..4ea70d0 100644
  70. --- a/build/lib/optimize.js
  71. +++ b/build/lib/optimize.js
  72. @@ -188,3 +188,3 @@ function bundleTask(opts) {
  73. function minifyTask(src, sourceMapBaseUrl) {
  74. - const sourceMappingURL = sourceMapBaseUrl ? ((f) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
  75. + const sourceMappingURL = sourceMapBaseUrl ? ((f) => `${sourceMapBaseUrl}-${f.relative.replaceAll('/', '-')}.map`) : undefined;
  76. const target = getBuildTarget();
  77. diff --git a/build/lib/optimize.ts b/build/lib/optimize.ts
  78. index 1e824a5..808dbeb 100644
  79. --- a/build/lib/optimize.ts
  80. +++ b/build/lib/optimize.ts
  81. @@ -225,3 +225,3 @@ export function bundleTask(opts: IBundleESMTaskOpts): () => NodeJS.ReadWriteStre
  82. export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) => void {
  83. - const sourceMappingURL = sourceMapBaseUrl ? ((f: any) => `${sourceMapBaseUrl}/${f.relative}.map`) : undefined;
  84. + const sourceMappingURL = sourceMapBaseUrl ? ((f: any) => `${sourceMapBaseUrl}-${f.relative.replaceAll('/', '-')}.map`) : undefined;
  85. const target = getBuildTarget();
  86. diff --git a/build/lib/util.js b/build/lib/util.js
  87. index 9d2f3b1..62a5afc 100644
  88. --- a/build/lib/util.js
  89. +++ b/build/lib/util.js
  90. @@ -237,4 +237,4 @@ function rewriteSourceMappingURL(sourceMappingURLBase) {
  91. const contents = f.contents.toString('utf8');
  92. - const str = `//# sourceMappingURL=${sourceMappingURLBase}/${path_1.default.dirname(f.relative).replace(/\\/g, '/')}/$1`;
  93. - f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, str));
  94. + const fp = path_1.default.dirname(f.relative).replace(/\\/g, '/').replaceAll('/', '-');
  95. + f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, (_m, p) => `//# sourceMappingURL=${sourceMappingURLBase}/${fp}-${p.replaceAll('/', '-')}`));
  96. return f;
  97. diff --git a/build/lib/util.ts b/build/lib/util.ts
  98. index 5f3b2f6..7863dd4 100644
  99. --- a/build/lib/util.ts
  100. +++ b/build/lib/util.ts
  101. @@ -286,4 +286,4 @@ export function rewriteSourceMappingURL(sourceMappingURLBase: string): NodeJS.Re
  102. const contents = (<Buffer>f.contents).toString('utf8');
  103. - const str = `//# sourceMappingURL=${sourceMappingURLBase}/${path.dirname(f.relative).replace(/\\/g, '/')}/$1`;
  104. - f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, str));
  105. + const fp = path.dirname(f.relative).replace(/\\/g, '/').replaceAll('/', '-');
  106. + f.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, (_m, p) => `//# sourceMappingURL=${sourceMappingURLBase}/${fp}-${p.replaceAll('/', '-')}`));
  107. return f;