Merge pull request #13 from Next2D/develop

Develop

Author: ienaga

.gitignore

@@ -1,3 +1,24 @@
-.DS_Store
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
 .idea
-Thumbs.db
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

.npmignore

@@ -1,7 +1,11 @@
 .github
+.gitattributes
+.gitignore
 template/dist
+template/ios
+template/android
 template/node_modules
 template/package.json
 template/src/Packages.ts
 template/src/config/Config.ts
-template/electron.index.json
+template/electron.index.json

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Next2D
+Copyright (c) 2021 - 2023 Next2D
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

template/.gitignore

@@ -25,4 +25,5 @@ dist-ssr
 
 src/Packages.ts
 src/config/Config.ts
-electron.index.json
+electron.index.json
+out/

template/capacitor.config.json

@@ -1,7 +1,7 @@
 {
   "appId": "app.example.appId",
   "appName": "Example-Product-Name",
-  "webDir": "./dist/web/prd/",
+  "webDir": "dist/ios/prd/",
   "bundledWebRuntime": false,
   "plugins": {
     "SplashScreen": {

template/electron.build.js

@@ -0,0 +1,48 @@
+{
+    "appId": "app.example.appId",
+    "directories": {
+        "output": "dist"
+    },
+    "copyright": "Copyright ©2023 ExampleProductName",
+    "extraMetadata": {
+        "name": "ExampleProductName",
+        "author": "You'r name.",
+        "main": "electron.js",
+        "type": "commonjs"
+    },
+    "files": [
+        "!node_modules/@next2d/",
+        "!node_modules/@eslint/",
+        "!node_modules/@jest/",
+        "!node_modules/@vitest/",
+        "!node_modules/@ionic/",
+        "!node_modules/@capacitor/",
+        "!node_modules/vite/",
+        "!node_modules/vite-node/",
+        "!node_modules/vitest/",
+        "!package.json",
+        "node_modules/",
+        "electron.js",
+        "electron.index.json"
+    ],
+    "mac": {
+        "target": [{
+            "target": "zip",
+            "arch": ["universal"]
+        }],
+        "category": "Games",
+        "icon": "icon/macos/icon.icns"
+    },
+    "win": {
+        "target": [{
+            "target": "nsis",
+            "arch": ["x64"]
+        }],
+        "icon": "icon/windows/icon.png"
+    },
+    "linux": {
+        "target": "zip",
+        "category": "Games",
+        "icon": "icon/linux/icon.png"
+    }
+}

template/electron.build.json

@@ -14,7 +14,7 @@ const createWindow = () =>
 {
     const browserWindow = new BrowserWindow({
         "fullscreen": true,
-        "autoHideMenuBar": true,
+        "autoHideMenuBar": false,
         "webPreferences": {
             "nodeIntegration": false
         }

template/electron.js

@@ -2,38 +2,37 @@
   "name": "@next2d/framework-typescript-template",
   "version": "0.0.1",
   "description": "Next2D Framework TypeScript template.",
-  "author": "Toshiyuki Ienaga <ienaga@tvon.jp>",
-  "license": "MIT",
   "main": "src/index.ts",
   "type": "module",
   "scripts": {
     "start": "vite",
-    "dev:ios": "npx @next2d/builder run ios --platform ios --debug",
-    "dev:android": "npx @next2d/builder run android --platform android --debug",
-    "dev:macos": "npx @next2d/builder --platform macos --debug",
-    "dev:windows": "npx @next2d/builder --platform windows --debug",
-    "dev:linux": "npx @next2d/builder --platform linux --debug",
+    "preview:ios": "npx @next2d/builder --platform ios --preview",
+    "preview:android": "npx @next2d/builder --platform android --preview",
+    "preview:macos": "npx @next2d/builder --platform macos --preview",
+    "preview:windows": "npx @next2d/builder --platform windows --preview",
+    "preview:linux": "npx @next2d/builder --platform linux --preview",
     "build:steam:windows": "npx @next2d/builder --platform steam:windows --env prd",
-    "build:steam:mac": "npx @next2d/builder --platform steam:mac --env prd",
+    "build:steam:macos": "npx @next2d/builder --platform steam:macos --env prd",
     "build:steam:linux": "npx @next2d/builder --platform steam:linux --env prd",
     "build:web": "npx @next2d/builder --platform web --env prd",
-    "build": "vite build",
+    "build": "npx @next2d/builder",
     "lint": "eslint src/**/*.ts",
     "test": "npx vitest",
-    "generate": "npx @next2d/view-generator"
+    "generate": "npx @next2d/view-generator",
+    "package": "electron-forge package",
+    "make": "electron-forge make"
   },
   "devDependencies": {
     "@capacitor/android": "^5.5.1",
     "@capacitor/cli": "^5.5.1",
     "@capacitor/core": "^5.5.1",
     "@capacitor/ios": "^5.5.1",
-    "@next2d/env": "^2.0.2",
-    "@next2d/framework": "^2.0.0",
+    "@next2d/framework": "^2.0.1",
     "@next2d/player": "^1.18.9",
-    "@next2d/vite-auto-loader-plugin": "^0.0.7",
-    "@typescript-eslint/eslint-plugin": "^6.9.1",
-    "@typescript-eslint/parser": "^6.9.1",
-    "electron": "^27.0.3",
+    "@next2d/vite-auto-loader-plugin": "^1.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
+    "electron": "^27.0.4",
     "eslint": "^8.53.0",
     "jsdom": "^22.1.0",
     "typescript": "^5.2.2",

template/package.json

@@ -1,11 +1,14 @@
+/// <reference types="vitest" />
+
 import { defineConfig } from "vite";
 import path from "path";
-import env from "@next2d/env";
 import autoLoader from "@next2d/vite-auto-loader-plugin";
 
 const port: number = 5173;
 export default defineConfig({
+    "base": "./",
     "build": {
+        "outDir": "dist",
         "target": "esnext",
         "modulePreload": {
             "polyfill": false
@@ -17,7 +20,7 @@ export default defineConfig({
         }
     },
     "plugins": [
-        autoLoader(env())
+        autoLoader()
     ],
     "server": {
         "open": "index.html",