diff --git a/.dockerignore b/.dockerignore index 4a8caf89576..3ba92533947 100644 --- a/.dockerignore +++ b/.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 diff --git a/.gitignore b/.gitignore index ce3dd0dea43..c5a08d06b2b 100644 --- a/.gitignore +++ b/.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 diff --git a/.yarnrc b/.yarnrc deleted file mode 100644 index dd5e7bd9d14..00000000000 --- a/.yarnrc +++ /dev/null @@ -1 +0,0 @@ ---modules-folder arches/app/media/node_modules \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 242b4e7a960..214a0789829 100644 --- a/Dockerfile +++ b/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 diff --git a/arches/app/media/css/abstracts/_functions.scss b/arches/app/media/css/abstracts/_functions.scss index eb7d26c2f33..9fd26918952 100644 --- a/arches/app/media/css/abstracts/_functions.scss +++ b/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 diff --git a/arches/install/arches-admin b/arches/install/arches-admin index 553abcfed45..96de9431ca9 100644 --- a/arches/install/arches-admin +++ b/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() diff --git a/arches/install/arches-project b/arches/install/arches-project index 18e42fcec8e..b6fe7896374 100644 --- a/arches/install/arches-project +++ b/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() diff --git a/arches/install/arches-templates/.gitignore b/arches/install/arches-templates/.gitignore index 29692832d33..f9b6c762dc6 100644 --- a/arches/install/arches-templates/.gitignore +++ b/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 diff --git a/arches/install/arches-templates/.yarnrc b/arches/install/arches-templates/.yarnrc deleted file mode 100644 index ca9e91e0448..00000000000 --- a/arches/install/arches-templates/.yarnrc +++ /dev/null @@ -1,2 +0,0 @@ ---install.modules-folder "./{{ project_name }}/media/node_modules" ---add.modules-folder "./{{ project_name }}/media/node_modules" \ No newline at end of file diff --git a/arches/install/arches-templates/gettext.config.js b/arches/install/arches-templates/gettext.config.js index c1289b98bd2..27934951e4f 100644 --- a/arches/install/arches-templates/gettext.config.js +++ b/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