Skip to content

Commit 5753398

Browse files
committed
Merge branch 'development'
2 parents 180619a + 7d71399 commit 5753398

File tree

98 files changed

+17214
-2773
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+17214
-2773
lines changed

.babelrc

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"plugins": [
3+
"@babel/plugin-syntax-dynamic-import"
4+
],
5+
"env": {
6+
"test": {
7+
"plugins": [
8+
"dynamic-import-node"
9+
],
10+
"presets": [
11+
[
12+
"@babel/preset-env",
13+
{
14+
"modules": "commonjs",
15+
"targets": {
16+
"node": "current"
17+
}
18+
}
19+
]
20+
]
21+
}
22+
}
23+
}

.cfformat.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
"function_call.multiline.leading_comma.padding": true,
1818
"function_call.casing.builtin": "cfdocs",
1919
"function_call.casing.userdefined": "camel",
20-
"function_call.multiline.element_count": 3,
20+
"function_call.multiline.element_count": 2,
2121
"function_call.multiline.leading_comma": false,
2222
"function_call.multiline.min_length": 40,
2323
"function_declaration.padding": true,
2424
"function_declaration.empty_padding": false,
2525
"function_declaration.multiline.leading_comma": false,
2626
"function_declaration.multiline.leading_comma.padding": true,
27-
"function_declaration.multiline.element_count": 3,
27+
"function_declaration.multiline.element_count": 2,
2828
"function_declaration.multiline.min_length": 40,
2929
"function_declaration.group_to_block_spacing": "compact",
3030
"function_anonymous.empty_padding": false,
3131
"function_anonymous.group_to_block_spacing": "compact",
32-
"function_anonymous.multiline.element_count": 3,
32+
"function_anonymous.multiline.element_count": 2,
3333
"function_anonymous.multiline.leading_comma": false,
3434
"function_anonymous.multiline.leading_comma.padding": true,
3535
"function_anonymous.multiline.min_length": 40,
@@ -44,7 +44,8 @@
4444
"max_columns": 120,
4545
"metadata.multiline.element_count": 3,
4646
"metadata.multiline.min_length": 40,
47-
"newline":"\n",
47+
"method_call.chain.multiline": 3,
48+
"newline": "\n",
4849
"property.multiline.element_count": 3,
4950
"property.multiline.min_length": 40,
5051
"parentheses.padding": true,

.eslintignore

Whitespace-only changes.

.eslintrc.js

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
module.exports = {
2+
root: true,
3+
4+
parserOptions: {
5+
parser: "babel-eslint",
6+
sourceType: "module"
7+
},
8+
9+
env: {
10+
"browser": true,
11+
"es6" : true
12+
},
13+
14+
extends: [
15+
"prettier",
16+
// Uncomment any of the lines below to choose desired strictness,
17+
// but leave only one uncommented!
18+
// See https://eslint.vuejs.org/rules/#available-rules
19+
// "plugin:vue/essential" // Priority A: Essential (Error Prevention)
20+
"plugin:vue/strongly-recommended" // Priority B: Strongly Recommended (Improving Readability)
21+
// "plugin:vue/recommended" // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead)
22+
],
23+
24+
// required to lint *.vue files
25+
plugins: [
26+
"vue"
27+
],
28+
29+
globals: {
30+
"ga": true, // Google Analytics
31+
"cordova": true,
32+
"__statics": true,
33+
"process": true,
34+
"Capacitor": true,
35+
"chrome": true
36+
},
37+
38+
// add your custom rules here
39+
rules: {
40+
"array-bracket-spacing": ["error", "always", {
41+
"singleValue": true,
42+
"arraysInArrays": true,
43+
"objectsInArrays": true
44+
}],
45+
"array-bracket-newline" : [ "error", {
46+
"multiline" : true
47+
} ],
48+
"array-element-newline" : [ "error",
49+
{ "multiline": true, "minItems": 2 }
50+
],
51+
"camelcase" : [ "error" , {
52+
"properties" : "always"
53+
}],
54+
"indent": ["error", "tab", {
55+
ignoredNodes: ["TemplateLiteral"]
56+
}],
57+
"keyword-spacing": ["error", { "after": true, "before": true }],
58+
"key-spacing": ["error", {
59+
"singleLine": {
60+
"beforeColon": false,
61+
"afterColon": true
62+
},
63+
"multiLine": {
64+
"beforeColon": true,
65+
"afterColon": true,
66+
"align": "colon"
67+
}
68+
}],
69+
"no-trailing-spaces": ["error", {
70+
"skipBlankLines": false,
71+
"ignoreComments": false
72+
}],
73+
"no-fallthrough" : "error",
74+
// allow debugger during development only
75+
"no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
76+
"object-curly-newline" : [ "error", { "multiline" : true } ],
77+
"object-curly-spacing": ["error", "always", {
78+
"objectsInObjects": true,
79+
"arraysInObjects": true
80+
}],
81+
"object-property-newline" : [ "error", { "allowAllPropertiesOnSameLine" : true } ],
82+
"prefer-promise-reject-errors": "off",
83+
"quotes" : [ "error", "double" ],
84+
"semi": ["error", "always"],
85+
"space-in-parens": ["error", "always"],
86+
"space-before-function-paren": ["error", {
87+
"anonymous": "never",
88+
"named": "never",
89+
"asyncArrow": "never"
90+
}],
91+
"vue/html-indent": ["error", "tab"],
92+
"vue/html-self-closing": [ "error", {
93+
"html": {
94+
"void": "any",
95+
"normal": "always",
96+
"component": "always"
97+
}
98+
} ]
99+
}
100+
}

.gitignore

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
1+
# Ide
12
.vscode
23

4+
# build artifacts
35
.artifacts/**
46
.tmp/**
57

8+
# Module Dependencies
9+
modules/**
10+
11+
# Test harness dependencies
612
test-harness/.engine/**
713
test-harness/coldbox/**
814
test-harness/docbox/**
915
test-harness/testbox/**
1016
test-harness/logs/**
1117
test-harness/modules/**
18+
test-harness/.env
1219

13-
# log files
14-
logs/**
20+
# UI Build Process
21+
includes/**
22+
node_modules/**

.markdownlintrc.json renamed to .markdownlint.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"first-line-h1": false,
66
"no-multiple-blanks": {
77
"maximum": 2
8-
}
8+
},
9+
"no-inline-html" : false
910
}

.travis.yml

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,39 +18,64 @@ branches:
1818
- development
1919
- master
2020

21-
dist: trusty
22-
21+
dist: focal
2322
sudo: required
2423

24+
services:
25+
- mysql
26+
2527
before_install:
2628
# CommandBox Keys
2729
- curl -fsSl https://downloads.ortussolutions.com/debs/gpg | sudo apt-key add -
28-
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
30+
- sudo echo "deb https://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
2931
/etc/apt/sources.list.d/commandbox.list
3032

3133
install:
3234
# Install Commandbox
33-
- sudo apt-get update && sudo apt-get --assume-yes install rsync jq commandbox
35+
- sudo apt-get update && sudo apt-get --assume-yes install jq commandbox nodejs
3436
# Install CommandBox Supporting Librarires
3537
- box install commandbox-cfconfig,commandbox-dotenv,commandbox-docbox
3638
# If using auto-publish, you will need to provide your API token with this line:
3739
- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
3840

41+
before_script:
42+
# create database
43+
- mysql -u root -e 'create database coolblog;'
44+
# import database
45+
- mysql -u root < $TRAVIS_BUILD_DIR/test-harness/tests/resources/coolblog.sql
46+
- echo "Database created and loaded with test data"
47+
# Seed .env
48+
- echo "Seeding database .env file at /test-harness/.env"
49+
- touch test-harness/.env
50+
# ENV
51+
- printf "DB_HOST=localhost\n" >> test-harness/.env
52+
- printf "DB_USER=root\n" >> test-harness/.env
53+
- printf "DB_PASSWORD=\n" >> test-harness/.env
54+
- printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> test-harness/.env
55+
- printf "DB_BUNDLEVERSION=8.0.19\n" >> test-harness/.env
56+
- printf "DB_BUNDLENAME=com.mysql.cj\n" >> test-harness/.env
57+
3958
script:
4059
# Set Current Version and Travis Tag
4160
- TARGET_VERSION=`cat $TRAVIS_BUILD_DIR/box.json | jq '.version' -r`
4261
- TRAVIS_TAG=${TARGET_VERSION}
4362
- echo "Starting build for ${MODULE_ID} v${TARGET_VERSION}"
4463
# Replace version so builder can issue it
4564
65+
# Build the Debugger UI
66+
- node -v
67+
- npm i npm@latest -g
68+
- npm install
69+
- npm run prod
70+
- rm -Rf node_modules
4671
# Startup the harness
4772
- cd test-harness
4873
# run our dependency install to ensure the workbench is in place
4974
- box install
5075
# run our matrix server
5176
- box server start serverConfigFile="server-${ENGINE}.json"
5277
# Startup the app
53-
- curl http://localhost:60299
78+
#- curl http://localhost:60299
5479
# Debugging of tests
5580
#- curl http://localhost:60299/tests/runner.cfm?reporter=json -o testresults.json && cat testresults.json
5681
# move back to build dir to build it

0 commit comments

Comments
 (0)