Merge branch 'dev/7.6.x' into jtw/deprecate-file-type-checking-setting

.dockerignore

@@ -18,4 +18,4 @@ arches/settings_local.pyc
 elasticsearch-5.2.1
 virtualenv
 arches/app/media/packages
-arches/app/media/node_modules
+node_modules

.gitignore

@@ -23,7 +23,6 @@ arches/Net_files
 .idea
 arches/app/media/bower_components
 arches/app/media/packages
-arches/app/media/node_modules
 node_modules
 arches/tileserver/cache
 docs/_build

Dockerfile

@@ -90,7 +90,7 @@ COPY ./arches/install/package.json ${ARCHES_ROOT}/arches/install/package.json
 COPY ./arches/install/.yarnrc ${ARCHES_ROOT}/arches/install/.yarnrc
 COPY ./arches/install/yarn.lock ${ARCHES_ROOT}/arches/install/yarn.lock
 WORKDIR ${ARCHES_ROOT}/arches/install
-RUN mkdir -p ${ARCHES_ROOT}/arches/app/media/node_modules
+RUN mkdir -p ${ARCHES_ROOT}/node_modules
 RUN yarn install
 
 ## Install virtualenv

arches/app/media/css/abstracts/_functions.scss

@@ -5,7 +5,7 @@
 // to this list, ordered by width. For examples: (mobile, tablet, desktop).
 // $mq-show-breakpoints: (mobile, mobileLandscape, tablet, desktop, wide);
 
-//@import '../../node_modules/sass-mq/mq.import';
+//@import url(node_modules/sass-mq/mq.import);
 
 /// Responsive breakpoint manager
 /// @access public

arches/install/arches-admin

@@ -116,7 +116,7 @@ class ArchesProjectCommand(TemplateCommand):
         # need to manually replace instances of {{ project_name }} in some files
         path_to_project = os.path.join(target) if target else os.path.join(os.getcwd(), project_name)
 
-        for relative_file_path in ['.yarnrc', '.coveragerc', "pyproject.toml"]:  # relative to app root directory
+        for relative_file_path in ['.coveragerc', "pyproject.toml"]:  # relative to app root directory
             file = open(os.path.join(path_to_project, relative_file_path),'r')
             file_data = file.read()
             file.close()

arches/install/arches-project

@@ -53,7 +53,7 @@ class ArchesCommand(TemplateCommand):
         # need to manually replace instances of {{ project_name }} in some files
         path_to_project = os.path.join(target) if target else os.path.join(os.getcwd(), project_name)
 
-        for relative_file_path in ['.yarnrc', '.coveragerc', "pyproject.toml"]:  # relative to app root directory
+        for relative_file_path in ['.coveragerc', "pyproject.toml"]:  # relative to app root directory
             file = open(os.path.join(path_to_project, relative_file_path),'r')
             file_data = file.read()
             file.close()

arches/install/arches-templates/.gitignore

@@ -1,17 +1,16 @@
 *.pyc
 *.log
+node_modules
 *.coverage
 {{ project_name }}/logs
 {{ project_name }}/export_deliverables
 {{ project_name }}/cantaloupe/*
 {{ project_name }}/staticfiles
 {{ project_name }}/media/packages
-{{ project_name }}/media/node_modules
 {{ project_name }}/media/build/
 {{ project_name }}/uploadedfiles/*
 {{ project_name }}/settings_local.py
-{{ project_name }}/webpack/webpack-stats.json
-{{ project_name }}/webpack/webpack-user-config.js
+webpack-stats.json
 .vscode/
 *.egg-info
 .DS_STORE

arches/install/arches-templates/gettext.config.js

@@ -1,43 +1,43 @@
 
 module.exports = {
-    input: {
-      path: "./{{ project_name }}/src", // only files in this directory are considered for extraction
-      include: ["**/*.vue", "**/*.ts"], // glob patterns to select files for extraction
-      exclude: [], // glob patterns to exclude files from extraction
-      jsExtractorOpts:[ // custom extractor keyword. default empty.
-          {
-            keyword: "__", // only extractor default keyword such as $gettext,use keyword to custom
-            options: {    // see https://github.com/lukasgeiter/gettext-extractor
-              content: {
-                replaceNewLines: "\n",
-              },
-              arguments: {
-                text: 0,
-              },
-            },
+  input: {
+    path: "./{{ project_name }}/src", // only files in this directory are considered for extraction
+    include: ["**/*.vue", "**/*.ts"], // glob patterns to select files for extraction
+    exclude: [], // glob patterns to exclude files from extraction
+    jsExtractorOpts: [ // custom extractor keyword. default empty.
+      {
+        keyword: "__", // only extractor default keyword such as $gettext,use keyword to custom
+        options: {    // see https://github.com/lukasgeiter/gettext-extractor
+          content: {
+            replaceNewLines: "\n",
           },
-          {
-            keyword: "_n", // $ngettext
-            options: {
-              content: {
-                replaceNewLines: "\n",
-              },
-              arguments: {
-                text: 0,
-                textPlural: 1,
-              },
-            },
+          arguments: {
+            text: 0,
           },
-        ],
-        compileTemplate: false, // do not compile <template> tag when its lang is not html
+        },
       },
-      output: {
-        path: "./{{ project_name }}/locale", // output path of all created files
-        potPath: "./messages.pot", // relative to output.path, so by default "./src/language/messages.pot"
-        jsonPath: "./", // relative to output.path, so by default "./src/language/translations.json"
-        locales: ["en"],
-        flat: false, // don't create subdirectories for locales
-        linguas: false, // create a LINGUAS file
-        splitJson: true, // create separate json files for each locale. If used, jsonPath must end with a directory, not a file
+      {
+        keyword: "_n", // $ngettext
+        options: {
+          content: {
+            replaceNewLines: "\n",
+          },
+          arguments: {
+            text: 0,
+            textPlural: 1,
+          },
+        },
       },
+    ],
+    compileTemplate: false, // do not compile <template> tag when its lang is not html
+  },
+  output: {
+    path: "./{{ project_name }}/locale", // output path of all created files
+    potPath: "./messages.pot", // relative to output.path, so by default "./src/language/messages.pot"
+    jsonPath: "./", // relative to output.path, so by default "./src/language/translations.json"
+    locales: ["en"],
+    flat: false, // don't create subdirectories for locales
+    linguas: false, // create a LINGUAS file
+    splitJson: true, // create separate json files for each locale. If used, jsonPath must end with a directory, not a file
+  },
 };

arches/install/arches-templates/package.json

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

arches/install/arches-templates/project_name/settings.py-tpl

@@ -25,7 +25,7 @@ MAX_ARCHES_VERSION = arches.__version__
 
 WEBPACK_LOADER = {
     "DEFAULT": {
-        "STATS_FILE": os.path.join(APP_ROOT, 'webpack/webpack-stats.json'),
+        "STATS_FILE": os.path.join(APP_ROOT, '..', 'webpack/webpack-stats.json'),
     },
 }
 

arches/install/arches-templates/project_name/src/declarations.d.ts

@@ -1,5 +1,5 @@
 // import declarations from other projects or Arches core
-import('../media/node_modules/arches/arches/app/src/declarations.d.ts');
+import('../../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';