diff --git a/ccm-cms/package-lock.json b/ccm-cms/package-lock.json index 758b96434..29d94a48a 100644 --- a/ccm-cms/package-lock.json +++ b/ccm-cms/package-lock.json @@ -1,12 +1,12 @@ { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2022-05-04T172346", + "version": "7.0.0-SNAPSHOT.2022-09-20T182133", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2022-05-04T172346", + "version": "7.0.0-SNAPSHOT.2022-09-20T182133", "license": "LGPL-3.0-or-later", "dependencies": { "@tiptap/core": "^2.0.0-beta.127", diff --git a/ccm-cms/package.json b/ccm-cms/package.json index bc8ae0e2f..d1ee0dfc8 100644 --- a/ccm-cms/package.json +++ b/ccm-cms/package.json @@ -1,6 +1,6 @@ { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2022-05-04T172346", + "version": "7.0.0-SNAPSHOT.2022-09-20T182133", "description": "JavaScript stuff for ccm-cms", "main": "target/generated-resources/assets/@content-sections/cms-admin.js", "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts", diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_16__create_pages.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_16__create_pages.sql index 03ad269e7..700303663 100644 --- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_16__create_pages.sql +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_16__create_pages.sql @@ -25,16 +25,6 @@ alter table CCM_CMS.PAGE_THEME_CONFIGURATIONS foreign key (PAGE_ID) references CCM_CMS.PAGES; -alter table CCM_CMS.PAGES - add constraint FKqweb08d151ot4ij9io72w3yhx - foreign key (INDEX_PAGE_MODEL_ID) - references CCM_CORE.PAGE_MODELS; - -alter table CCM_CMS.PAGES - add constraint FKg2p2ahbayc2coei72pk1lnenf - foreign key (ITEM_PAGE_MODEL_ID) - references CCM_CORE.PAGE_MODELS; - alter table CCM_CMS.PAGES add constraint FKmgmth087tmxwieujn2vs5opbo foreign key (OBJECT_ID) diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_17__create_page_model_components.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_17__create_page_model_components.sql index 7b381ed00..f83e4952c 100644 --- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_17__create_page_model_components.sql +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_17__create_page_model_components.sql @@ -1,85 +1 @@ -create table CCM_CMS.CATEGORIZED_ITEM_COMPONENTS ( - COMPONENT_MODEL_ID bigint not null, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.CATEGORY_TREE_COMPONENTS ( - SHOW_FULL_TREE boolean, - COMPONENT_MODEL_ID bigint not null, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.CONTENT_ITEM_COMPONENTS ( - MODE varchar(255), - COMPONENT_MODEL_ID bigint not null, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS ( - COMPONENT_MODEL_ID bigint not null, - CONTENT_ITEM_ID bigint, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.GREETING_ITEM_COMPONENTS ( - COMPONENT_MODEL_ID bigint not null, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.ITEM_LIST_COMPONENTS ( - DESCINDING boolean, - LIMIT_TO_TYPE varchar(255), - PAGE_SIZE integer, - COMPONENT_MODEL_ID bigint not null, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.ITEM_LIST_ORDER ( - ITEM_LIST_ID bigint not null, - LIST_ORDER varchar(255) -); - -alter table CCM_CMS.CATEGORIZED_ITEM_COMPONENT - add constraint FKr9w6qafqrbi83nncn7f6ufas7 - foreign key (COMPONENT_MODEL_ID) - references CCM_CMS.CONTENT_ITEM_COMPONENTS; - -alter table CCM_CMS.CATEGORY_TREE_COMPONENTS - add constraint FKfhc51tkdf705o0sy8sndqpkqa - foreign key (COMPONENT_MODEL_ID) - references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; - -alter table CCM_CMS.CONTENT_ITEM_COMPONENTS - add constraint FKp83o82kxo2ipa0xo03wxp4dcr - foreign key (COMPONENT_MODEL_ID) - references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; - -alter table CCM_CMS.CONTENT_ITEM_COMPONENTS - add constraint FKp83o82kxo2ipa0xo03wxp4dcr - foreign key (COMPONENT_MODEL_ID) - references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; - -alter table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS - add constraint FKlfv2clu7ubk18unio8fyvlbnf - foreign key (CONTENT_ITEM_ID) - references CCM_CMS.CONTENT_ITEMS; - -alter table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS - add constraint FKkpiuth8e994phxy1x1drh2wf5 - foreign key (COMPONENT_MODEL_ID) - references CCM_CMS.CONTENT_ITEM_COMPONENTS; - -alter table CCM_CMS.GREETING_ITEM_COMPONENTS - add constraint FK3fble8pmmolb7lmsca8akmb94 - foreign key (COMPONENT_MODEL_ID) - references CCM_CMS.CONTENT_ITEM_COMPONENTS; - -alter table CCM_CMS.ITEM_LIST_COMPONENTS - add constraint FKje8r8nvkqv8fj7i0eo1pew2yq - foreign key (COMPONENT_MODEL_ID) - references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; - -alter table CCM_CMS.ITEM_LIST_ORDER - add constraint FKisnil2ibh98y2ws8or6guij21 - foreign key (ITEM_LIST_ID) - references CCM_CMS.ITEM_LIST_COMPONENTS; +-- Removed \ No newline at end of file diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_26__remove_page_model_from_page.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_26__remove_page_model_from_page.sql index a07cf9ca1..1e1272fa1 100644 --- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_26__remove_page_model_from_page.sql +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_26__remove_page_model_from_page.sql @@ -1,4 +1,4 @@ -alter table ccm_cms.pages drop constraint FKqweb08d151ot4ij9io72w3yhx; -alter table ccm_cms.pages drop constraint FKg2p2ahbayc2coei72pk1lnenf; -alter table ccm_cms.pages drop column index_page_model_id; -alter table ccm_cms.pages drop column item_page_model_id; +-- alter table ccm_cms.pages drop constraint FKqweb08d151ot4ij9io72w3yhx; +-- alter table ccm_cms.pages drop constraint FKg2p2ahbayc2coei72pk1lnenf; +-- alter table ccm_cms.pages drop column index_page_model_id; +-- alter table ccm_cms.pages drop column item_page_model_id; diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_16__create_pages.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_16__create_pages.sql index 43e7b41cf..c7b350696 100644 --- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_16__create_pages.sql +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_16__create_pages.sql @@ -25,16 +25,6 @@ alter table CCM_CMS.PAGE_THEME_CONFIGURATIONS foreign key (PAGE_ID) references CCM_CMS.PAGES; -alter table CCM_CMS.PAGES - add constraint FKqweb08d151ot4ij9io72w3yhx - foreign key (INDEX_PAGE_MODEL_ID) - references CCM_CORE.PAGE_MODELS; - -alter table CCM_CMS.PAGES - add constraint FKg2p2ahbayc2coei72pk1lnenf - foreign key (ITEM_PAGE_MODEL_ID) - references CCM_CORE.PAGE_MODELS; - alter table CCM_CMS.PAGES add constraint FKmgmth087tmxwieujn2vs5opbo foreign key (OBJECT_ID) diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_17__create_page_model_components.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_17__create_page_model_components.sql index 254875817..f83e4952c 100644 --- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_17__create_page_model_components.sql +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_17__create_page_model_components.sql @@ -1,80 +1 @@ -create table CCM_CMS.CATEGORIZED_ITEM_COMPONENTS ( - COMPONENT_MODEL_ID int8 not null, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.CATEGORY_TREE_COMPONENTS ( - SHOW_FULL_TREE boolean, - COMPONENT_MODEL_ID int8 not null, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.CONTENT_ITEM_COMPONENTS ( - MODE varchar(255), - COMPONENT_MODEL_ID int8 not null, - primary key (COMPONENT_MODEL_ID) - ); - -create table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS ( - COMPONENT_MODEL_ID int8 not null, - CONTENT_ITEM_ID int8, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.GREETING_ITEM_COMPONENTS ( - COMPONENT_MODEL_ID int8 not null, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.ITEM_LIST_COMPONENTS ( - DESCINDING boolean, - LIMIT_TO_TYPE varchar(255), - PAGE_SIZE int4, - COMPONENT_MODEL_ID int8 not null, - primary key (COMPONENT_MODEL_ID) -); - -create table CCM_CMS.ITEM_LIST_ORDER ( - ITEM_LIST_ID int8 not null, - LIST_ORDER varchar(255) -); - -alter table CCM_CMS.CATEGORIZED_ITEM_COMPONENTS - add constraint FKlraxqtl9cnntdo0qovq340y7b - foreign key (COMPONENT_MODEL_ID) - references CCM_CMS.CONTENT_ITEM_COMPONENTS; - -alter table CCM_CMS.CATEGORY_TREE_COMPONENTS - add constraint FKfhc51tkdf705o0sy8sndqpkqa - foreign key (COMPONENT_MODEL_ID) - references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; - -alter table CCM_CMS.CONTENT_ITEM_COMPONENTS - add constraint FKp83o82kxo2ipa0xo03wxp4dcr - foreign key (COMPONENT_MODEL_ID) - references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; - -alter table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS - add constraint FKlfv2clu7ubk18unio8fyvlbnf - foreign key (CONTENT_ITEM_ID) - references CCM_CMS.CONTENT_ITEMS; - -alter table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS - add constraint FKkpiuth8e994phxy1x1drh2wf5 - foreign key (COMPONENT_MODEL_ID) - references CCM_CMS.CONTENT_ITEM_COMPONENTS; - -alter table CCM_CMS.GREETING_ITEM_COMPONENTS - add constraint FK3fble8pmmolb7lmsca8akmb94 - foreign key (COMPONENT_MODEL_ID) - references CCM_CMS.CONTENT_ITEM_COMPONENTS; - -alter table CCM_CMS.ITEM_LIST_COMPONENTS - add constraint FKje8r8nvkqv8fj7i0eo1pew2yq - foreign key (COMPONENT_MODEL_ID) - references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; - -alter table CCM_CMS.ITEM_LIST_ORDER - add constraint FKisnil2ibh98y2ws8or6guij21 - foreign key (ITEM_LIST_ID) - references CCM_CMS.ITEM_LIST_COMPONENTS; +-- Removed \ No newline at end of file diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_26__remove_page_model_from_page.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_26__remove_page_model_from_page.sql index a07cf9ca1..1e1272fa1 100644 --- a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_26__remove_page_model_from_page.sql +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_26__remove_page_model_from_page.sql @@ -1,4 +1,4 @@ -alter table ccm_cms.pages drop constraint FKqweb08d151ot4ij9io72w3yhx; -alter table ccm_cms.pages drop constraint FKg2p2ahbayc2coei72pk1lnenf; -alter table ccm_cms.pages drop column index_page_model_id; -alter table ccm_cms.pages drop column item_page_model_id; +-- alter table ccm_cms.pages drop constraint FKqweb08d151ot4ij9io72w3yhx; +-- alter table ccm_cms.pages drop constraint FKg2p2ahbayc2coei72pk1lnenf; +-- alter table ccm_cms.pages drop column index_page_model_id; +-- alter table ccm_cms.pages drop column item_page_model_id; diff --git a/ccm-core/package-lock.json b/ccm-core/package-lock.json index 3dfdaced9..d5029f525 100644 --- a/ccm-core/package-lock.json +++ b/ccm-core/package-lock.json @@ -1,11 +1,11 @@ { - "name": "ccm-core", + "name": "@libreccm/ccm-core", "version": "7.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "ccm-core", + "name": "@libreccm/ccm-core", "version": "7.0.0", "license": "LGPL-3.0-or-later", "dependencies": { @@ -264,6 +264,18 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "node_modules/acorn": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/acorn-import-assertions": { "version": "1.7.6", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz", @@ -273,6 +285,22 @@ "acorn": "^8" } }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, "node_modules/ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", @@ -1601,22 +1629,6 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/schema-utils/node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, "node_modules/semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -2226,18 +2238,6 @@ "node": ">=10.13.0" } }, - "node_modules/webpack/node_modules/acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/webpack/node_modules/browserslist": { "version": "4.16.8", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz", @@ -2561,6 +2561,12 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "acorn": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "dev": true + }, "acorn-import-assertions": { "version": "1.7.6", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz", @@ -2568,6 +2574,18 @@ "dev": true, "requires": {} }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", @@ -3544,20 +3562,6 @@ "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" - }, - "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - } } }, "semver": { @@ -3950,12 +3954,6 @@ "webpack-sources": "^3.2.0" }, "dependencies": { - "acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", - "dev": true - }, "browserslist": { "version": "4.16.8", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz", diff --git a/ccm-core/package.json b/ccm-core/package.json index a84ac11db..1b5be3c32 100644 --- a/ccm-core/package.json +++ b/ccm-core/package.json @@ -1,10 +1,10 @@ { - "name": "ccm-core", + "name": "@libreccm/ccm-core", "version": "7.0.0", "description": "JavaScript stuff for ccm-core", - "main": "index.js", + "main": "target/generated-resources/assets/@admin/ccm-admin.js", "scripts": { - "build": "npm-run-all build:*:*", + "build": "npm-run-all build:*", "build:js": "webpack", "build:css": "npm-run-all build:css:*", "build:css:ccm-admin": "sass src/main/scss/ccm-admin/ccm-admin.scss target/generated-resources/assets/@admin/ccm-admin.css" diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml index df7b082e9..4a82bda19 100644 --- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml +++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml @@ -122,7 +122,7 @@ id="setting-#{setting.name}-edit-dialog" tabindex="-1">
-
diff --git a/ccm-core/src/main/typescript/ccm-admin/filterable-list.ts b/ccm-core/src/main/typescript/ccm-admin/filterable-list.ts.off similarity index 100% rename from ccm-core/src/main/typescript/ccm-admin/filterable-list.ts rename to ccm-core/src/main/typescript/ccm-admin/filterable-list.ts.off diff --git a/ccm-core/tsconfig.json b/ccm-core/tsconfig.json new file mode 100644 index 000000000..636181bc4 --- /dev/null +++ b/ccm-core/tsconfig.json @@ -0,0 +1,19 @@ +{ + "compilerOptions": { + "allowSyntheticDefaultImports": true, + "declaration": true, + "lib": [ + "DOM", + "ES2016" + ], + "module": "commonjs", + "moduleResolution": "node", + "outDir": "target/generated-resources/assets/@admin", + "sourceMap": true, + "strict": true, + "target": "ES6" + }, + "include": [ + "src/main/typescript/**/*" + ] +} diff --git a/ccm-core/webpack.config.js b/ccm-core/webpack.config.js index 03acba6ae..1d72f4aa6 100644 --- a/ccm-core/webpack.config.js +++ b/ccm-core/webpack.config.js @@ -2,11 +2,11 @@ module.exports = { mode: "production", devtool: "source-map", entry: { - "ccm-admin": "./src/main/typescript/ccm-admin.ts", + "ccm-admin": "./src/main/typescript/ccm-admin/ccm-admin.ts", }, output: { filename: "[name].js", - path: __dirname + "/target/generated-resources/assets/@content-sections" + path: __dirname + "/target/generated-resources/assets/@admin" }, resolve: { extensions: [".tsx", ".ts", ".js", ".json"]