PR feedback #10516

archesproject · Jan 31, 2024 · e8adc39 · e8adc39
1 parent 9b0bf76
commit e8adc39
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 18 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -40,7 +40,8 @@ module.exports = {
         {
             "files": [ "*.vue" ],
             "rules": {
-                "vue/html-indent": [2, 4]
+                "vue/html-indent": [2, 4],
+                "vue/this-in-template": "off"
             }
         },
         {

diff --git a/arches/install/arches-app-templates/.eslintrc.js b/arches/install/arches-app-templates/.eslintrc.js
@@ -40,7 +40,8 @@ module.exports = {
         {
             "files": [ "*.vue" ],
             "rules": {
-                "vue/html-indent": [2, 4]
+                "vue/html-indent": [2, 4],
+                "vue/this-in-template": "off"
             }
         },
         {

diff --git a/arches/install/arches-app-templates/app_name/src/declarations.d.ts b/arches/install/arches-app-templates/app_name/src/declarations.d.ts
@@ -0,0 +1,9 @@
+// import declarations from other projects or Arches core
+import('../media/node_modules/arches/declarations.d.ts');
+
+// declare modules that have been added to your project (should mirror dependencies in `package.json`)
+declare module 'arches';
+
+// declare filetypes used in `./src/` folder
+declare module '*.vue';
+declare module '*.ts';
diff --git a/arches/install/arches-app-templates/app_name/src/shims.d.ts b/arches/install/arches-app-templates/app_name/src/shims.d.ts
diff --git a/arches/install/arches-app-templates/package.json b/arches/install/arches-app-templates/package.json
@@ -7,8 +7,8 @@
         "eslint:watch": "./{{ app_name }}/media/node_modules/.bin/nodemon --watch ./{{ app_name }}/src --ext ts,vue --exec yarn --silent eslint:check",
         "gettext:extract": "./{{ app_name }}/media/node_modules/.bin/vue-gettext-extract",
         "gettext:compile": "./{{ app_name }}/media/node_modules/.bin/vue-gettext-compile",
-        "typescript:check": "./{{ app_name }}/media/node_modules/.bin/vue-tsc --noEmit",
-        "typescript:watch": "./{{ app_name }}/media/node_modules/.bin/vue-tsc --watch --noEmit"
+        "ts:check": "./{{ app_name }}/media/node_modules/.bin/vue-tsc --noEmit",
+        "ts:watch": "./{{ app_name }}/media/node_modules/.bin/vue-tsc --watch --noEmit"
     },
     "dependencies": {
         "vue": "^3.3.4",

diff --git a/arches/install/arches-templates/project_name/.eslintrc.js b/arches/install/arches-templates/project_name/.eslintrc.js
@@ -39,7 +39,8 @@ module.exports = {
         {
             "files": [ "*.vue" ],
             "rules": {
-                "vue/html-indent": [2, 4]
+                "vue/html-indent": [2, 4],
+                "vue/this-in-template": "off"
             }
         },
         {

diff --git a/arches/install/arches-templates/project_name/package.json b/arches/install/arches-templates/project_name/package.json
@@ -2,15 +2,15 @@
     "name": "{{ project_name }}",
     "license": "AGPL-3.0-only",
     "scripts": {
-        "build_development": "yarn eslint:check && yarn typescript:check && ./media/node_modules/.bin/cross-env NODE_PATH=./media/node_modules NODE_OPTIONS=--max-old-space-size=2048 ./media/node_modules/.bin/webpack --config webpack/webpack.config.dev.js",
-        "build_production": "yarn eslint:check && yarn typescript:check && ./media/node_modules/.bin/cross-env NODE_PATH=./media/node_modules NODE_OPTIONS=--max-old-space-size=2048 NODE_ENV=production ./media/node_modules/.bin/webpack --config webpack/webpack.config.prod.js",
-        "build_test": "yarn eslint:check && yarn typescript:check && ./media/node_modules/.bin/cross-env NODE_PATH=./media/node_modules NODE_OPTIONS=--max-old-space-size=2048 ./media/node_modules/.bin/webpack --config webpack/webpack.config.dev.js --env test=true",
+        "build_development": "yarn eslint:check && yarn ts:check && ./media/node_modules/.bin/cross-env NODE_PATH=./media/node_modules NODE_OPTIONS=--max-old-space-size=2048 ./media/node_modules/.bin/webpack --config webpack/webpack.config.dev.js",
+        "build_production": "yarn eslint:check && yarn ts:check && ./media/node_modules/.bin/cross-env NODE_PATH=./media/node_modules NODE_OPTIONS=--max-old-space-size=2048 NODE_ENV=production ./media/node_modules/.bin/webpack --config webpack/webpack.config.prod.js",
+        "build_test": "yarn eslint:check && yarn ts:check && ./media/node_modules/.bin/cross-env NODE_PATH=./media/node_modules NODE_OPTIONS=--max-old-space-size=2048 ./media/node_modules/.bin/webpack --config webpack/webpack.config.dev.js --env test=true",
         "eslint:check": "./media/node_modules/.bin/eslint ./src --resolve-plugins-relative-to ./media --ext .vue,.ts --parser ./media/node_modules/vue-eslint-parser/index.js",
         "eslint:watch": "./media/node_modules/.bin/nodemon --watch ./src --ext ts,vue --exec yarn --silent eslint:check",
         "gettext:extract": "./media/node_modules/.bin/vue-gettext-extract",
         "gettext:compile": "./media/node_modules/.bin/vue-gettext-compile",
-        "typescript:check": "./media/node_modules/.bin/vue-tsc --noEmit",
-        "typescript:watch": "./media/node_modules/.bin/vue-tsc --watch --noEmit",
+        "ts:check": "./media/node_modules/.bin/vue-tsc --noEmit",
+        "ts:watch": "./media/node_modules/.bin/vue-tsc --watch --noEmit",
         "start": "./media/node_modules/.bin/cross-env NODE_PATH=./media/node_modules NODE_OPTIONS=--max-old-space-size=2048 ./media/node_modules/.bin/webpack serve --config webpack/webpack.config.dev.js"
     },
     "devDependencies": {

diff --git a/arches/install/arches-templates/project_name/src/declarations.d.ts b/arches/install/arches-templates/project_name/src/declarations.d.ts
@@ -1,5 +1,5 @@
 // import declarations from other projects or Arches core
-import('../node_modules/arches/arches/app/src/declarations.d.ts');
+import('../media/node_modules/arches/arches/app/src/declarations.d.ts');
 
 // declare modules that have been added to your project (should mirror `package.json`)
 declare module 'arches';

diff --git a/package.json b/package.json
@@ -3,15 +3,15 @@
     "version": "7.6.0",
     "license": "AGPL-3.0-only",
     "scripts": {
-        "build_development": "yarn eslint:check && yarn typescript:check && ./arches/app/media/node_modules/.bin/cross-env NODE_PATH=./arches/app/media/node_modules NODE_OPTIONS=--max-old-space-size=2048 ./arches/app/media/node_modules/.bin/webpack --config ./arches/webpack/webpack.config.dev.js",
-        "build_production": "yarn eslint:check && yarn typescript:check && ./arches/app/media/node_modules/.bin/cross-env NODE_PATH=./arches/app/media/node_modules NODE_OPTIONS=--max-old-space-size=2048 NODE_ENV=production ./arches/app/media/node_modules/.bin/webpack --config ./arches/webpack/webpack.config.prod.js",
-        "build_test": "yarn eslint:check && yarn typescript:check && ./arches/app/media/node_modules/.bin/cross-env NODE_PATH=./arches/app/media/node_modules NODE_OPTIONS=--max-old-space-size=2048 ./arches/app/media/node_modules/.bin/webpack --config ./arches/webpack/webpack.config.dev.js --env test=true",
+        "build_development": "yarn eslint:check && yarn ts:check && ./arches/app/media/node_modules/.bin/cross-env NODE_PATH=./arches/app/media/node_modules NODE_OPTIONS=--max-old-space-size=2048 ./arches/app/media/node_modules/.bin/webpack --config ./arches/webpack/webpack.config.dev.js",
+        "build_production": "yarn eslint:check && yarn ts:check && ./arches/app/media/node_modules/.bin/cross-env NODE_PATH=./arches/app/media/node_modules NODE_OPTIONS=--max-old-space-size=2048 NODE_ENV=production ./arches/app/media/node_modules/.bin/webpack --config ./arches/webpack/webpack.config.prod.js",
+        "build_test": "yarn eslint:check && yarn ts:check && ./arches/app/media/node_modules/.bin/cross-env NODE_PATH=./arches/app/media/node_modules NODE_OPTIONS=--max-old-space-size=2048 ./arches/app/media/node_modules/.bin/webpack --config ./arches/webpack/webpack.config.dev.js --env test=true",
         "eslint:check": "./arches/app/media/node_modules/.bin/eslint ./arches/app/src --resolve-plugins-relative-to ./arches/app/media --ext .vue,.ts --parser ./arches/app/media/node_modules/vue-eslint-parser/index.js",
         "eslint:watch": "./arches/app/media/node_modules/.bin/nodemon --watch ./arches/app/src --ext ts,vue --exec yarn --silent eslint:check",
         "gettext:extract": "./arches/app/media/node_modules/.bin/vue-gettext-extract",
         "gettext:compile": "./arches/app/media/node_modules/.bin/vue-gettext-compile",
-        "typescript:check": "./arches/app/media/node_modules/.bin/vue-tsc --noEmit",
-        "typescript:watch": "./arches/app/media/node_modules/.bin/vue-tsc --watch --noEmit",
+        "ts:check": "./arches/app/media/node_modules/.bin/vue-tsc --noEmit",
+        "ts:watch": "./arches/app/media/node_modules/.bin/vue-tsc --watch --noEmit",
         "start": "./arches/app/media/node_modules/.bin/cross-env NODE_PATH=./arches/app/media/node_modules NODE_OPTIONS=--max-old-space-size=2048 ./arches/app/media/node_modules/.bin/webpack serve --config ./arches/webpack/webpack.config.dev.js"
     },
     "repository": {