Add .devcontainer + minor changes

.devcontainer/Dockerfile

@@ -1,3 +1 @@
-FROM local/nodejs/dev:18
-
-USER node
+FROM local/nodejs/dev:18

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
 	"workspaceFolder": "/home/project/seedling",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "seedling",
-	"postCreateCommand": "sudo chown node:node -R /home/project",
+	"postCreateCommand": "sudo chown iamuser:iamuser -R /home/project",
 	"customizations": {
 		"vscode": {
 			"extensions": [

.eslintignore

@@ -0,0 +1 @@
+source/

.gitignore

@@ -4,6 +4,7 @@ app/
 node_modules/
 
 .vscode/
+.idea/
 
 .pnpm/
 .pnpm-store/

create.js

@@ -7,14 +7,14 @@ const argv = require('minimist')(process.argv.slice(2));
 const appName = argv.name ?? 'app';
 const appPort = argv.port ?? '0';
 
-const defaultContextDir = './';
+const defaultContextDir = '.';
 const rootDir = __dirname;
-const contextDir = `${argv._[0]}/` ?? defaultContextDir;
+const contextDir = `${argv._[0] ?? defaultContextDir}`;
 
 // create app folder
 const appsDir = `${contextDir}/apps`;
 const uiDir = `${contextDir}/apps/${appName}-ui`;
-const apiDir = `${contextDir}/apps/${appName}-rest`;
+const restDir = `${contextDir}/apps/${appName}-rest`;
 
 // prepare structure folders
 if (!fs.existsSync(uiDir)) {
@@ -24,8 +24,8 @@ if (!fs.existsSync(uiDir)) {
 	fs.mkdirSync(appsDir);
 	fs.mkdirSync(uiDir);
 	fs.mkdirSync(`${uiDir}/src`);
-	fs.mkdirSync(apiDir);
-	fs.mkdirSync(`${apiDir}/src`);
+	fs.mkdirSync(restDir);
+	fs.mkdirSync(`${restDir}/src`);
 }
 
 // copy folder content
@@ -38,7 +38,7 @@ try {
 		force: true,
 		recursive: true,
 	});
-	fs.cpSync(`${rootDir}/source/rest/`, apiDir, {
+	fs.cpSync(`${rootDir}/source/rest/`, restDir, {
 		force: true,
 		recursive: true,
 	});
@@ -55,29 +55,29 @@ fs.renameSync(`${contextDir}/gitignore`, `${contextDir}/.gitignore`);
 fs.renameSync(`${contextDir}/prettierrc`, `${contextDir}/.prettierrc`);
 fs.renameSync(`${contextDir}/.tsconfig.json`, `${contextDir}/tsconfig.json`);
 fs.renameSync(`${uiDir}/.tsconfig.json`, `${uiDir}/tsconfig.json`);
-fs.renameSync(`${apiDir}/.tsconfig.json`, `${apiDir}/tsconfig.json`);
+fs.renameSync(`${restDir}/.tsconfig.json`, `${restDir}/tsconfig.json`);
 
 // replace in files
 replaceInFiles.sync({
-	files: `./${contextDir}/**/*.{ts,tsx}`,
-	from: /\/\/.\@ts\-nocheck\n/gm,
+	files: [`${contextDir}/**/*`, `${contextDir}/.devcontainer/*`],
+	from: /\/\/.@ts-nocheck\n/gm,
 	to: '',
 });
 replaceInFiles.sync({
-	files: `./${contextDir}/**/*`,
+	files: [`${contextDir}/**/*`, `${contextDir}/.devcontainer/*`],
 	from: /\$\(appName\)/gm,
 	to: appName,
 });
 replaceInFiles.sync({
-	files: `./${contextDir}/**/*`,
+	files: [`${contextDir}/**/*`, `${contextDir}/.devcontainer/*`],
 	from: /\$\(AppName\)/gm,
 	to: appName.charAt(0).toUpperCase() + appName.slice(1),
 });
 replaceInFiles.sync({
-	files: `./${contextDir}/**/*`,
+	files: [`${contextDir}/**/*`, `${contextDir}/.devcontainer/*`],
 	from: /\$\(appPort\)/gm,
 	to: appPort,
 });
 
 // install deps
-execSync(`pnpm i`, { cwd: `./${contextDir}` })
+execSync(`pnpm i`, { cwd: `${contextDir}` });

package.json

@@ -12,7 +12,6 @@
     "release": "pnpm version --no-git-tag-version"
   },
   "dependencies": {
-    "app": "link:app",
     "minimist": "1.2.8",
     "replace-in-file": "7.0.2"
   },

pnpm-lock.yaml

@@ -5,9 +5,6 @@ settings:
   excludeLinksFromLockfile: false
 
 dependencies:
-  app:
-    specifier: link:app
-    version: link:app
   minimist:
     specifier: 1.2.8
     version: 1.2.8

source/common/.devcontainer/Dockerfile

@@ -0,0 +1 @@
+FROM local/nodejs/dev:18

source/common/.devcontainer/devcontainer.json

@@ -0,0 +1,7 @@
+{
+	"name": "$(appName)",
+	"workspaceFolder": "/home/project/$(appName)",
+	"dockerComposeFile": "docker-compose.yml",
+	"service": "$(appName)",
+	"postCreateCommand": "sudo chown iamuser:iamuser -R /home/project",
+}

source/common/.devcontainer/docker-compose.yml

@@ -0,0 +1,18 @@
+version: "3"
+
+name: $(appName)
+
+volumes:
+  node_modules:
+  pnpm-store:
+
+services:
+  seedling:
+    build:
+      context: .
+    container_name: $(appName)
+    volumes:
+      - ../:/home/project/$(appName)
+      - node_modules:/home/project/seedling/node_modules
+      - pnpm-store:/home/project/seedling/.pnpm-store
+    command: sleep infinity

source/common/.env

@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=$(appName)

source/ui/scripts/webpack-dev.js

@@ -1,7 +1,7 @@
 const { merge } = require('webpack-merge');
 
 const common = require('./webpack-common');
-const myEnv = require('dotenv').config({ path: 'config/local/.env' }).parsed;
+const myEnv = require('dotenv').config({ path: 'config/app/.env.local' }).parsed;
 
 module.exports = (env, args) => {
 	return merge(common(env, args, myEnv), {

source/ui/scripts/webpack-prod.js

@@ -1,6 +1,6 @@
 const { merge } = require('webpack-merge');
 
-const myEnv = require('dotenv').config({ path: 'config/prod/.env' }).parsed;
+const myEnv = require('dotenv').config({ path: 'config/app/.env.prod' }).parsed;
 const common = require('./webpack-common');
 
 // const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');

source/ui/src/types/global.ts

@@ -0,0 +1,13 @@
+declare global {
+	interface Window {
+		__REDUX_DEVTOOLS_EXTENSION_COMPOSE__: any;
+	}
+
+	namespace NodeJS {
+		interface ProcessEnv {
+			ENDPOINT_BASE_URL: string;
+		}
+	}
+}
+
+export default global;