diff --git a/docs/app/styles/app.scss b/docs/app/styles/app.scss index 87fd276c..078d1ba5 100644 --- a/docs/app/styles/app.scss +++ b/docs/app/styles/app.scss @@ -10,7 +10,7 @@ // Power Select @import "ember-power-select"; -@import "ember-power-select/scss/themes/bootstrap"; +@import "ember-power-select/themes/bootstrap"; @import "ember-power-calendar"; // Components diff --git a/docs/package.json b/docs/package.json index 2984db29..7f3a9f1f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -72,11 +72,11 @@ "stylelint-prettier": "^5.0.0", "tracked-built-ins": "^3.3.0", "webpack": "^5.89.0", - "ember-basic-dropdown": "8.0.0-beta.3", + "ember-basic-dropdown": "8.0.0-beta.4", "ember-cli-sass": "^11.0.1", "ember-code-snippet": "git+https://git@github.com/ef4/ember-code-snippet.git#d054b697098ad52481c94a952ccf8d89ba1f25fe", "ember-power-calendar-moment": "^0.5.0", - "ember-power-select": "8.0.0-beta.2", + "ember-power-select": "8.0.0-beta.3", "moment": "^2.30.1", "memory-scroll": "^1.0.2", "prismjs": "^1.29.0", diff --git a/ember-power-calendar/_index.less b/ember-power-calendar/_index.less deleted file mode 100644 index 964b6400..00000000 --- a/ember-power-calendar/_index.less +++ /dev/null @@ -1 +0,0 @@ -@import './less/base'; diff --git a/ember-power-calendar/_index.scss b/ember-power-calendar/_index.scss index eddd4e06..4b2df3d0 100644 --- a/ember-power-calendar/_index.scss +++ b/ember-power-calendar/_index.scss @@ -1 +1 @@ -@import './scss/base'; +@import './scss/base.scss'; diff --git a/ember-power-calendar/ember-power-calendar.less b/ember-power-calendar/ember-power-calendar.less new file mode 100644 index 00000000..506428c0 --- /dev/null +++ b/ember-power-calendar/ember-power-calendar.less @@ -0,0 +1 @@ +@import './less/base.less'; diff --git a/ember-power-calendar/package.json b/ember-power-calendar/package.json index 67646c65..8ab6de58 100644 --- a/ember-power-calendar/package.json +++ b/ember-power-calendar/package.json @@ -15,7 +15,7 @@ ".": "./dist/index.js", "./*": "./dist/*.js", "./addon-main.js": "./addon-main.cjs", - "./_index.less": "./_index.less", + "./ember-power-calendar.less": "./ember-power-calendar.less", "./_index.scss": "./_index.scss", "./less/base.less": "./less/base.less", "./scss/base.scss": "./scss/base.scss", @@ -23,10 +23,10 @@ }, "files": [ "_index.scss", - "_index.less", "addon-main.cjs", "declarations", "dist", + "ember-power-calendar.less", "less", "scss", "vendor" diff --git a/package.json b/package.json index 0bc41a6a..be3da5e2 100644 --- a/package.json +++ b/package.json @@ -7,12 +7,12 @@ "license": "MIT", "author": "Miguel Camba", "scripts": { - "build": "pnpm run --filter ember-basic-dropdown build", + "build": "pnpm run --filter ember-power-calendar build", "build:docs": "pnpm run --filter docs build", "lint": "pnpm run --filter '*' lint", "lint:fix": "pnpm run --filter '*' lint:fix", "start": "concurrently 'npm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow", - "start:addon": "pnpm run --filter ember-basic-dropdown start --no-watch.clearScreen", + "start:addon": "pnpm run --filter ember-power-calendar start --no-watch.clearScreen", "start:docs": "pnpm run --filter docs start --preserveWatchOutput", "start:test-app": "pnpm run --filter test-app start" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index da4f5362..99925269 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -73,8 +73,8 @@ importers: specifier: ^2.7.2 version: 2.7.2(webpack@5.89.0) ember-basic-dropdown: - specifier: 8.0.0-beta.3 - version: 8.0.0-beta.3(@ember/string@3.1.1)(@ember/test-helpers@3.2.1)(ember-source@5.4.0)(webpack@5.89.0) + specifier: 8.0.0-beta.4 + version: 8.0.0-beta.4(@ember/string@3.1.1)(@ember/test-helpers@3.2.1)(ember-source@5.4.0)(webpack@5.89.0) ember-cli: specifier: ~5.4.1 version: 5.4.1 @@ -124,8 +124,8 @@ importers: specifier: ^0.5.0 version: 0.5.0(ember-source@5.4.0)(moment@2.30.1) ember-power-select: - specifier: 8.0.0-beta.2 - version: 8.0.0-beta.2(@ember/test-helpers@3.2.1)(ember-basic-dropdown@8.0.0-beta.3)(ember-source@5.4.0) + specifier: 8.0.0-beta.3 + version: 8.0.0-beta.3(@ember/test-helpers@3.2.1)(ember-basic-dropdown@8.0.0-beta.4)(ember-source@5.4.0) ember-prism: specifier: ^0.13.0 version: 0.13.0(@babel/core@7.23.7)(ember-source@5.4.0)(webpack@5.89.0) @@ -354,8 +354,8 @@ importers: specifier: ^2.7.2 version: 2.7.2(webpack@5.89.0) ember-basic-dropdown: - specifier: 8.0.0-beta.3 - version: 8.0.0-beta.3(@ember/string@3.1.1)(@ember/test-helpers@3.2.1)(ember-source@5.4.0)(webpack@5.89.0) + specifier: 8.0.0-beta.4 + version: 8.0.0-beta.4(@ember/string@3.1.1)(@ember/test-helpers@3.2.1)(ember-source@5.4.0)(webpack@5.89.0) ember-cli: specifier: ~5.4.1 version: 5.4.1 @@ -5935,8 +5935,8 @@ packages: - supports-color - webpack - /ember-basic-dropdown@8.0.0-beta.3(@ember/string@3.1.1)(@ember/test-helpers@3.2.1)(ember-source@5.4.0)(webpack@5.89.0): - resolution: {integrity: sha512-PyA5OZ6VixT0HqYphTsfN0hLprTDyZyV2igbWHrJooHTjz2T9nOXo3SUFolsRxYg2Gc2gxYMHMfONbtI2gnQXA==} + /ember-basic-dropdown@8.0.0-beta.4(@ember/string@3.1.1)(@ember/test-helpers@3.2.1)(ember-source@5.4.0)(webpack@5.89.0): + resolution: {integrity: sha512-tSYJ4hclgYaUfW47+orrD/HRwzl+PYaDC5dfxIS0N/+Meb+gZ+oAFon5zwPMNNpiCoNT0dd1lNGf1MUVpk+ppg==} peerDependencies: '@ember/test-helpers': ^2.9.4 || ^3.2.1 ember-source: ^3.28.0 || ^4.0.0 || >=5.0.0 @@ -6646,11 +6646,11 @@ packages: - supports-color dev: true - /ember-power-select@8.0.0-beta.2(@ember/test-helpers@3.2.1)(ember-basic-dropdown@8.0.0-beta.3)(ember-source@5.4.0): - resolution: {integrity: sha512-zk8qBlMT9UvJByzrQa3cfcOKl+WguvPbfOz+64x0K4NVi6TJJg8EM+wOk6aOg7NTxLXay7Ei4Cy2ebev8vnO3w==} + /ember-power-select@8.0.0-beta.3(@ember/test-helpers@3.2.1)(ember-basic-dropdown@8.0.0-beta.4)(ember-source@5.4.0): + resolution: {integrity: sha512-c4OWjSyayqxYhpnA5jBh24fSo0fVgxcQvdD8daW9vqxLmD3OZp7QSFs5ffw+jkh98NQR7GQdHNtp0EPikERWiQ==} peerDependencies: '@ember/test-helpers': ^2.9.4 || ^3.2.1 - ember-basic-dropdown: 8.0.0-beta.3 + ember-basic-dropdown: 8.0.0-beta.4 ember-source: ^3.28.0 || ^4.0.0 || >=5.0.0 dependencies: '@babel/core': 7.23.7 @@ -6661,7 +6661,7 @@ packages: '@embroider/util': 1.12.1(ember-source@5.4.0) decorator-transforms: 1.0.1(@babel/core@7.23.7) ember-assign-helper: 0.4.0 - ember-basic-dropdown: 8.0.0-beta.3(@ember/string@3.1.1)(@ember/test-helpers@3.2.1)(ember-source@5.4.0)(webpack@5.89.0) + ember-basic-dropdown: 8.0.0-beta.4(@ember/string@3.1.1)(@ember/test-helpers@3.2.1)(ember-source@5.4.0)(webpack@5.89.0) ember-concurrency: 3.1.1(@babel/core@7.23.7)(ember-source@5.4.0) ember-source: 5.4.0(@babel/core@7.23.7)(@glimmer/component@1.1.2)(rsvp@4.8.5)(webpack@5.89.0) ember-truth-helpers: 4.0.3(ember-source@5.4.0) diff --git a/test-app/package.json b/test-app/package.json index ac06db44..627819c7 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -73,7 +73,7 @@ "stylelint-prettier": "^5.0.0", "tracked-built-ins": "^3.3.0", "webpack": "^5.89.0", - "ember-basic-dropdown": "8.0.0-beta.3", + "ember-basic-dropdown": "8.0.0-beta.4", "ember-cli-sass": "^11.0.1", "ember-power-calendar-moment": "^0.5.0", "moment": "^2.30.1",