Skip to content

Commit

Permalink
Merge branch 'develop' into feature/husky
Browse files Browse the repository at this point in the history
  • Loading branch information
@brandonkelly
brandonkelly committed Apr 21, 2022
2 parents 604416c + e609476 commit 2b0d7f7
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 60 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@
79ef981bc1ef7d49bddf084885d77b5b98609caa
0bda62d7477787e85849581ac1359c29594a1f37
9239b488acc7a6732920c8a66c215103292900ac

# Prettier
2c24aedef8bea181815bb9045c28bdd6fa46fc2a
2 changes: 2 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
/.github/ export-ignore
/.gitignore export-ignore
/.lando.yml export-ignore
/.prettierignore export-ignore
/.prettierrc.json export-ignore
/CHANGELOG.md export-ignore
/README.md export-ignore
/SECURITY.md export-ignore
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,24 @@ concurrency:
jobs:
ecs:
name: ECS
uses: craftcms/.github/.github/workflows/ecs.yml@v1
secrets:
minimum_php_version: ${{ secrets.CRAFT_3_MINIMUM_PHP }}
uses: craftcms/.github/.github/workflows/ecs.yml@v2
with:
php_version: '7.2'
codecept:
name: Codeception
uses: craftcms/.github/.github/workflows/codecept.yml@v1
needs: [ecs]
uses: craftcms/.github/.github/workflows/codecept.yml@v2
with:
php_versions: '["7.2", "7.3", "7.4", "8.0", "8.1"]'
notify-slack:
name: Notify Slack
needs: [ecs, codecept]
if: ${{ always() }}
uses: craftcms/.github/.github/workflows/notify-slack.yml@v1
uses: craftcms/.github/.github/workflows/notify-slack.yml@v2
with:
success: ${{ needs.ecs.result == 'success' && needs.codecept.result == 'success' }}
failure: ${{ needs.ecs.result == 'failure' || needs.codecept.result == 'failure' }}
failure_text_prefix: <!subteam^SGFL9NKNZ>
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}
slack_webhook_url: ${{ secrets.SLACK_CRAFT_WEBHOOK_URL }}
9 changes: 5 additions & 4 deletions .prettierignore
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
*.php
*.md
*.php
composer.lock
src/web/assets/**/dist/*
vendor/*
lib/*
cpresources/*
lib/*
src/templates/*
src/web/assets/**/dist/*
tests/_craft/*
vendor/*
100 changes: 50 additions & 50 deletions packages/craftcms-webpack/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,68 +3,68 @@
/* Visit https://aka.ms/tsconfig.json to read more about this file */

/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "es2017" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
"module": "esnext" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
// "lib": [], /* Specify library files to be included in the compilation. */
"allowJs": false /* Allow javascript files to be compiled. */,
"checkJs": false /* Report errors in .js files. */,
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
// "declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
// "outDir": "./", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
"removeComments": false /* Do not emit comments to output. */,
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
// "incremental": true, // Enable incremental compilation
"target": "es2017", // Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'.
"module": "esnext", // Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'.
// "lib": [], // Specify library files to be included in the compilation.
"allowJs": false, // Allow javascript files to be compiled.
"checkJs": false, // Report errors in .js files.
// "jsx": "preserve", // Specify JSX code generation: 'preserve', 'react-native', or 'react'.
// "declaration": true, // Generates corresponding '.d.ts' file.
// "declarationMap": true, // Generates a sourcemap for each corresponding '.d.ts' file.
// "sourceMap": true, // Generates corresponding '.map' file.
// "outFile": "./", // Concatenate and emit output to single file.
// "outDir": "./", // Redirect output structure to the directory.
// "rootDir": "./", // Specify the root directory of input files. Use to control the output directory structure with --outDir.
// "composite": true, // Enable project compilation
// "tsBuildInfoFile": "./", // Specify file to store incremental compilation information
"removeComments": false, // Do not emit comments to output.
// "noEmit": true, // Do not emit outputs.
// "importHelpers": true, // Import emit helpers from 'tslib'.
// "downlevelIteration": true, // Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'.
// "isolatedModules": true, // Transpile each file as a separate module (similar to 'ts.transpileModule').

/* Strict Type-Checking Options */
"strict": true /* Enable all strict type-checking options. */,
"noImplicitAny": false /* Raise error on expressions and declarations with an implied 'any' type. */,
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
"strict": true, // Enable all strict type-checking options.
"noImplicitAny": false, // Raise error on expressions and declarations with an implied 'any' type.
// "strictNullChecks": true, // Enable strict null checks.
// "strictFunctionTypes": true, // Enable strict checking of function types.
// "strictBindCallApply": true, // Enable strict 'bind', 'call', and 'apply' methods on functions.
// "strictPropertyInitialization": true, // Enable strict checking of property initialization in classes.
// "noImplicitThis": true, // Raise error on 'this' expressions with an implied 'any' type.
// "alwaysStrict": true, // Parse in strict mode and emit "use strict" for each source file.

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
// "noUnusedLocals": true, // Report errors on unused locals.
// "noUnusedParameters": true, // Report errors on unused parameters.
// "noImplicitReturns": true, // Report error when not all code paths in function return a value.
// "noFallthroughCasesInSwitch": true, // Report errors for fallthrough cases in switch statement.

/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleResolution": "node", // Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6).
// "baseUrl": "./", // Base directory to resolve non-absolute module names.
// "paths": {}, // A series of entries which re-map imports to lookup locations relative to the 'baseUrl'.
// "rootDirs": [], // List of root folders whose combined content represents the structure of the project at runtime.
// "typeRoots": [], // List of folders to include type definitions from.
// "types": [], // Type declaration files to be included in compilation.
// "allowSyntheticDefaultImports": true, // Allow default imports from modules with no default export. This does not affect code emit, just typechecking.
"esModuleInterop": true, // Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'.
// "preserveSymlinks": true, // Do not resolve the real path of symlinks.
// "allowUmdGlobalAccess": true, // Allow accessing UMD globals from modules.

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
// "sourceRoot": "", // Specify the location where debugger should locate TypeScript files instead of source locations.
// "mapRoot": "", // Specify the location where debugger should locate map files instead of generated locations.
// "inlineSourceMap": true, // Emit a single file with source maps instead of having a separate file.
// "inlineSources": true, // Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set.

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
// "experimentalDecorators": true, // Enables experimental support for ES7 decorators.
// "emitDecoratorMetadata": true, // Enables experimental support for emitting type metadata for decorators.

/* Advanced Options */
"skipLibCheck": true /* Skip type checking of declaration files. */,
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
"skipLibCheck": true, // Skip type checking of declaration files.
"forceConsistentCasingInFileNames": true // Disallow inconsistently-cased references to the same file.
},
"files": ["./Craft.d.ts"]
}

0 comments on commit 2b0d7f7

Please sign in to comment.