From df341959b38c1c62f54d8cfe696a2043c38e35e0 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Sat, 16 May 2020 23:34:52 +0200 Subject: [PATCH] web: Convert js-src to its own package that's depended on by selfhosted/extension/demo --- web/demo/package-lock.json | 4 ++++ web/demo/package.json | 3 ++- web/demo/www/index.js | 4 ++-- web/extension/js/index.js | 4 ++-- web/extension/package-lock.json | 4 ++++ web/extension/package.json | 3 ++- web/js-src/package-lock.json | 5 +++++ web/js-src/package.json | 6 ++++++ web/selfhosted/js/ruffle.js | 6 +++--- web/selfhosted/package-lock.json | 4 ++++ web/selfhosted/package.json | 3 ++- 11 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 web/js-src/package-lock.json create mode 100644 web/js-src/package.json diff --git a/web/demo/package-lock.json b/web/demo/package-lock.json index b4b654159..9ca4b237c 100644 --- a/web/demo/package-lock.json +++ b/web/demo/package-lock.json @@ -4734,6 +4734,10 @@ "inherits": "^2.0.1" } }, + "ruffle-core": { + "version": "file:../js-src", + "dev": true + }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", diff --git a/web/demo/package.json b/web/demo/package.json index 0a4782d05..d5e59e622 100644 --- a/web/demo/package.json +++ b/web/demo/package.json @@ -13,6 +13,7 @@ "html-webpack-plugin": "^3.2.0", "webpack": "^4.42.0", "webpack-cli": "^3.3.11", - "webpack-dev-server": "^3.10.3" + "webpack-dev-server": "^3.10.3", + "ruffle-core": "file:../js-src" } } diff --git a/web/demo/www/index.js b/web/demo/www/index.js index 21ba8cf4c..3ec16fa5d 100644 --- a/web/demo/www/index.js +++ b/web/demo/www/index.js @@ -1,5 +1,5 @@ -import { PublicAPI } from "../../js-src/public-api"; -import { SourceAPI } from "../../js-src/source-api"; +import { PublicAPI } from "ruffle-core/public-api"; +import { SourceAPI } from "ruffle-core/source-api"; window.RufflePlayer = PublicAPI.negotiate( window.RufflePlayer, diff --git a/web/extension/js/index.js b/web/extension/js/index.js index 0c7c99d2a..f092186d6 100644 --- a/web/extension/js/index.js +++ b/web/extension/js/index.js @@ -1,5 +1,5 @@ -import { PublicAPI } from "../../js-src/public-api"; -import { SourceAPI } from "../../js-src/source-api"; +import { PublicAPI } from "ruffle-core/public-api"; +import { SourceAPI } from "ruffle-core/source-api"; window.RufflePlayer = PublicAPI.negotiate( window.RufflePlayer, diff --git a/web/extension/package-lock.json b/web/extension/package-lock.json index 6e61f6a74..20fe7bbfb 100644 --- a/web/extension/package-lock.json +++ b/web/extension/package-lock.json @@ -4326,6 +4326,10 @@ "inherits": "^2.0.1" } }, + "ruffle-core": { + "version": "file:../js-src", + "dev": true + }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", diff --git a/web/extension/package.json b/web/extension/package.json index 0804b75b8..1f219c420 100644 --- a/web/extension/package.json +++ b/web/extension/package.json @@ -12,6 +12,7 @@ "copy-webpack-plugin": "^5.1.0", "webpack": "^4.41.2", "webpack-cli": "^3.3.10", - "webpack-dev-server": "^3.9.0" + "webpack-dev-server": "^3.9.0", + "ruffle-core": "file:../js-src" } } diff --git a/web/js-src/package-lock.json b/web/js-src/package-lock.json new file mode 100644 index 000000000..2428bc4f5 --- /dev/null +++ b/web/js-src/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "ruffle-core", + "version": "0.1.0", + "lockfileVersion": 1 +} diff --git a/web/js-src/package.json b/web/js-src/package.json new file mode 100644 index 000000000..c022927ac --- /dev/null +++ b/web/js-src/package.json @@ -0,0 +1,6 @@ +{ + "name": "ruffle-core", + "version": "0.1.0", + "description": "Core bindings for Ruffle", + "private": true +} diff --git a/web/selfhosted/js/ruffle.js b/web/selfhosted/js/ruffle.js index 951030965..66ddab6ed 100644 --- a/web/selfhosted/js/ruffle.js +++ b/web/selfhosted/js/ruffle.js @@ -1,6 +1,6 @@ -import { PublicAPI } from "../../js-src/public-api"; -import { SourceAPI } from "../../js-src/source-api"; -import { public_path } from "../../js-src/public-path"; +import { PublicAPI } from "ruffle-core/public-api"; +import { SourceAPI } from "ruffle-core/source-api"; +import { public_path } from "ruffle-core/public-path"; window.RufflePlayer = PublicAPI.negotiate( window.RufflePlayer, diff --git a/web/selfhosted/package-lock.json b/web/selfhosted/package-lock.json index 84874a2d3..707b3f7e7 100644 --- a/web/selfhosted/package-lock.json +++ b/web/selfhosted/package-lock.json @@ -4290,6 +4290,10 @@ "inherits": "^2.0.1" } }, + "ruffle-core": { + "version": "file:../js-src", + "dev": true + }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", diff --git a/web/selfhosted/package.json b/web/selfhosted/package.json index 79008c231..e01de3e3f 100644 --- a/web/selfhosted/package.json +++ b/web/selfhosted/package.json @@ -11,6 +11,7 @@ "clean-webpack-plugin": "^3.0.0", "webpack": "^4.43.0", "webpack-cli": "^3.3.11", - "webpack-dev-server": "^3.11.0" + "webpack-dev-server": "^3.11.0", + "ruffle-core": "file:../js-src" } }