diff --git a/.gitignore b/.gitignore index 5aa039e..7192ea9 100644 --- a/.gitignore +++ b/.gitignore @@ -134,4 +134,5 @@ release/* spine-runtimes/* _*.json .DS_Store -*test* \ No newline at end of file +*test* +*_v2/* \ No newline at end of file diff --git a/config.yaml b/config.yaml index 271e3eb..337ad37 100644 --- a/config.yaml +++ b/config.yaml @@ -1,4 +1,6 @@ -folder: +folder: + directory_src: directory + showcase_src: showcase operator: ./operator/ release: ./release/ background: background diff --git a/jsconfig.json b/jsconfig.json index cc4bf68..09f54ac 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -2,7 +2,8 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "@/*": ["src/*"] + "@/*": ["showcase/src/*", "directory/src/*"], + "!/*": ["showcase/src/*"] } }, "exclude": ["node_modules", "**/node_modules", "dist", "operator", "release"] diff --git a/index.html b/showcase/index.html similarity index 100% rename from index.html rename to showcase/index.html diff --git a/src/components/fallback.css b/showcase/src/components/fallback.css similarity index 100% rename from src/components/fallback.css rename to showcase/src/components/fallback.css diff --git a/src/components/fallback.js b/showcase/src/components/fallback.js similarity index 100% rename from src/components/fallback.js rename to showcase/src/components/fallback.js diff --git a/src/components/music.js b/showcase/src/components/music.js similarity index 100% rename from src/components/music.js rename to showcase/src/components/music.js diff --git a/src/components/player.css b/showcase/src/components/player.css similarity index 100% rename from src/components/player.css rename to showcase/src/components/player.css diff --git a/src/components/player.js b/showcase/src/components/player.js similarity index 100% rename from src/components/player.js rename to showcase/src/components/player.js diff --git a/src/components/settings.css b/showcase/src/components/settings.css similarity index 100% rename from src/components/settings.css rename to showcase/src/components/settings.css diff --git a/src/components/settings.js b/showcase/src/components/settings.js similarity index 100% rename from src/components/settings.js rename to showcase/src/components/settings.js diff --git a/src/components/voice.css b/showcase/src/components/voice.css similarity index 100% rename from src/components/voice.css rename to showcase/src/components/voice.css diff --git a/src/components/voice.js b/showcase/src/components/voice.js similarity index 100% rename from src/components/voice.js rename to showcase/src/components/voice.js diff --git a/src/index.css b/showcase/src/index.css similarity index 100% rename from src/index.css rename to showcase/src/index.css diff --git a/src/index.js b/showcase/src/index.js similarity index 100% rename from src/index.js rename to showcase/src/index.js diff --git a/src/libs/check_web_gl.js b/showcase/src/libs/check_web_gl.js similarity index 100% rename from src/libs/check_web_gl.js rename to showcase/src/libs/check_web_gl.js diff --git a/src/libs/spine-player.css b/showcase/src/libs/spine-player.css similarity index 100% rename from src/libs/spine-player.css rename to showcase/src/libs/spine-player.css diff --git a/src/libs/spine-player.js b/showcase/src/libs/spine-player.js similarity index 100% rename from src/libs/spine-player.js rename to showcase/src/libs/spine-player.js diff --git a/src/libs/wallpaper_engine.js b/showcase/src/libs/wallpaper_engine.js similarity index 100% rename from src/libs/wallpaper_engine.js rename to showcase/src/libs/wallpaper_engine.js diff --git a/vite.config.js b/vite.config.js index a1b1a84..6236584 100644 --- a/vite.config.js +++ b/vite.config.js @@ -118,13 +118,13 @@ class ViteRunner { ...this.#baseViteConfig, envDir: path.join(__projectRoot, this.#globalConfig.folder.operator, operatorName), publicDir: path.resolve(__projectRoot, this.#globalConfig.folder.release, operatorName), - root: path.resolve(__projectRoot), + root: path.resolve(__projectRoot, this.#globalConfig.folder.showcase_src), server: { ...this.#baseViteConfig.server, }, resolve: { alias: { - '@': path.resolve(__projectRoot, './src'), + '@': path.resolve(__projectRoot, this.#globalConfig.folder.showcase_src, './src'), '!': path.resolve(__projectRoot, this.#globalConfig.folder.operator, operatorName), }, }, @@ -147,7 +147,7 @@ class ViteRunner { if (process.env.npm_lifecycle_event === 'vite:directory:build') { global.__config = this.#globalConfig } - const directoryDir = path.resolve(__projectRoot, 'directory') + const directoryDir = path.resolve(__projectRoot, this.#globalConfig.folder.directory_src) this.#mode = process.argv[3] // const publicDir = path.resolve(__projectRoot, this.#globalConfig.folder.release) const assetsDir = '_directory' @@ -170,7 +170,7 @@ class ViteRunner { resolve: { alias: { '@': path.resolve(directoryDir, './src'), - '!': path.resolve(__projectRoot, './src'), + '!': path.resolve(__projectRoot, this.#globalConfig.folder.showcase_src, './src'), }, }, build: {