Pārlūkot izejas kodu

Merge pull request #19546 from munrocket/rollup

fix rollup.unit.config.js
Mr.doob 5 gadi atpakaļ
vecāks
revīzija
3b46bf5088
3 mainītis faili ar 8 papildinājumiem un 7 dzēšanām
  1. 1 1
      package.json
  2. 1 0
      test/package.json
  3. 6 6
      test/rollup.unit.config.js

+ 1 - 1
package.json

@@ -49,7 +49,7 @@
     "build": "rollup -c utils/build/rollup.config.js",
     "build-closure": "rollup -c utils/build/rollup.config.js && google-closure-compiler --warning_level=VERBOSE --jscomp_off=globalThis --jscomp_off=checkTypes --externs utils/build/externs.js --language_in=ECMASCRIPT5_STRICT --js build/three.js --js_output_file build/three.min.js",
     "dev": "concurrently --names \"ROLLUP,HTTP\" -c \"bgBlue.bold,bgGreen.bold\" \"rollup -c utils/build/rollup.config.js -w -m inline\" \"http-server -c-1 -p 8080\"",
-    "dev-test": "concurrently --names \"ROLLUP,ROLLUPTEST,HTTP\" -c \"bgBlue.bold,bgRed.bold,bgGreen.bold\" \"rollup -c utils/build/rollup.config.js -w -m inline\" \"rollup -c test/rollup.unit.config.js -w -m inline\" \"http-server -p 8080\"",
+    "dev-test": "concurrently --names \"ROLLUP,ROLLUPTEST,HTTP\" -c \"bgBlue.bold,bgRed.bold,bgGreen.bold\" \"rollup -c utils/build/rollup.config.js -w -m inline\" \"npm run dev --prefix test\" \"http-server -p 8080\"",
     "lint-docs": "eslint docs --ext html",
     "lint-examples": "eslint examples/jsm --ext js --ext ts --ignore-pattern libs && tsc -p utils/build/tsconfig-examples.lint.json",
     "test-lint": "eslint src --ext js --ext ts && tsc -p utils/build/tsconfig.lint.json",

+ 1 - 0
test/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "description": "This package hiding test dependincies from main repo because puppeteer is pretty big.",
   "scripts": {
+    "dev": "rollup -c rollup.unit.config.js -w -m inline",
     "unit": "rollup -c rollup.unit.config.js && qunit -r failonlyreporter unit/build/three.source.unit.js"
   },
   "devDependencies": {

+ 6 - 6
test/rollup.unit.config.js

@@ -38,7 +38,7 @@ function glsl() {
 export default [
 	// editor unit conf
 	{
-		input: 'test/unit/three.editor.unit.js',
+		input: 'unit/three.editor.unit.js',
 		plugins: [
 			glsl()
 		],
@@ -47,7 +47,7 @@ export default [
 			{
 				format: 'umd',
 				name: 'THREE',
-				file: 'test/unit/build/three.editor.unit.js',
+				file: 'unit/build/three.editor.unit.js',
 				intro: 'QUnit.module( "Editor", () => {',
 				outro: '} );',
 				indent: '\t',
@@ -56,7 +56,7 @@ export default [
 	},
 	// example unit conf
 	{
-		input: 'test/unit/three.example.unit.js',
+		input: 'unit/three.example.unit.js',
 		plugins: [
 			glsl()
 		],
@@ -65,7 +65,7 @@ export default [
 			{
 				format: 'umd',
 				name: 'THREE',
-				file: 'test/unit/build/three.example.unit.js',
+				file: 'unit/build/three.example.unit.js',
 				intro: 'QUnit.module( "Example", () => {',
 				outro: '} );',
 				indent: '\t',
@@ -74,7 +74,7 @@ export default [
 	},
 	// source unit conf
 	{
-		input: 'test/unit/three.source.unit.js',
+		input: 'unit/three.source.unit.js',
 		plugins: [
 			glsl()
 		],
@@ -83,7 +83,7 @@ export default [
 			{
 				format: 'umd',
 				name: 'THREE',
-				file: 'test/unit/build/three.source.unit.js',
+				file: 'unit/build/three.source.unit.js',
 				intro: 'QUnit.module( "Source", () => {',
 				outro: '} );',
 				indent: '\t',