Add resources url

Author: ilgonmic

package.json

@@ -80,7 +80,7 @@
     "copy-examples": "node utils/copy-examples",
     "release:ci": "rm -rf dist && npm run build:all && $NPM_TOKEN=%env.NPM_TOKEN% npm publish",
     "start": "webpack-dev-server --port 9002",
-    "start-with-local-compiler": "webpack-dev-server --port 9002 --env webDemoUrl='//localhost:8080'",
+    "start-with-local-compiler": "webpack-dev-server --port 9002 --env webDemoUrl='//localhost:8080' webDemoResourcesUrl='//localhost:8081'",
     "lint": "eslint . --ext .ts",
     "fix": "eslint --fix --ext .ts .",
     "test": "npm run build:all && npm run test:run",

src/config.js

@@ -13,7 +13,10 @@ export const RUNTIME_CONFIG = { ...getConfigFromElement(currentScript) };
 export const API_URLS = {
   server: (RUNTIME_CONFIG.server || __WEBDEMO_URL__).replace(/\/$/, ''),
   composeServer: (
-    __WEBDEMO_URL__
+    __WEBDEMO_URL__ || 'https://compose.sandbox.intellij.net'
+  ).replace(/\/$/, ''),
+  composeResources: (
+    __WEBDEMO_RESOURCES_URL__ || 'https://compose.sandbox.intellij.net'
   ).replace(/\/$/, ''),
 
   COMPILE(platform, version) {
@@ -62,17 +65,23 @@ export const API_URLS = {
   get VERSIONS() {
     return `${this.server}/versions`;
   },
+  SKIKO_VERSION() {
+    return `${this.composeServer}/api/resource/skiko`;
+  },
   SKIKO_MJS(version) {
-    return `${this.composeServer}/api/resource/skiko.mjs`;
+    return `${this.composeResources}/api/resource/skiko-${version}.mjs`;
   },
   SKIKO_WASM(version) {
-    return `${this.composeServer}/api/resource/skiko.wasm`;
+    return `${this.composeResources}/api/resource/skiko-${version}.wasm`;
+  },
+  STDLIB_HASH() {
+    return `${this.composeServer}/api/resource/stdlib`;
   },
-  STDLIB_MJS(version) {
-    return `${this.composeServer}/api/resource/stdlib.mjs`;
+  STDLIB_MJS(hash) {
+    return `${this.composeResources}/api/resource/stdlib-${hash}.mjs`;
   },
-  STDLIB_WASM(version) {
-    return `${this.composeServer}/api/resource/stdlib.wasm`;
+  STDLIB_WASM(hash) {
+    return `${this.composeResources}/api/resource/stdlib-${hash}.wasm`;
   },
   get JQUERY() {
     return `https://cdn.jsdelivr.net/npm/jquery@1/dist/jquery.min.js`;

src/js-executor/index.js

@@ -183,38 +183,50 @@ export default class JsExecutor {
     }
     if (targetPlatform === TargetPlatforms.COMPOSE_WASM) {
 
-      const skikoExports = fetch(API_URLS.SKIKO_MJS(compilerVersion), {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'text/javascript',
-        }
-      }).then(script => script.text())
-        .then(script => script.replace(
-          "new URL(\"skiko.wasm\",import.meta.url).href",
-          `'${API_URLS.SKIKO_WASM(compilerVersion)}'`
-        ))
-        .then(async skikoCode =>
-          executeJs(
-            this.iframe.contentWindow,
-            skikoCode,
-          ))
-        .then(skikoExports => fixedSkikoExports(skikoExports))
+      const skikoExports = fetch(API_URLS.SKIKO_VERSION(), {
+        method: 'GET'
+      }).then(response => response.text())
+        .then(version =>
+          fetch(API_URLS.SKIKO_MJS(version), {
+            method: 'GET',
+            headers: {
+              'Content-Type': 'text/javascript',
+            }
+          }).then(script => script.text())
+            .then(script => script.replace(
+              "new URL(\"skiko.wasm\",import.meta.url).href",
+              `'${API_URLS.SKIKO_WASM(version)}'`
+            ))
+            .then(async skikoCode =>
+              executeJs(
+                this.iframe.contentWindow,
+                skikoCode,
+              ))
+            .then(skikoExports => fixedSkikoExports(skikoExports)))
 
-      const stdlibExports = fetch(API_URLS.STDLIB_MJS(compilerVersion), {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'text/javascript',
-        }
-      }).then(script => script.text())
-        .then(script => script.replace(
-          "new URL('./stdlib.wasm',import.meta.url).href",
-          `'${API_URLS.STDLIB_WASM(compilerVersion)}'`
-        ))
-        .then(stdlibCode =>
-          executeWasmCodeWithSkiko(
-            this.iframe.contentWindow,
-            stdlibCode,
-          )
+      const stdlibExports = fetch(API_URLS.STDLIB_HASH(), {
+        method: 'GET'
+      }).then(response => response.text())
+        .then(hash =>
+          fetch(API_URLS.STDLIB_MJS(hash), {
+            method: 'GET',
+            headers: {
+              'Content-Type': 'text/javascript',
+            }
+          }).then(script => script.text())
+            .then(script => script.replace(
+              "new URL('./stdlib.wasm',import.meta.url).href",
+              `'${API_URLS.STDLIB_WASM(hash)}'`
+            ).replace(
+              "(extends) => { return { extends }; }",
+              "(extends_) => { return { extends_ }; }"
+            ))
+            .then(stdlibCode =>
+              executeWasmCodeWithSkiko(
+                this.iframe.contentWindow,
+                stdlibCode,
+              )
+            )
         )
 
       this.stdlibExports = Promise.all([skikoExports, stdlibExports])

webpack.config.js

@@ -9,6 +9,7 @@ module.exports = (params = {}) => {
   const isServer = process.argv[1].includes('webpack-dev-server');
   const libraryName = 'KotlinPlayground';
   const webDemoUrl = params.webDemoUrl || 'https://api.kotlinlang.org/';
+  const webDemoResourcesUrl = params.webDemoResourcesUrl || 'https://api.kotlinlang.org/';
   const examplesPath = isServer ? '' : 'examples/';
   const pathDist = path.resolve(__dirname, 'dist');
 
@@ -98,6 +99,7 @@ module.exports = (params = {}) => {
 
       new webpack.DefinePlugin({
         __WEBDEMO_URL__: JSON.stringify(webDemoUrl),
+        __WEBDEMO_RESOURCES_URL__: JSON.stringify(webDemoResourcesUrl),
         __IS_PRODUCTION__: isProduction,
         __LIBRARY_NAME__: JSON.stringify(libraryName),
       }),