Skip to content

Commit

Permalink
Merge branch 'release/2.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Syno committed Nov 27, 2020
2 parents 3e70a44 + 7e45562 commit c2d42ec
Show file tree
Hide file tree
Showing 824 changed files with 177,100 additions and 61,262 deletions.
23 changes: 23 additions & 0 deletions .eslintignore
@@ -0,0 +1,23 @@
/build/**
/coverage/**
/docs/**
/jsdoc/**
/templates/**
/tests/bench/**
/tests/fixtures/**
/tests/performance/**
/tmp/**
/tools/internal-rules/node_modules/**
/lib/rules/utils/unicode/is-combining-character.js
test.js
!.eslintrc.js
node_modules
jspm_packages
public/
views/
sql/
upload/
workspace/
structure/pieces/component/socket/chat/js/chat.js
structure/pieces/component/socket/notifications/notification.js
structure/pieces/component/status/routes/e_translation.js
89 changes: 89 additions & 0 deletions .eslintrc.json
@@ -0,0 +1,89 @@
{
"env": {
"node": true,
"es6": true
},
"extends": "eslint:recommended",
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly",
"$": "readonly",
"toastr": "readonly"
},
"parserOptions": {
"ecmaVersion": 2018
},
"rules": {
"array-callback-return": "error",
"arrow-body-style": ["error", "as-needed", { "requireReturnForObjectLiteral": true }],
"block-scoped-var": "error",
"brace-style": 0,
"comma-spacing": ["error", {
"before": false,
"after": true
}],
"complexity": 0,
"constructor-super": "warn",
"curly": 0,
"default-case": "error",
"no-multiple-empty-lines": ["error", {
"max": 2,
"maxEOF": 1
}],
"for-direction": "error",
"global-require": "warn",
"no-array-constructor": "error",
"no-async-promise-executor": "error",
"no-await-in-loop": "warn",
"no-class-assign": "error",
"no-cond-assign": "error",
"no-confusing-arrow": ["error", {
"allowParens": true
}],
"no-dupe-args": "error",
"no-dupe-keys": "error",
"no-duplicate-case": "error",
"no-duplicate-imports": "error",
"no-else-return": "error",
"no-empty-function": "error",
"no-empty-pattern": "error",
"no-empty": "error",
"no-eval": "error",
"no-ex-assign": "error",
"no-extra-parens": "error",
"no-extra-semi": "error",
"no-func-assign": "error",
"no-global-assign": "error",
"no-inner-declarations": "warn",
"no-invalid-this": "error",
"no-irregular-whitespace": "error",
"no-lonely-if": "error",
"no-multi-spaces": "warn",
"no-obj-calls": "error",
"no-redeclare": "error",
"no-sparse-arrays": "error",
"indent": ["error", "tab", {"SwitchCase": 1}],
"no-this-before-super": "error",
"no-trailing-spaces": "error",
"no-undef": "warn",
"no-unexpected-multiline": "warn",
"no-unneeded-ternary": "warn",
"no-unreachable": "error",
"no-unsafe-finally": "error",
"no-unsafe-negation": "error",
"no-unused-expressions": "error",
"no-unused-vars": ["error", { "argsIgnorePattern": "^_{1}" }],
"no-use-before-define": "error",
"no-var": 2,
"prefer-const": "warn",
"prefer-rest-params": "error",
"require-atomic-updates": 0,
"require-await": "error",
"require-yield": "error",
"use-isnan": "error",
"valid-typeof": ["error", {
"requireStringLiterals": true
}],
"vars-on-top": "warn"
}
}
8 changes: 4 additions & 4 deletions .travis.yml
Expand Up @@ -5,9 +5,9 @@ env:
- CXX=g++-4.8
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
notifications:
slack: newmips:65VDeyCjdGVrhnr2VFOXnL1g
32 changes: 11 additions & 21 deletions Dockerfile
@@ -1,42 +1,32 @@
FROM node:8.11.3
FROM node:8.17

# Install designer
RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app

# Fix for source list error when installing 8.11.3
RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list

# RUN apt update && apt install unzip
RUN apt-get update && apt-get -qq -y install pdftk && apt-get -y install mysql-client && apt-get -y install nano

# COPY package.json /usr/src/app
# Update package and install some module
RUN apt-get update && apt-get -qq -y install pdftk && apt-get -y install nano

COPY . /usr/src/app

# (Re)install generator node modules
RUN rm -rf node_modules/
# RUN npm install

# RUN cd /usr/src/app/structure/template && npm install

# RUN mkdir -p /usr/src/app/workspace

# RUN mv /usr/src/app/structure/template/node_modules /usr/src/app/workspace/

# Workspace modules install
RUN mkdir -p /usr/src/app/workspace
COPY /structure/template/package.json /usr/src/app/workspace
# RUN cd /usr/src/app/workspace && npm install

VOLUME /usr/src/app/workspace

EXPOSE 1337 9001-9100

ADD entrypoint.sh /
# Setup for ssh onto github
# RUN mkdir -p /root/.ssh

# ADD id_rsa /root/.ssh/id_rsa
# RUN chmod 700 /root/.ssh/id_rsa

# ADD ssh_config /root/.ssh/config

RUN chmod 777 /entrypoint.sh

ENTRYPOINT ["/entrypoint.sh"]
RUN cd /usr/src/app
RUN chmod 777 /usr/src/app/entrypoint.sh
ENTRYPOINT ["/usr/src/app/entrypoint.sh"]

0 comments on commit c2d42ec

Please sign in to comment.